fix(patch): Improve patches generation (#13)

.gitignore

@@ -12,4 +12,5 @@ buildNumber.properties
 
 bin
 target
-
+*.iml
+.idea

src/evaluation/java/fr/inria/spirals/npefix/resi/NPEFixTemplateEvaluation.java

@@ -116,10 +116,11 @@ protected NPEOutput runProject(String name, String source, String test, String[]
         if (positions.containsKey(name)) {
 			CtElement element = getElementFromPosition(spoon.getFactory().Type().get(positions.get(name).getClassname()), positions.get(name));
 			if (element != null) {
-				output.addAll(strategy1(spoon, (CtExpression) element));
-				output.addAll(strategy2(spoon, (CtExpression) element));
-				output.addAll(strategy3(spoon, (CtExpression) element));
-				output.addAll(strategy4(spoon, (CtExpression) element));
+				output.addAll(strategy1(spoon, (CtExpression) element, new String[] {source}));
+				output.addAll(strategy2(spoon, (CtExpression) element, new String[] {source}));
+				output.addAll(strategy3(spoon, (CtExpression) element, new String[] {source}));
+				output.addAll(strategy4(spoon, (CtExpression) element, new String[] {source}));
+				output.addAll(strategy4(spoon, (CtExpression) element, new String[] {source}));
 			} else {
 				Assert.fail("element not found");
 			}
@@ -188,7 +189,7 @@ private List<CtExpression> getVariableAccesses(CtElement elementToReplace, CtTyp
 	/**
 	 * Replace null element by existing element
 	 */
-	private NPEOutput strategy1(Launcher launcher, CtExpression element) {
+	private NPEOutput strategy1(Launcher launcher, CtExpression element, final String[] inputSources) {
 		NPEOutput output = new NPEOutput();
 
 		Location location = getLocation(element);
@@ -201,7 +202,7 @@ private NPEOutput strategy1(Launcher launcher, CtExpression element) {
 			Decision decision = new Decision<>(new Strat1A(),
 					location,
 					InstanceFactory.fromCtExpression(ctVariableAccess));
-			output.addAll(applyAndRunPatch(launcher, new ReplaceLocal(ctVariableAccess), element, decision));
+			output.addAll(applyAndRunPatch(launcher, new ReplaceLocal(ctVariableAccess), element, decision, inputSources));
 		}
 		// in global mode the new element as to be the same type
 		variables = getVariableAccesses(element, element.getType());
@@ -211,15 +212,15 @@ private NPEOutput strategy1(Launcher launcher, CtExpression element) {
 					location,
 					InstanceFactory.fromCtExpression(ctVariableAccess));
 			output.addAll(applyAndRunPatch(launcher, new ReplaceGlobal(ctVariableAccess), element,
-					decision));
+					decision, inputSources));
 		}
 		return output;
 	}
 
 	/**
 	 * Replace null element by new instance
 	 */
-	private NPEOutput strategy2(Launcher launcher, CtExpression element) {
+	private NPEOutput strategy2(Launcher launcher, CtExpression element, final String[] inputSources) {
 		NPEOutput output = new NPEOutput();
 
 		Location location = getLocation(element);
@@ -233,7 +234,7 @@ private NPEOutput strategy2(Launcher launcher, CtExpression element) {
 			Decision decision = new Decision<>(new Strat2A(), location,
 					InstanceFactory.fromCtExpression(newInstance));
 			output.addAll(applyAndRunPatch(launcher, new ReplaceLocal(newInstance), element,
-					decision));
+					decision, inputSources));
 		}
 
 		// in global mode the new element as to be the same type
@@ -245,23 +246,23 @@ private NPEOutput strategy2(Launcher launcher, CtExpression element) {
 					location,
 					InstanceFactory.fromCtExpression(newInstance));
 			output.addAll(applyAndRunPatch(launcher, new ReplaceGlobal(newInstance), element,
-					decision));
+					decision, inputSources));
 		}
 		return output;
 	}
 
 	/**
 	 * Add check not null around null element
 	 */
-	private NPEOutput strategy3(Launcher launcher, CtExpression element) {
+	private NPEOutput strategy3(Launcher launcher, CtExpression element, final String[] inputSources) {
 		NPEOutput output = new NPEOutput();
 
 		Location location = getLocation(element);
 
 		Decision decision = new Decision<>(new Strat3(), location, new PrimitiveInstance(false));
 
 		output.addAll(applyAndRunPatch(launcher, new SkipLine(), element,
-				decision));
+				decision, inputSources));
 		return output;
 	}
 
@@ -275,7 +276,7 @@ private Location getLocation(CtExpression element) {
 	/**
 	 * Skip method
 	 */
-	private NPEOutput strategy4(Launcher launcher, CtExpression element) {
+	private NPEOutput strategy4(Launcher launcher, CtExpression element, final String[] inputSources) {
 		NPEOutput output = new NPEOutput();
 		CtMethod method = element.getParent(CtMethod.class);
 
@@ -307,15 +308,15 @@ private NPEOutput strategy4(Launcher launcher, CtExpression element) {
 				}
 
 				Decision decision = new Decision<>(new Strat4(type), location, instance);
-				output.addAll(applyAndRunPatch(launcher, new SkipMethodReturn(ctVariable), element, decision));
+				output.addAll(applyAndRunPatch(launcher, new SkipMethodReturn(ctVariable), element, decision, inputSources));
 			}
 		}
 		return output;
 	}
 
 	private List<Lapse> applyAndRunPatch(Launcher launcher,
 			PatchTemplate patchTemplate,
-			CtExpression expression, Decision decision) {
+			CtExpression expression, Decision decision, final String[] inputSources) {
 		// clone the parent of the expression
 		CtType originalType = expression.getParent(CtType.class);
 		CtType cloneType = originalType.clone();
@@ -330,7 +331,7 @@ private List<Lapse> applyAndRunPatch(Launcher launcher,
 			// change the model with the new class
 			originalType.replace(cloneType);
 
-			List<Lapse> lapses = executeTest(launcher, decision);
+			List<Lapse> lapses = executeTest(launcher, decision, inputSources);
 
 			// restore the original class
 			cloneType.replace(originalType);
@@ -343,7 +344,7 @@ private List<Lapse> applyAndRunPatch(Launcher launcher,
 		return Collections.emptyList();
 	}
 
-	private List<Lapse> executeTest(final Launcher launcher, final Decision decision) {
+	private List<Lapse> executeTest(final Launcher launcher, final Decision decision, final String[] inputSources) {
 		Path tempBinFolder = null;
 		try {
 			tempBinFolder = Files.createTempDirectory("npefix_");
@@ -393,7 +394,7 @@ private List<Lapse> executeTest(final Launcher launcher, final Decision decision
 						continue;
 					}
 
-					Lapse lapse = new Lapse(null);
+					Lapse lapse = new Lapse(null, inputSources);
 					lapse.setTestClassName(testClassName);
 					lapse.setTestName(method);
 					lapse.addDecision(decision);

src/main/java/fr/inria/spirals/npefix/main/ExecutionClient.java

@@ -24,7 +24,7 @@
 public class ExecutionClient {
 
 	public static void main(String[] args) {
-		ExecutionClient executionClient = new ExecutionClient(args[0], args[1]);
+		ExecutionClient executionClient = new ExecutionClient(args[0], args[1], new String[0]);
 		Config.CONFIG.setRandomSeed(Integer.parseInt(args[2]));
 		executionClient.run();
 	}
@@ -33,10 +33,12 @@ public static void main(String[] args) {
 	private String testName;
 	private int port = Config.CONFIG.getServerPort();
 	private String host = Config.CONFIG.getServerHost();
+	private String[] inputSources;
 
-	public ExecutionClient(String classTestName, String testName) {
+	public ExecutionClient(String classTestName, String testName, String[] inputSources) {
 		this.classTestName = classTestName;
 		this.testName = testName;
+		this.inputSources = inputSources;
 	}
 
 	/**
@@ -55,7 +57,7 @@ private Selector getSelector() {
 
 	private void run() {
 		Selector selector = getSelector();
-		Lapse lapse = new Lapse(selector);
+		Lapse lapse = new Lapse(selector, inputSources);
 		lapse.setTestClassName(classTestName);
 		lapse.setTestName(testName);
 

src/main/java/fr/inria/spirals/npefix/main/all/DefaultRepairStrategy.java

@@ -35,9 +35,10 @@
  */
 public class DefaultRepairStrategy implements RepairStrategy {
 
+	private String[] inputSources;
 	protected List<AbstractProcessor> processors;
 
-	public DefaultRepairStrategy() {
+	public DefaultRepairStrategy(String[] inputSources) {
 		processors = new ArrayList<>();
 		processors.add(new TernarySplitter());//
 		//processors.add(new IfSplitter());
@@ -53,6 +54,7 @@ public DefaultRepairStrategy() {
 		processors.add(new ConstructorEncapsulation());
 		processors.add(new VariableFor());//
 		//p.addProcessor(new ArrayRead());
+		this.inputSources = inputSources;
 	}
 
 	@Override
@@ -62,7 +64,7 @@ public NPEOutput run(Selector selector, List<String> methodTests) {
 
 		NPEOutput output = new NPEOutput();
 
-		Lapse lapse = new Lapse(selector);
+		Lapse lapse = new Lapse(selector, inputSources);
 
 		final TestRunner testRunner = new TestRunner();
 		for (int i = 0; i < methodTests.size(); i++) {
@@ -101,7 +103,7 @@ public NPEOutput run(Selector selector, List<String> methodTests) {
 					throw new RuntimeException(e);
 				}
 			}
-			lapse = new Lapse(selector);
+			lapse = new Lapse(selector, inputSources);
 			CallChecker.enable();
 			CallChecker.cache.clear();
 			CallChecker.getDecisions().clear();

src/main/java/fr/inria/spirals/npefix/main/all/Launcher.java

@@ -63,7 +63,7 @@ public class Launcher {
     private final Logger logger = LoggerFactory.getLogger(Launcher.class);
 
     public Launcher(String[] sourcePath, String sourceOutput, String binOutput, String classpath) {
-        this(sourcePath, sourceOutput, binOutput, classpath, 7, new DefaultRepairStrategy());
+        this(sourcePath, sourceOutput, binOutput, classpath, 7, new DefaultRepairStrategy(sourcePath));
     }
 
     public Launcher(String[] sourcePath, String sourceOutput, String binOutput, String classpath, RepairStrategy repairStrategy) {

src/main/java/fr/inria/spirals/npefix/main/all/TryCatchRepairStrategy.java

@@ -24,7 +24,8 @@
 public class TryCatchRepairStrategy extends DefaultRepairStrategy {
 	private static Selector selector;
 
-	public TryCatchRepairStrategy() {
+	public TryCatchRepairStrategy(String[] inputSources) {
+		super(inputSources);
 		processors = new ArrayList<>();
 		processors.add(new CheckNotNull());//
 		processors.add(new ForceNullInit());//

src/main/java/fr/inria/spirals/npefix/main/patch/SortPatch.java

@@ -104,7 +104,7 @@ private static void sortPatchProject(String project, String projectSourcePath, S
 				decisions.add(decision);
 			}
 
-			PatchesGenerator patchesGenerator = new PatchesGenerator(decisions, spoon);
+			PatchesGenerator patchesGenerator = new PatchesGenerator(decisions, spoon, new String[] {projectSourcePath});
 			String diff = patchesGenerator.getDiff();
 			System.out.println(diff);
 			((JSONObject) execution).put("diff", diff);

src/main/java/fr/inria/spirals/npefix/patch/generator/PatchesGenerator.java

@@ -25,8 +25,9 @@
 public class PatchesGenerator {
 	private List<Decision> decisions;
 	private Launcher spoon;
+	private String[] inputSources;
 
-	public PatchesGenerator(List<Decision> decisions, Launcher spoon) {
+	public PatchesGenerator(List<Decision> decisions, Launcher spoon, String[] inputSources) {
 		this.decisions = new ArrayList<>();
 		for (int i = 0; i < decisions.size(); i++) {
 			Decision decision = decisions.get(i);
@@ -35,6 +36,7 @@ public PatchesGenerator(List<Decision> decisions, Launcher spoon) {
 			}
 		}
 		this.spoon = spoon;
+		this.inputSources = inputSources;
 	}
 
 	public String getDiff() {
@@ -148,8 +150,8 @@ private String createPatchDiff(String className, List<Decision> decisions) {
 		try {
 			String path = getClassPath(type);
 			diff = Diff.diff(r1, r2, false)
-					.toUnifiedDiff(path,
-							path,
+					.toUnifiedDiff("a" + path,
+							"b" + path,
 							new StringReader(originalClassContent),
 							new StringReader(classContent), 1);
 		} catch (IOException e) {
@@ -162,16 +164,28 @@ private String createPatchDiff(String className, List<Decision> decisions) {
 	private String getClassPath(CtType type) {
 		String path = type.getPosition().getFile().getPath();
 		String intersection = null;
-		Set<File> inputSources = spoon.getModelBuilder().getInputSources();
-		for (File inputSource : inputSources) {
+		for (String inputSource : inputSources) {
+			if (inputSource.startsWith("./")) {
+				inputSource = inputSource.substring(2);
+			}
 			if (intersection == null) {
-				intersection = inputSource.getPath();
+				intersection = inputSource;
+			} else {
+				intersection = intersection(intersection, inputSource);
+			}
+		}
+		int indexOfIntersection = path.indexOf(intersection);
+
+		if (indexOfIntersection != -1) {
+			path = path.substring(indexOfIntersection);
+			if (!path.startsWith("/")) {
+				return "/" + path;
 			} else {
-				intersection = intersection(intersection, inputSource.getPath());
+				return path;
 			}
+		} else {
+			return null;
 		}
-		path = path.replace(intersection, "");
-		return path;
 	}
 
 	/**

src/main/java/fr/inria/spirals/npefix/resi/context/Lapse.java

@@ -35,8 +35,9 @@ public class Lapse implements Comparable<Lapse>, Serializable {
 	private Date startDate;
 	private Date endDate;
 	private boolean isFinished = false;
+	private String[] inputSources;
 
-	public Lapse(Selector strategySelector) {
+	public Lapse(Selector strategySelector, String[] inputSources) {
 		this.uniqueId = currentUniqueId++;
 		this.locations = new HashSet<>();
 		nbApplication = new HashMap<>();
@@ -45,6 +46,7 @@ public Lapse(Selector strategySelector) {
 		startDate = new Date();
 		this.strategySelector = strategySelector;
 		metadata.put("seed", Config.CONFIG.getRandomSeed());
+		this.inputSources = inputSources;
 	}
 
 	public void increaseNbApplication(Decision decision) {
@@ -141,7 +143,7 @@ public Object getMetadata(String key) {
 
 	public String toDiff(Launcher spoon) {
 		try {
-			PatchesGenerator patchesGenerator = new PatchesGenerator(decisions, spoon);
+			PatchesGenerator patchesGenerator = new PatchesGenerator(decisions, spoon, inputSources);
 			return patchesGenerator.getDiff();
 		} catch (Exception e) {
 			return null;