diff options
| author | Marc R. Hoffmann <hoffmann@mountainminds.com> | 2010-12-12 20:59:28 +0000 |
|---|---|---|
| committer | Marc R. Hoffmann <hoffmann@mountainminds.com> | 2010-12-12 20:59:28 +0000 |
| commit | 734dce498104901b7aa987f40eaf57f06ac7d57f (patch) | |
| tree | cc164dad65adc1de6a7c55777e7bcb2370372592 /org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java | |
| parent | afa2a04de6fd179ce54b00181ffe3ef8bf768632 (diff) | |
| download | jacoco-734dce498104901b7aa987f40eaf57f06ac7d57f.tar.gz | |
Track #66: replace block counter with branch counter
Diffstat (limited to 'org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java')
| -rw-r--r-- | org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java index 5d03dc77..9b71fe14 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java @@ -37,7 +37,8 @@ public class NodeComparatorTest { ICoverageNode d4 = new MockBlockData(60);
ICoverageNode d5 = new MockBlockData(99);
final List<ICoverageNode> result = CounterComparator.TOTALITEMS.on(
- CounterEntity.BLOCK).sort(Arrays.asList(d3, d5, d1, d4, d2));
+ CounterEntity.INSTRUCTION).sort(
+ Arrays.asList(d3, d5, d1, d4, d2));
assertEquals(Arrays.asList(d1, d2, d3, d4, d5), result);
}
@@ -46,7 +47,7 @@ public class NodeComparatorTest { ICoverageNode d1 = new MockBlockLineData(5, 30);
ICoverageNode d2 = new MockBlockLineData(3, 80);
final NodeComparator c1 = CounterComparator.TOTALITEMS
- .on(CounterEntity.BLOCK);
+ .on(CounterEntity.INSTRUCTION);
final NodeComparator c2 = CounterComparator.TOTALITEMS
.on(CounterEntity.LINE);
assertTrue(c1.second(c2).compare(d1, d2) > 0);
@@ -57,7 +58,7 @@ public class NodeComparatorTest { ICoverageNode d1 = new MockBlockLineData(5, 30);
ICoverageNode d2 = new MockBlockLineData(5, 80);
final NodeComparator c1 = CounterComparator.TOTALITEMS
- .on(CounterEntity.BLOCK);
+ .on(CounterEntity.INSTRUCTION);
final NodeComparator c2 = CounterComparator.TOTALITEMS
.on(CounterEntity.LINE);
assertTrue(c1.second(c2).compare(d1, d2) < 0);
@@ -66,14 +67,15 @@ public class NodeComparatorTest { private static final class MockBlockData extends CoverageNodeImpl {
MockBlockData(int total) {
super(GROUP, "mock", false);
- blockCounter = CounterImpl.getInstance(total, false);
+ instructionCounter = CounterImpl.getInstance(total, false);
}
}
private static final class MockBlockLineData extends CoverageNodeImpl {
- MockBlockLineData(int totalBlock, int totalLine) {
+ MockBlockLineData(int totalInstruction, int totalLine) {
super(GROUP, "mock", false);
- blockCounter = CounterImpl.getInstance(totalBlock, false);
+ instructionCounter = CounterImpl.getInstance(totalInstruction,
+ false);
lineCounter = CounterImpl.getInstance(totalLine, false);
}
}
|