Cfworld dev

client/src/main/java/org/evosuite/Properties.java

@@ -1436,7 +1436,8 @@ public enum Criterion {
 		EXCEPTION, DEFUSE, ALLDEFS, BRANCH, CBRANCH, STRONGMUTATION, WEAKMUTATION,
 		MUTATION, STATEMENT, RHO, AMBIGUITY, IBRANCH, READABILITY,
         ONLYBRANCH, ONLYMUTATION, METHODTRACE, METHOD, METHODNOEXCEPTION, LINE, ONLYLINE, OUTPUT, INPUT,
-        REGRESSION,	REGRESSIONTESTS, TRYCATCH
+        REGRESSION,	REGRESSIONTESTS, TRYCATCH,
+        VDDU, VMDDU, VCDDU, VCMDDU1, VCMDDU2, VRDDU, DDU_METHOD, DDU_METHOD_DTR, DDU_PUBLIC_METHOD, DDU_PUBLIC_METHOD_DTR, DDU_BRANCH, DDU_BRANCH_DTR
 	}
 
     @Parameter(key = "criterion", group = "Runtime", description = "Coverage criterion. Can define more than one criterion by using a ':' separated list")

client/src/main/java/org/evosuite/TestSuiteGeneratorHelper.java

@@ -113,6 +113,42 @@ static void printTestCriterion(Criterion criterion) {
       case REGRESSION:
         LoggingUtils.getEvoLogger().info("  - Regression");
         break;
+      case VDDU:
+        LoggingUtils.getEvoLogger().info("  - VDDU Method Coverage");
+        break;
+      case VMDDU:
+        LoggingUtils.getEvoLogger().info("  - VMDDU Method Coverage");
+        break;
+      case VCDDU:
+        LoggingUtils.getEvoLogger().info("  - VCDDU Method Coverage");
+        break;
+      case VCMDDU1:
+        LoggingUtils.getEvoLogger().info("  - VCMDDU1 Method Coverage");
+        break;
+      case VCMDDU2:
+        LoggingUtils.getEvoLogger().info("  - VCMDDU2 Method Coverage");
+        break;
+      case VRDDU:
+        LoggingUtils.getEvoLogger().info("  - VRDDU Method Coverage");
+        break;
+      case DDU_METHOD:
+        LoggingUtils.getEvoLogger().info("  - DDU Method Coverage");
+        break;
+      case DDU_METHOD_DTR:
+        LoggingUtils.getEvoLogger().info("  - DDU Method (DTR) Coverage");
+        break;
+      case DDU_PUBLIC_METHOD:
+        LoggingUtils.getEvoLogger().info("  - DDU Public Method Coverage");
+        break;
+      case DDU_PUBLIC_METHOD_DTR:
+        LoggingUtils.getEvoLogger().info("  - DDU Public Method (DTR) Coverage");
+        break;
+      case DDU_BRANCH:
+        LoggingUtils.getEvoLogger().info("  - DDU Branch Coverage");
+        break;
+      case DDU_BRANCH_DTR:
+        LoggingUtils.getEvoLogger().info("  - DDU Branch Coverage");
+        break;
       default:
         throw new IllegalArgumentException("Unrecognized criterion: " + criterion);
     }

client/src/main/java/org/evosuite/coverage/CoverageCriteriaAnalyzer.java

@@ -24,6 +24,10 @@
 
 import org.evosuite.Properties;
 import org.evosuite.Properties.Criterion;
+import org.evosuite.coverage.aes.AbstractAESCoverageSuiteFitness.Metric;
+import org.evosuite.coverage.aes.branch.AESBranchCoverageSuiteFitness;
+import org.evosuite.coverage.aes.method.AESMethodCoverageSuiteFitness;
+import org.evosuite.coverage.aes.method.AESPublicMethodCoverageSuiteFitness;
 import org.evosuite.coverage.ambiguity.AmbiguityCoverageSuiteFitness;
 import org.evosuite.coverage.rho.RhoCoverageSuiteFitness;
 import org.evosuite.TestGenerationContext;
@@ -178,6 +182,20 @@ public static RuntimeVariable getCoverageVariable(Properties.Criterion criterion
                 return RuntimeVariable.BranchCoverage;
             case TRYCATCH:
                 return RuntimeVariable.TryCatchCoverage;
+            case VDDU:
+            case VMDDU:
+            case VCDDU:
+            case VCMDDU1:
+            case VCMDDU2:
+            case VRDDU:
+                return RuntimeVariable.VDDUCoverage;
+            case DDU_METHOD:
+            case DDU_METHOD_DTR:
+            case DDU_PUBLIC_METHOD:
+            case DDU_PUBLIC_METHOD_DTR:
+            case DDU_BRANCH:
+            case DDU_BRANCH_DTR:
+                return RuntimeVariable.DDUCoverage;
             default:
                 throw new RuntimeException("Criterion not supported: " + criterion);
 
@@ -296,6 +314,31 @@ private static void analyzeCoverage(TestSuiteChromosome testSuite, Properties.Cr
             AmbiguityCoverageSuiteFitness ag = new AmbiguityCoverageSuiteFitness();
             ClientServices.getInstance().getClientNode().trackOutputVariable(
                     RuntimeVariable.AmbiguityScore, ag.getFitness(testSuite));
+        } else if (criterion == Properties.Criterion.DDU_BRANCH) {
+            AESBranchCoverageSuiteFitness branchFitness = new AESBranchCoverageSuiteFitness(Metric.AES);
+            ClientServices.getInstance().getClientNode().trackOutputVariable(
+                    RuntimeVariable.DDUBranchCoverage, branchFitness.getMetric(testSuite));
+            ClientServices.getInstance().getClientNode().trackOutputVariable(
+                    RuntimeVariable.DDUScore, Math.abs(0.5 - branchFitness.getFitness(testSuite)));
+            branchFitness = new AESBranchCoverageSuiteFitness(Metric.DTR);
+            ClientServices.getInstance().getClientNode().trackOutputVariable(
+                    RuntimeVariable.DDUBranchCoverageDTR, branchFitness.getMetric(testSuite));
+            AESMethodCoverageSuiteFitness methodFitness = new AESMethodCoverageSuiteFitness(Metric.AES);
+            ClientServices.getInstance().getClientNode().trackOutputVariable(
+                    RuntimeVariable.DDUMethodCoverage, methodFitness.getMetric(testSuite));
+            methodFitness = new AESMethodCoverageSuiteFitness(Metric.DTR);
+            ClientServices.getInstance().getClientNode().trackOutputVariable(
+                    RuntimeVariable.DDUMethodCoverageDTR, methodFitness.getMetric(testSuite));
+            AESPublicMethodCoverageSuiteFitness publicMethodFitness = new AESPublicMethodCoverageSuiteFitness(Metric.AES);
+            ClientServices.getInstance().getClientNode().trackOutputVariable(
+                    RuntimeVariable.DDUPublicMethodCoverage, publicMethodFitness.getMetric(testSuite));
+            publicMethodFitness = new AESPublicMethodCoverageSuiteFitness(Metric.DTR);
+            ClientServices.getInstance().getClientNode().trackOutputVariable(
+                    RuntimeVariable.DDUPublicMethodCoverageDTR, publicMethodFitness.getMetric(testSuite));
+        } else if (criterion == Properties.Criterion.VDDU) {
+            AESBranchCoverageSuiteFitness vddu = new AESBranchCoverageSuiteFitness(Metric.VDDU);
+            ClientServices.getInstance().getClientNode().trackOutputVariable(
+                    RuntimeVariable.VDDUScore, Math.abs(0.5 - vddu.getFitness(testSuite)));
         }
     }
 

client/src/main/java/org/evosuite/coverage/FitnessFunctions.java

@@ -21,6 +21,12 @@
 
 import org.evosuite.Properties;
 import org.evosuite.Properties.Criterion;
+import org.evosuite.coverage.aes.AbstractAESCoverageSuiteFitness.Metric;
+import org.evosuite.coverage.aes.branch.AESBranchCoverageFactory;
+import org.evosuite.coverage.aes.branch.AESBranchCoverageSuiteFitness;
+import org.evosuite.coverage.aes.method.AESMethodCoverageFactory;
+import org.evosuite.coverage.aes.method.AESMethodCoverageSuiteFitness;
+import org.evosuite.coverage.aes.method.AESPublicMethodCoverageSuiteFitness;
 import org.evosuite.coverage.ambiguity.AmbiguityCoverageFactory;
 import org.evosuite.coverage.ambiguity.AmbiguityCoverageSuiteFitness;
 import org.evosuite.coverage.branch.BranchCoverageFactory;
@@ -155,6 +161,30 @@ public static TestSuiteFitnessFunction getFitnessFunction(Criterion criterion) {
 			return new OutputCoverageSuiteFitness();
 		case INPUT:
 			return new InputCoverageSuiteFitness();
+		case VDDU:
+			return new AESBranchCoverageSuiteFitness(Metric.VDDU);
+		case VMDDU:
+			return new AESBranchCoverageSuiteFitness(Metric.VMDDU);
+		case VCDDU:
+			return new AESBranchCoverageSuiteFitness(Metric.VCDDU);
+		case VCMDDU1:
+			return new AESBranchCoverageSuiteFitness(Metric.VCMDDU1);
+		case VCMDDU2:
+			return new AESBranchCoverageSuiteFitness(Metric.VCMDDU2);
+		case VRDDU:
+			return new AESBranchCoverageSuiteFitness(Metric.VRDDU);
+		case DDU_METHOD:
+			return new AESMethodCoverageSuiteFitness();
+		case DDU_METHOD_DTR:
+			return new AESMethodCoverageSuiteFitness(Metric.DTR);
+		case DDU_PUBLIC_METHOD:
+			return new AESPublicMethodCoverageSuiteFitness();
+		case DDU_PUBLIC_METHOD_DTR:
+			return new AESPublicMethodCoverageSuiteFitness(Metric.DTR);
+		case DDU_BRANCH:
+			return new AESBranchCoverageSuiteFitness();
+		case DDU_BRANCH_DTR:
+			return new AESBranchCoverageSuiteFitness(Metric.DTR);
 		case TRYCATCH:
 			return new TryCatchCoverageSuiteFitness();
 		default:
@@ -216,6 +246,21 @@ public static TestFitnessFactory<? extends TestFitnessFunction> getFitnessFactor
 			return new OutputCoverageFactory();
 		case INPUT:
 			return new InputCoverageFactory();
+		case VDDU:
+		case VMDDU:
+		case VCDDU:
+		case VRDDU:
+		case DDU_METHOD:
+		case DDU_METHOD_DTR:
+			return new AESMethodCoverageFactory();
+		case DDU_PUBLIC_METHOD:
+		case DDU_PUBLIC_METHOD_DTR:
+			return new AESMethodCoverageFactory(true);
+		case VCMDDU1:
+		case VCMDDU2:
+		case DDU_BRANCH:
+		case DDU_BRANCH_DTR:
+			return new AESBranchCoverageFactory();
 		case TRYCATCH:
 			return new TryCatchCoverageFactory();
 		default:
@@ -282,6 +327,19 @@ public static Class<?> getTestFitnessFunctionClass(Criterion criterion) {
 				return InputCoverageTestFitness.class;
 		case TRYCATCH:
 				return TryCatchCoverageTestFitness.class;
+		case VDDU:
+		case VMDDU:
+		case VCDDU:
+		case VCMDDU1:
+		case VCMDDU2:
+		case VRDDU:
+		case DDU_METHOD:
+		case DDU_METHOD_DTR:
+		case DDU_PUBLIC_METHOD:
+		case DDU_PUBLIC_METHOD_DTR:
+		case DDU_BRANCH:
+		case DDU_BRANCH_DTR:
+				return LineCoverageTestFitness.class;
 		default:
 				throw new RuntimeException("No criterion defined for " + criterion.name());
 		}