Skip to content

Commit 1001add

Browse files
marchofGodin
marchof
authored and
Godin
committed
Simplify validation test setup (bazel-contrib#718)
1 parent 592533c commit 1001add

File tree

63 files changed

+1400
-1468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1400
-1468
lines changed

‎org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/AnnotationInitializerTest.java‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
*******************************************************************************/
1212
package org.jacoco.core.test.validation.java5;
1313

14-
import org.jacoco.core.analysis.ICounter;
14+
import static org.junit.Assert.assertEquals;
15+
1516
import org.jacoco.core.test.validation.ValidationTestBase;
1617
import org.jacoco.core.test.validation.java5.targets.AnnotationInitializerTarget;
17-
import org.junit.Test;
18-
19-
import static org.junit.Assert.assertEquals;
2018

2119
/**
2220
* Test of initializer in annotations.
@@ -39,10 +37,4 @@ protected void run(Class<?> targetClass) throws Exception {
3937
targetClass.getField("CONST").get(null);
4038
}
4139

42-
@Test
43-
public void testCoverageResult() {
44-
assertLine("const", ICounter.FULLY_COVERED);
45-
assertLine("value", ICounter.EMPTY);
46-
}
47-
4840
}

‎org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/BadCycleClassTest.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*******************************************************************************/
1212
package org.jacoco.core.test.validation.java5;
1313

14-
import org.jacoco.core.analysis.ICounter;
1514
import org.jacoco.core.test.validation.ValidationTestBase;
1615
import org.jacoco.core.test.validation.java5.targets.BadCycleClassTarget;
1716
import org.junit.Test;
@@ -26,11 +25,7 @@ public BadCycleClassTest() throws Exception {
2625
}
2726

2827
@Test
29-
public void test() throws Exception {
30-
assertLine("childinit", ICounter.FULLY_COVERED);
31-
assertLine("childsomeMethod", ICounter.FULLY_COVERED);
32-
assertLine("childclinit", ICounter.FULLY_COVERED);
33-
28+
public void method_execution_sequence() throws Exception {
3429
// The cycle causes a constructor and instance method to be called
3530
// before the static initializer of a class:
3631
assertLogEvents("childinit", "childsomeMethod", "childclinit",

‎org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/BooleanExpressionsTest.java‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
*******************************************************************************/
1212
package org.jacoco.core.test.validation.java5;
1313

14-
import org.jacoco.core.analysis.ICounter;
1514
import org.jacoco.core.test.validation.ValidationTestBase;
1615
import org.jacoco.core.test.validation.java5.targets.BooleanExpressionsTarget;
17-
import org.junit.Test;
1816

1917
/**
2018
* Tests of basic Java boolean expressions.
@@ -25,56 +23,4 @@ public BooleanExpressionsTest() {
2523
super(BooleanExpressionsTarget.class);
2624
}
2725

28-
@Test
29-
public void testCoverageResult() {
30-
31-
// 1. Boolean comparison result (one case)
32-
assertLine("booleancmp1", ICounter.PARTLY_COVERED, 1, 1);
33-
34-
// 2. Boolean comparison result (both cases)
35-
assertLine("booleancmp2", ICounter.FULLY_COVERED, 0, 2);
36-
37-
// 3. And
38-
assertLine("andFF", ICounter.FULLY_COVERED, 1, 1);
39-
assertLine("andFT", ICounter.FULLY_COVERED, 1, 1);
40-
assertLine("andTF", ICounter.FULLY_COVERED, 1, 1);
41-
assertLine("andTT", ICounter.FULLY_COVERED, 1, 1);
42-
43-
// 4. Conditional And
44-
assertLine("conditionalandFF", ICounter.PARTLY_COVERED, 3, 1);
45-
assertLine("conditionalandFT", ICounter.PARTLY_COVERED, 3, 1);
46-
assertLine("conditionalandTF", ICounter.FULLY_COVERED, 2, 2);
47-
assertLine("conditionalandTT", ICounter.FULLY_COVERED, 2, 2);
48-
49-
// 5. Or
50-
assertLine("orFF", ICounter.FULLY_COVERED, 1, 1);
51-
assertLine("orFT", ICounter.FULLY_COVERED, 1, 1);
52-
assertLine("orTF", ICounter.FULLY_COVERED, 1, 1);
53-
assertLine("orTT", ICounter.FULLY_COVERED, 1, 1);
54-
55-
// 6. Conditional Or
56-
assertLine("conditionalorFF", ICounter.FULLY_COVERED, 2, 2);
57-
assertLine("conditionalorFT", ICounter.FULLY_COVERED, 2, 2);
58-
assertLine("conditionalorTF", ICounter.PARTLY_COVERED, 3, 1);
59-
assertLine("conditionalorTT", ICounter.PARTLY_COVERED, 3, 1);
60-
61-
// 7. Exclusive Or
62-
assertLine("xorFF", ICounter.FULLY_COVERED, 1, 1);
63-
assertLine("xorFT", ICounter.FULLY_COVERED, 1, 1);
64-
assertLine("xorTF", ICounter.FULLY_COVERED, 1, 1);
65-
assertLine("xorTT", ICounter.FULLY_COVERED, 1, 1);
66-
67-
// 8. Conditional Operator
68-
assertLine("condT", ICounter.PARTLY_COVERED, 1, 1);
69-
assertLine("condF", ICounter.PARTLY_COVERED, 1, 1);
70-
71-
// 9. Not (one case)
72-
assertLine("notT", ICounter.PARTLY_COVERED, 1, 1);
73-
assertLine("notF", ICounter.PARTLY_COVERED, 1, 1);
74-
75-
// 10. Not (both cases)
76-
assertLine("notTF", ICounter.FULLY_COVERED, 0, 2);
77-
78-
}
79-
8026
}

‎org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/ClassInitializerTest.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
*******************************************************************************/
1212
package org.jacoco.core.test.validation.java5;
1313

14-
import org.jacoco.core.analysis.ICounter;
1514
import org.jacoco.core.test.validation.ValidationTestBase;
1615
import org.jacoco.core.test.validation.java5.targets.ClassInitializerTarget;
17-
import org.junit.Test;
1816

1917
/**
2018
* Tests of static initializer in classes.
@@ -25,21 +23,4 @@ public ClassInitializerTest() {
2523
super(ClassInitializerTarget.class);
2624
}
2725

28-
@Test
29-
public void testCoverageResult() {
30-
31-
assertLine("const1", ICounter.EMPTY);
32-
assertLine("const2", ICounter.EMPTY);
33-
34-
assertLine("const3", ICounter.FULLY_COVERED);
35-
assertLine("const4", ICounter.FULLY_COVERED);
36-
37-
assertLine("field1", ICounter.FULLY_COVERED);
38-
assertLine("field2", ICounter.FULLY_COVERED);
39-
assertLine("field3", ICounter.FULLY_COVERED);
40-
assertLine("field4", ICounter.FULLY_COVERED);
41-
42-
assertLine("staticblock", ICounter.FULLY_COVERED);
43-
}
44-
4526
}

‎org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/ConstructorsTest.java‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
*******************************************************************************/
1212
package org.jacoco.core.test.validation.java5;
1313

14-
import org.jacoco.core.analysis.ICounter;
1514
import org.jacoco.core.test.validation.ValidationTestBase;
1615
import org.jacoco.core.test.validation.java5.targets.ConstructorsTarget;
17-
import org.junit.Test;
1816

1917
/**
2018
* Tests for different constructors. Private empty constructors without
@@ -26,38 +24,4 @@ public ConstructorsTest() {
2624
super(ConstructorsTarget.class);
2725
}
2826

29-
@Test
30-
public void testCoverageResult() {
31-
// not filtered because not private:
32-
assertLine("packageLocal", ICounter.FULLY_COVERED);
33-
34-
// not filtered because has argument:
35-
assertLine("arg", ICounter.FULLY_COVERED);
36-
37-
// not filtered because not empty - prepares arguments for super
38-
// constructor:
39-
assertLine("super", ICounter.FULLY_COVERED);
40-
41-
// not filtered because contains initialization of a field to hold
42-
// reference to an instance of outer class that is passed as an
43-
// argument:
44-
assertLine("inner", ICounter.FULLY_COVERED);
45-
46-
// not filtered because not empty - contains initialization of
47-
// a field:
48-
assertLine("innerStatic", ICounter.FULLY_COVERED);
49-
50-
// not filtered because default constructor for not private inner
51-
// classes is not private:
52-
assertLine("publicDefault", ICounter.FULLY_COVERED);
53-
assertLine("packageLocalDefault", ICounter.FULLY_COVERED);
54-
55-
assertLine("privateDefault", ICounter.EMPTY);
56-
57-
assertLine("privateNonEmptyNoArg", ICounter.FULLY_COVERED);
58-
59-
assertLine("privateEmptyNoArg", ICounter.EMPTY);
60-
assertLine("return", ICounter.EMPTY);
61-
}
62-
6327
}

‎org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/ControlStructureBeforeSuperConstructorTest.java‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,17 @@
1111
*******************************************************************************/
1212
package org.jacoco.core.test.validation.java5;
1313

14-
import org.jacoco.core.analysis.ICounter;
1514
import org.jacoco.core.test.validation.ValidationTestBase;
1615
import org.jacoco.core.test.validation.java5.targets.ControlStructureBeforeSuperConstructorTarget;
17-
import org.junit.Test;
1816

1917
/**
2018
* Test of probes before the super constructor call.
2119
*/
22-
public class ControlStructureBeforeSuperConstructorTest extends ValidationTestBase {
20+
public class ControlStructureBeforeSuperConstructorTest
21+
extends ValidationTestBase {
2322

2423
public ControlStructureBeforeSuperConstructorTest() {
2524
super(ControlStructureBeforeSuperConstructorTarget.class);
2625
}
2726

28-
@Test
29-
public void testCoverageResult() {
30-
31-
assertLine("super", ICounter.PARTLY_COVERED, 3, 1);
32-
33-
}
34-
3527
}

‎org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/ControlStructuresTest.java‎

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
*******************************************************************************/
1212
package org.jacoco.core.test.validation.java5;
1313

14-
import org.jacoco.core.analysis.ICounter;
1514
import org.jacoco.core.test.validation.ValidationTestBase;
1615
import org.jacoco.core.test.validation.java5.targets.ControlStructuresTarget;
17-
import org.junit.Test;
1816

1917
/**
2018
* Tests of basic Java control structures.
@@ -25,114 +23,4 @@ public ControlStructuresTest() {
2523
super(ControlStructuresTarget.class);
2624
}
2725

28-
@Test
29-
public void testCoverageResult() {
30-
31-
// 1. Direct unconditional execution
32-
assertLine("unconditional", ICounter.FULLY_COVERED);
33-
34-
// 2. Missed if block
35-
assertLine("iffalse", ICounter.FULLY_COVERED, 1, 1);
36-
assertLine("missedif", ICounter.NOT_COVERED);
37-
assertLine("executedelse", ICounter.FULLY_COVERED);
38-
39-
// 3. Executed if block
40-
assertLine("iftrue", ICounter.FULLY_COVERED, 1, 1);
41-
assertLine("executedif", ICounter.FULLY_COVERED);
42-
assertLine("missedelse", ICounter.NOT_COVERED);
43-
44-
// 4. Missed while block
45-
assertLine("whilefalse", ICounter.FULLY_COVERED, 1, 1);
46-
assertLine("missedwhile", ICounter.NOT_COVERED);
47-
48-
// 5. Always true while block
49-
assertLine("whiletrue", ICounter.FULLY_COVERED, 1, 1);
50-
51-
// 6. Executed while block
52-
assertLine("whiletruefalse", ICounter.FULLY_COVERED, 0, 2);
53-
assertLine("executedwhile", ICounter.FULLY_COVERED);
54-
55-
// 7. Executed do while block
56-
assertLine("executeddowhile", ICounter.FULLY_COVERED);
57-
assertLine("executeddowhilefalse", ICounter.FULLY_COVERED, 1, 1);
58-
59-
// 8. Missed for block
60-
assertLine("missedforincrementer", ICounter.PARTLY_COVERED, 1, 1);
61-
assertLine("missedfor", ICounter.NOT_COVERED);
62-
63-
// 9. Executed for block
64-
assertLine("executedforincrementer", ICounter.FULLY_COVERED, 0, 2);
65-
assertLine("executedfor", ICounter.FULLY_COVERED);
66-
67-
// 10. Missed for each block
68-
assertLine("missedforeachincrementer", ICounter.PARTLY_COVERED, 1, 1);
69-
assertLine("missedforeach", ICounter.NOT_COVERED);
70-
71-
// 11. Executed for each block
72-
assertLine("executedforeachincrementer", ICounter.FULLY_COVERED, 0, 2);
73-
assertLine("executedforeach", ICounter.FULLY_COVERED);
74-
75-
// 12. Table switch with hit
76-
assertLine("tswitch1", ICounter.FULLY_COVERED, 3, 1);
77-
assertLine("tswitch1case1", ICounter.NOT_COVERED);
78-
assertLine("tswitch1case2", ICounter.FULLY_COVERED);
79-
assertLine("tswitch1case3", ICounter.NOT_COVERED);
80-
assertLine("tswitch1default", ICounter.NOT_COVERED);
81-
82-
// 13. Continued table switch with hit
83-
assertLine("tswitch2", ICounter.FULLY_COVERED, 3, 1);
84-
assertLine("tswitch2case1", ICounter.NOT_COVERED);
85-
assertLine("tswitch2case2", ICounter.FULLY_COVERED);
86-
assertLine("tswitch2case3", ICounter.FULLY_COVERED);
87-
assertLine("tswitch2default", ICounter.FULLY_COVERED);
88-
89-
// 14. Table switch without hit
90-
assertLine("tswitch2", ICounter.FULLY_COVERED, 3, 1);
91-
assertLine("tswitch3case1", ICounter.NOT_COVERED);
92-
assertLine("tswitch3case2", ICounter.NOT_COVERED);
93-
assertLine("tswitch3case3", ICounter.NOT_COVERED);
94-
assertLine("tswitch3default", ICounter.FULLY_COVERED);
95-
96-
// 15. Lookup switch with hit
97-
assertLine("lswitch1", ICounter.FULLY_COVERED, 3, 1);
98-
assertLine("lswitch1case1", ICounter.NOT_COVERED);
99-
assertLine("lswitch1case2", ICounter.FULLY_COVERED);
100-
assertLine("lswitch1case3", ICounter.NOT_COVERED);
101-
assertLine("lswitch1default", ICounter.NOT_COVERED);
102-
103-
// 16. Continued lookup switch with hit
104-
assertLine("lswitch2", ICounter.FULLY_COVERED, 3, 1);
105-
assertLine("lswitch2case1", ICounter.NOT_COVERED);
106-
assertLine("lswitch2case2", ICounter.FULLY_COVERED);
107-
assertLine("lswitch2case3", ICounter.FULLY_COVERED);
108-
assertLine("lswitch2default", ICounter.FULLY_COVERED);
109-
110-
// 17. Lookup switch without hit
111-
assertLine("lswitch3", ICounter.FULLY_COVERED, 3, 1);
112-
assertLine("lswitch3case1", ICounter.NOT_COVERED);
113-
assertLine("lswitch3case2", ICounter.NOT_COVERED);
114-
assertLine("lswitch3case3", ICounter.NOT_COVERED);
115-
assertLine("lswitch3default", ICounter.FULLY_COVERED);
116-
117-
// 18. Break statement
118-
assertLine("executedbreak", ICounter.FULLY_COVERED);
119-
assertLine("missedafterbreak", ICounter.NOT_COVERED);
120-
121-
// 19. Continue statement
122-
assertLine("executedcontinue", ICounter.FULLY_COVERED);
123-
assertLine("missedaftercontinue", ICounter.NOT_COVERED);
124-
125-
// 20. Conditional return statement
126-
assertLine("conditionalreturn", ICounter.FULLY_COVERED);
127-
assertLine("afterconditionalreturn", ICounter.NOT_COVERED);
128-
129-
// 21. Implicit return
130-
assertLine("implicitreturn", ICounter.FULLY_COVERED);
131-
132-
// 22. Explicit return
133-
assertLine("explicitreturn", ICounter.FULLY_COVERED);
134-
assertLine("afterexplicitreturn", ICounter.EMPTY);
135-
136-
}
137-
13826
}

0 commit comments

Comments
 (0)