Separate test scenarios in different methods (#504)
There are side effects between subsequent control structures for
different compilers. To avoid such effects test code is separated in
different methods.
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java
index 146d795..1c33521 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java
@@ -41,8 +41,7 @@
assertLine("missedelse", ICounter.NOT_COVERED);
// 4. Missed while block
- assertLine("whilefalse", isJDKCompiler ? ICounter.FULLY_COVERED
- : ICounter.PARTLY_COVERED, 1, 1);
+ assertLine("whilefalse", ICounter.FULLY_COVERED, 1, 1);
assertLine("missedwhile", ICounter.NOT_COVERED);
// 5. Always true while block
@@ -54,6 +53,7 @@
// 7. Executed do while block
assertLine("executeddowhile", ICounter.FULLY_COVERED);
+ assertLine("executeddowhilefalse", ICounter.FULLY_COVERED, 1, 1);
// 8. Missed for block
assertLine("missedforincrementer", ICounter.PARTLY_COVERED, 1, 1);
@@ -121,13 +121,17 @@
assertLine("executedcontinue", ICounter.FULLY_COVERED);
assertLine("missedaftercontinue", ICounter.NOT_COVERED);
- // 20. Return statement
- assertLine("return", ICounter.FULLY_COVERED);
- assertLine("afterreturn", ICounter.NOT_COVERED);
+ // 20. Conditional return statement
+ assertLine("conditionalreturn", ICounter.FULLY_COVERED);
+ assertLine("afterconditionalreturn", ICounter.NOT_COVERED);
// 21. Implicit return
assertLine("implicitreturn", ICounter.FULLY_COVERED);
+ // 22. Explicit return
+ assertLine("explicitreturn", ICounter.FULLY_COVERED);
+ assertLine("afterexplicitreturn", ICounter.EMPTY);
+
}
}
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target01.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target01.java
index a47e484..411691b 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target01.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target01.java
@@ -25,67 +25,126 @@
public static void main(String[] args) {
- // 1. Unconditional execution
+ unconditionalExecution();
+ missedIfBlock();
+ executedIfBlock();
+ missedWhileBlock();
+ alwaysExecutedWhileBlock();
+ executedWhileBlock();
+ executedDoWhileBlock();
+ missedForBlock();
+ executedForBlock();
+ missedForEachBlock();
+ executedForEachBlock();
+ tableSwitchWithHit();
+ continuedTableSwitchWithHit();
+ tableSwitchWithoutHit();
+ lookupSwitchWithHit();
+ continuedLookupSwitchWithHit();
+ lookupSwitchWithoutHit();
+ breakStatement();
+ continueStatement();
+ conditionalReturn();
+ implicitReturn();
+ explicitReturn();
+
+ }
+
+ private static void unconditionalExecution() {
+
nop(); // $line-unconditional$
- // 2. Missed if block
+ }
+
+ private static void missedIfBlock() {
+
if (f()) { // $line-iffalse$
nop(); // $line-missedif$
} else {
nop(); // $line-executedelse$
}
- // 3. Executed if block
+ }
+
+ private static void executedIfBlock() {
+
if (t()) { // $line-iftrue$
nop(); // $line-executedif$
} else {
nop(); // $line-missedelse$
}
- // 4. Missed while block
+ }
+
+ private static void missedWhileBlock() {
+
while (f()) { // $line-whilefalse$
nop(); // $line-missedwhile$
}
- // 5. Always executed while block
+ }
+
+ private static void alwaysExecutedWhileBlock() {
+
while (t()) { // $line-whiletrue$
if (t()) {
break;
}
}
- // 6. Executed while block
+ }
+
+ private static void executedWhileBlock() {
+
int i = 0;
while (i++ < 3) { // $line-whiletruefalse$
nop(); // $line-executedwhile$
}
- // 7. Executed do while block
+ }
+
+ private static void executedDoWhileBlock() {
+
do {
nop(); // $line-executeddowhile$
- } while (f());
+ } while (f()); // $line-executeddowhilefalse$
- // 8. Missed for block
+ }
+
+ private static void missedForBlock() {
+
for (nop(); f(); nop()) { // $line-missedforincrementer$
nop(); // $line-missedfor$
}
- // 9. Executed for block
+ }
+
+ private static void executedForBlock() {
+
for (int j = 0; j < 1; j++) { // $line-executedforincrementer$
nop(); // $line-executedfor$
}
- // 10. Missed for each block
+ }
+
+ private static void missedForEachBlock() {
+
for (Object o : Collections.emptyList()) { // $line-missedforeachincrementer$
nop(o); // $line-missedforeach$
}
- // 11. Executed for each block
+ }
+
+ private static void executedForEachBlock() {
+
for (Object o : Collections.singleton(new Object())) { // $line-executedforeachincrementer$
nop(o); // $line-executedforeach$
}
- // 12. Table switch with hit
+ }
+
+ private static void tableSwitchWithHit() {
+
switch (i2()) { // $line-tswitch1$
case 1:
nop(); // $line-tswitch1case1$
@@ -101,7 +160,10 @@
break;
}
- // 13. Continued table switch with hit
+ }
+
+ private static void continuedTableSwitchWithHit() {
+
switch (i2()) { // $line-tswitch2$
case 1:
nop(); // $line-tswitch2case1$
@@ -113,7 +175,10 @@
nop(); // $line-tswitch2default$
}
- // 14. Table switch without hit
+ }
+
+ private static void tableSwitchWithoutHit() {
+
switch (i2()) { // $line-tswitch3$
case 3:
nop(); // $line-tswitch3case1$
@@ -129,7 +194,10 @@
break;
}
- // 15. Lookup switch with hit
+ }
+
+ private static void lookupSwitchWithHit() {
+
switch (i2()) { // $line-lswitch1$
case -123:
nop(); // $line-lswitch1case1$
@@ -145,7 +213,10 @@
break;
}
- // 16. Continued lookup switch with hit
+ }
+
+ private static void continuedLookupSwitchWithHit() {
+
switch (i2()) { // $line-lswitch2$
case -123:
nop(); // $line-lswitch2case1$
@@ -157,7 +228,10 @@
nop(); // $line-lswitch2default$
}
- // 17. Lookup switch without hit
+ }
+
+ private static void lookupSwitchWithoutHit() {
+
switch (i2()) { // $line-lswitch3$
case -123:
nop(); // $line-lswitch3case1$
@@ -173,7 +247,10 @@
break;
}
- // 18. Break statement
+ }
+
+ private static void breakStatement() {
+
while (true) {
if (t()) {
break; // $line-executedbreak$
@@ -181,7 +258,10 @@
nop(); // $line-missedafterbreak$
}
- // 19. Continue statement
+ }
+
+ private static void continueStatement() {
+
for (int j = 0; j < 1; j++) {
if (t()) {
continue; // $line-executedcontinue$
@@ -189,24 +269,25 @@
nop(); // $line-missedaftercontinue$
}
- runReturn();
- runImplicitReturn();
-
}
- private static void runReturn() {
+ private static void conditionalReturn() {
- // 20. Return statement
if (t()) {
- return; // $line-return$
+ return; // $line-conditionalreturn$
}
- nop(); // $line-afterreturn$
+ nop(); // $line-afterconditionalreturn$
}
- private static void runImplicitReturn() {
+ private static void implicitReturn() {
- // 21. Implicit return
} // $line-implicitreturn$
+ private static void explicitReturn() {
+
+ return; // $line-explicitreturn$
+
+ } // $line-afterexplicitreturn$
+
}
