Skip to content

Commit

Permalink
test: update the test with the new API
Browse files Browse the repository at this point in the history
  • Loading branch information
@danglotb
danglotb committed Jun 21, 2021
1 parent 2f87151 commit 12ec5ac
Show file tree
Hide file tree
Showing 2 changed files with 120 additions and 63 deletions.
181 changes: 118 additions & 63 deletions ...src/test/java/eu/stamp_project/diff_test_selection/EnhancedDiffTestSelectionTestImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package eu.stamp_project.diff_test_selection;

import eu.stamp_project.diff_test_selection.coverage.Coverage;
import eu.stamp_project.diff_test_selection.coverage.DiffCoverage;
import eu.stamp_project.diff_test_selection.diff.DiffComputer;
import eu.stamp_project.diff_test_selection.selector.EnhancedDiffTestSelection;
import org.junit.Test;
Expand All @@ -23,24 +24,44 @@ public void testOnlyAddition() {
NO TEST MODIFICATIONS
*/

final Map<String, Map<String, Map<String, List<Integer>>>> coverageV1 = new LinkedHashMap<>();
coverageV1.put("fr.inria.stamp.only_modification.FibonacciTest", new HashMap<>());
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest").put("test", new HashMap<>());
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest").get("test")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 16, 17, 18, 19, 21, 22, 23, 25}.clone()));
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest").put("hittingTest", new HashMap<>());
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest").get("hittingTest")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 13, 14}.clone()));

final Map<String, Map<String, Map<String, List<Integer>>>> coverageV2 = new LinkedHashMap<>();
coverageV2.put("fr.inria.stamp.only_modification.FibonacciTest", new HashMap<>());
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest").put("test", new HashMap<>());
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest").get("test")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 15, 16, 17, 18, 20, 21, 22, 24}.clone()));
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest").put("hittingTest", new HashMap<>());
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest").get("hittingTest")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 13}.clone()));

final Coverage coverageV1 = new Coverage();
for (int line: new Integer[]{12, 16, 17, 18, 19, 21, 22, 23, 25}) {
coverageV1.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"test",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
}
for (int line: new Integer[]{12, 13, 14}) {
coverageV1.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"hittingTest",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
}
final Coverage coverageV2 = new Coverage();
for (int line: new Integer[]{12, 15, 16, 17, 18, 20, 21, 22, 24}) {
coverageV2.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"test",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
}
for (int line: new Integer[]{12, 13}) {
coverageV2.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"hittingTest",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
}
final File p1Directory = new File("src/test/resources/only-addition-p1");
final File p1SrcDirectory = new File("src/test/resources/only-addition-p1/src/main/java");
final File p2Directory = new File("src/test/resources/only-addition-p2");
Expand All @@ -52,7 +73,7 @@ public void testOnlyAddition() {
p2Directory.getAbsolutePath(),
coverageV1,
diff,
new Coverage(),
new DiffCoverage(),
coverageV2
);
Map<String, Set<String>> selectedTests = diffTestSelection.selectTests();
Expand All @@ -71,23 +92,44 @@ public void testOnlyDeletion() {
NO TEST MODIFICATIONS
*/

final Map<String, Map<String, Map<String, List<Integer>>>> coverageV1 = new LinkedHashMap<>();
coverageV1.put("fr.inria.stamp.only_modification.FibonacciTest", new HashMap<>());
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest").put("test", new HashMap<>());
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest").get("test")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 15, 16, 17, 18, 20, 21, 22, 24}.clone()));
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest").put("hittingTest", new HashMap<>());
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest").get("hittingTest")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 13}.clone()));

final Map<String, Map<String, Map<String, List<Integer>>>> coverageV2 = new LinkedHashMap<>();
coverageV2.put("fr.inria.stamp.only_modification.FibonacciTest", new HashMap<>());
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest").put("test", new HashMap<>());
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest").get("test")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 16, 17, 18, 19, 21, 22, 23, 25}.clone()));
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest").put("hittingTest", new HashMap<>());
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest").get("hittingTest")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 13, 14}.clone()));
final Coverage coverageV1 = new Coverage();
for (int line: new Integer[]{12, 15, 16, 17, 18, 20, 21, 22, 24}) {
coverageV1.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"test",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
}
for (int line: new Integer[]{12, 13}) {
coverageV1.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"hittingTest",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
}
final Coverage coverageV2 = new Coverage();
for (int line: new Integer[]{12, 16, 17, 18, 19, 21, 22, 23, 25}) {
coverageV2.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"test",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
}
for (int line: new Integer[]{12, 13, 14}) {
coverageV2.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"hittingTest",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
}

final File p1Directory = new File("src/test/resources/only-deletion-p1");
final File p1SrcDirectory = new File("src/test/resources/only-deletion-p1/src/main/java");
Expand All @@ -100,7 +142,7 @@ public void testOnlyDeletion() {
p2Directory.getAbsolutePath(),
coverageV1,
diff,
new Coverage(),
new DiffCoverage(),
coverageV2
);
Map<String, Set<String>> selectedTests = diffTestSelection.selectTests();
Expand All @@ -120,27 +162,40 @@ public void testModification() {
*/

final Map<String, Map<String, Map<String, List<Integer>>>> coverageV1 = new LinkedHashMap<>();
coverageV1.put("fr.inria.stamp.only_modification.FibonacciTest", new HashMap<>());
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest")
.put("test", new HashMap<>());
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest").get("test")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 15, 16, 17, 18, 20, 21, 22, 24}.clone()));
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest")
.put("hittingTest", new HashMap<>());
coverageV1.get("fr.inria.stamp.only_modification.FibonacciTest").get("hittingTest")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 13}.clone()));

final Map<String, Map<String, Map<String, List<Integer>>>> coverageV2 = new LinkedHashMap<>();
coverageV2.put("fr.inria.stamp.only_modification.FibonacciTest", new HashMap<>());
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest")
.put("test", new HashMap<>());
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest").get("test")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 15, 16, 17, 18, 20, 21, 22, 24}.clone()));
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest")
.put("hittingTest", new HashMap<>());
coverageV2.get("fr.inria.stamp.only_modification.FibonacciTest").get("hittingTest")
.put("fr.inria.stamp.only_modification.Fibonacci", Arrays.asList(new Integer[]{12, 13}.clone()));
final Coverage coverageV1 = new Coverage();
final Coverage coverageV2 = new Coverage();
for (int line: new Integer[]{12, 15, 16, 17, 18, 20, 21, 22, 24}) {
coverageV1.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"test",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
coverageV2.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"test",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
}
for (int line: new Integer[]{12, 13}) {
coverageV1.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"hittingTest",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
coverageV2.addCoverage(
"fr.inria.stamp.only_modification.FibonacciTest",
"hittingTest",
"fr.inria.stamp.only_modification.Fibonacci",
line,
1
);
}

final File p1Directory = new File("src/test/resources/only-modification-p1");
final File p1SrcDirectory = new File("src/test/resources/only-modification-p1/src/main/java");
Expand All @@ -153,8 +208,8 @@ public void testModification() {
p2Directory.getAbsolutePath(),
coverageV1,
diff,
new Coverage(),
Collections.emptyMap()
new DiffCoverage(),
new Coverage()
);
Map<String, Set<String>> selectedTests = diffTestSelection.selectTests();
assertTrue(selectedTests.containsKey("fr.inria.stamp.only_modification.FibonacciTest"));
Expand All @@ -163,9 +218,9 @@ public void testModification() {
diffTestSelection = new EnhancedDiffTestSelection(
p1Directory.getAbsolutePath(),
p2Directory.getAbsolutePath(),
Collections.emptyMap(),
diff,
new Coverage(),
diff,
new DiffCoverage(),
coverageV2
);
selectedTests = diffTestSelection.selectTests();
Expand All @@ -177,7 +232,7 @@ public void testModification() {
p2Directory.getAbsolutePath(),
coverageV1,
diff,
new Coverage(),
new DiffCoverage(),
coverageV2
);
selectedTests = diffTestSelection.selectTests();
Expand Down
2 changes: 2 additions & 0 deletions ...election/src/test/java/eu/stamp_project/diff_test_selection/clover/CloverExectorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import org.junit.Test;

import java.io.File;
import java.util.List;
import java.util.Map;

import static org.junit.Assert.assertTrue;

Expand Down

0 comments on commit 12ec5ac

Please sign in to comment.