Commit by Martin Monperrus on 06 March 2018

nopol/src/main/java/fr/inria/lille/repair/nopol/NoPol.java

@@ -276,13 +276,17 @@ private List<Patch> runNopolProcessor(List<TestResult> tests, SourceLocation sou
 		}
 
 		Synthesizer synth = SynthesizerFactory.build(sourceFiles, spooner, nopolContext, sourceLocation, nopolProcessor, angelicValue, spoonCl);
-		if (synth == Synthesizer.NO_OP_SYNTHESIZER) {
-			return patches;
-		}
+
 		Collection<TestCase> failingTest = reRunFailingTestCases(getFailingTestCase(tests), classpath);
+
 		if (failingTest.isEmpty()) {
-			return patches;
+			throw new RuntimeException("nothing to repair, no failing test cases");
 		}
+
+		// Collecting the angelic values
+		// TODO
+
+		// Collecting the patches
 		List<Patch> tmpPatches = synth.buildPatch(classpath, tests, failingTest, nopolContext.getMaxTimeBuildPatch());
 
 		if (tmpPatches.size() > 0) {
@@ -307,8 +311,7 @@ private AngelicValue buildConstraintsModelBuilder(NopolProcessor nopolProcessor,
 			RuntimeValues<Boolean> runtimeValuesInstance = RuntimeValues.newInstance();
 			switch (nopolContext.getOracle()) {
 				case ANGELIC:
-					Processor<CtStatement> processor = new ConditionalLoggingInstrumenter(runtimeValuesInstance, nopolProcessor);
-					return new ConstraintModelBuilder(runtimeValuesInstance, statement, processor, spooner, nopolContext);
+					return new ConstraintModelBuilder(runtimeValuesInstance, statement, new ConditionalLoggingInstrumenter(runtimeValuesInstance, nopolProcessor), spooner, nopolContext);
 				case SYMBOLIC:
 					return new JPFRunner<>(runtimeValuesInstance, statement, nopolProcessor, spoonCl, spooner, nopolContext);
 			}