Trac #72: Consistent usage of the term "Missed" instead of "NotCovered" in all APIs
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/AbstractCounterTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/AbstractCounterTest.java
index 85f7dd8..f1faa59 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/AbstractCounterTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/AbstractCounterTest.java
@@ -32,21 +32,21 @@
}
@Test
- public void testGetTotal() {
+ public void testGetTotalCount() {
AbstractCounter c = CounterImpl.getInstance(33, 12);
assertEquals(33, c.getTotalCount(), 0.0);
}
@Test
- public void testGetCovered() {
+ public void testGetCoveredCount() {
AbstractCounter c = CounterImpl.getInstance(33, 15);
assertEquals(15, c.getCoveredCount(), 0.0);
}
@Test
- public void testGetNotCovered() {
+ public void testGetMissedCount() {
AbstractCounter c = CounterImpl.getInstance(22, 15);
- assertEquals(7, c.getNotCoveredCount(), 0.0);
+ assertEquals(7, c.getMissedCount(), 0.0);
}
@Test
@@ -68,21 +68,21 @@
}
@Test
- public void testGetNotCoveredRatio1() {
+ public void testGetMissedRatio1() {
AbstractCounter c = getInstance(20, 10);
- assertEquals(0.5, c.getNotCoveredRatio(), 0.0);
+ assertEquals(0.5, c.getMissedRatio(), 0.0);
}
@Test
- public void testGetNotCoveredRatio2() {
+ public void testGetMissedRatio2() {
AbstractCounter c = getInstance(20, 20);
- assertEquals(0.0, c.getNotCoveredRatio(), 0.0);
+ assertEquals(0.0, c.getMissedRatio(), 0.0);
}
@Test
- public void testGetNotCoveredRatio3() {
+ public void testGetMissedRatio3() {
AbstractCounter c = getInstance(0, 0);
- assertTrue(Double.isNaN(c.getNotCoveredRatio()));
+ assertTrue(Double.isNaN(c.getMissedRatio()));
}
@Test
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageTest.java
index 2630699..fc18552 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageTest.java
@@ -89,7 +89,7 @@
}
@Test
- public void testNotCovered() {
+ public void testMissed() {
final ArrayList<MethodCoverage> methods = new ArrayList<MethodCoverage>();
methods.add(createMethod(false));
methods.add(createMethod(false));
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/CounterComparatorTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/CounterComparatorTest.java
index 0ed58b5..54b173e 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/CounterComparatorTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/CounterComparatorTest.java
@@ -47,8 +47,8 @@
}
@Test
- public void testNotCoveredItemsComparator() {
- final Comparator<ICounter> cmp = CounterComparator.NOTCOVEREDITEMS;
+ public void testMissedItemsComparator() {
+ final Comparator<ICounter> cmp = CounterComparator.MISSEDITEMS;
assertCmpLess(cmp, 50, 40, 91, 80);
assertCmpEquals(cmp, 50, 40, 90, 80);
assertCmpGreater(cmp, 50, 39, 90, 80);
@@ -63,8 +63,8 @@
}
@Test
- public void testNotCoveredRatioComparator() {
- final Comparator<ICounter> cmp = CounterComparator.NOTCOVEREDRATIO;
+ public void testMissedRatioComparator() {
+ final Comparator<ICounter> cmp = CounterComparator.MISSEDRATIO;
assertCmpLess(cmp, 50, 25, 90, 44);
assertCmpEquals(cmp, 50, 10, 80, 16);
assertCmpGreater(cmp, 50, 25, 90, 46);
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageBuilderTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageBuilderTest.java
index 388bd58..24e911a 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageBuilderTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageBuilderTest.java
@@ -48,7 +48,7 @@
}
@Test
- public void testCreateClassNotCovered() {
+ public void testCreateClassMissed() {
final IClassStructureVisitor classStructure = coverageBuilder
.visitClassStructure(123L);
classStructure.visit("org/jacoco/examples/Sample", null,
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/LinesImplTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/LinesImplTest.java
index b04b7d9..6a467bc 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/LinesImplTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/LinesImplTest.java
@@ -18,7 +18,6 @@
import static org.jacoco.core.analysis.ILines.PARTLY_COVERED;
import static org.junit.Assert.assertEquals;
-import org.jacoco.core.analysis.LinesImpl;
import org.junit.Test;
/**
@@ -60,7 +59,7 @@
}
@Test
- public void testInitNotCovered() {
+ public void testInitMissed() {
ILines c = new LinesImpl(new int[] { 5, 7, 10 }, false);
assertEquals(3, c.getTotalCount(), 0.0);
assertEquals(0, c.getCoveredCount(), 0.0);
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageTest.java
index 9cfa779..074d0a4 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageTest.java
@@ -51,7 +51,7 @@
}
@Test
- public void testNotCovered() {
+ public void testMissed() {
MethodCoverage data = new MethodCoverage("sample", "()V", null);
data.addBlock(5, new int[0], false);
data.addBlock(8, new int[0], false);
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/ClassDataRecorder.java b/org.jacoco.core.test/src/org/jacoco/core/test/ClassDataRecorder.java
index bb03819..e9b5157 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/ClassDataRecorder.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/ClassDataRecorder.java
@@ -82,7 +82,7 @@
assertTrue(isCovered());
}
- public void assertNotCovered() {
+ public void assertMissed() {
assertFalse(isCovered());
}
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/AbstractCounter.java b/org.jacoco.core/src/org/jacoco/core/analysis/AbstractCounter.java
index 94dde00..4f51c6e 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/AbstractCounter.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/AbstractCounter.java
@@ -47,7 +47,7 @@
return covered;
}
- public int getNotCoveredCount() {
+ public int getMissedCount() {
return total - covered;
}
@@ -55,7 +55,7 @@
return (double) covered / total;
}
- public double getNotCoveredRatio() {
+ public double getMissedRatio() {
return (double) (total - covered) / total;
}
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/CounterComparator.java b/org.jacoco.core/src/org/jacoco/core/analysis/CounterComparator.java
index 0eb273c..c95d688 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/CounterComparator.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/CounterComparator.java
@@ -44,11 +44,11 @@
};
/**
- * Compares the absolute number of not covered items.
+ * Compares the absolute number of missed items.
*/
- public static final CounterComparator NOTCOVEREDITEMS = new CounterComparator() {
+ public static final CounterComparator MISSEDITEMS = new CounterComparator() {
public int compare(final ICounter c1, final ICounter c2) {
- return c1.getNotCoveredCount() - c2.getNotCoveredCount();
+ return c1.getMissedCount() - c2.getMissedCount();
}
};
@@ -62,12 +62,11 @@
};
/**
- * Compares the ratio of not covered items.
+ * Compares the ratio of missed items.
*/
- public static final CounterComparator NOTCOVEREDRATIO = new CounterComparator() {
+ public static final CounterComparator MISSEDRATIO = new CounterComparator() {
public int compare(final ICounter c1, final ICounter c2) {
- return Double.compare(c1.getNotCoveredRatio(), c2
- .getNotCoveredRatio());
+ return Double.compare(c1.getMissedRatio(), c2.getMissedRatio());
}
};
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/ICounter.java b/org.jacoco.core/src/org/jacoco/core/analysis/ICounter.java
index 6841dbe..07687cd 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/ICounter.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/ICounter.java
@@ -37,11 +37,11 @@
public int getCoveredCount();
/**
- * Returns the total count of items not covered.
+ * Returns the total count of missed items.
*
- * @return total count of items not covered
+ * @return total count of missed items
*/
- public int getNotCoveredCount();
+ public int getMissedCount();
/**
* Calculates the ratio of covered to total count items. If total count
@@ -52,11 +52,11 @@
public double getCoveredRatio();
/**
- * Calculates the ratio of not covered to total count items. If total count
- * items is 0 this method returns NaN.
+ * Calculates the ratio of missed to total count items. If total count items
+ * is 0 this method returns NaN.
*
- * @return ratio of not covered to total count items
+ * @return ratio of missed to total count items
*/
- public double getNotCoveredRatio();
+ public double getMissedRatio();
}
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index f756ae4..dfcded1 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -17,6 +17,13 @@
<h1>Change History</h1>
+<h2>Next Release</h2>
+
+<h3>API Changes</h3>
+<ul>
+ <li>Consistent usage of the term "Missed" instead of "NotCovered" in all APIs (Trac #72).</li>
+</ul>
+
<h2>Release 0.3.1 (2010/02/09)</h2>
<h3>Fixed Bugs</h3>
diff --git a/org.jacoco.report/src/org/jacoco/report/csv/ClassColumn.java b/org.jacoco.report/src/org/jacoco/report/csv/ClassColumn.java
index 1f728b1..b04824d 100644
--- a/org.jacoco.report/src/org/jacoco/report/csv/ClassColumn.java
+++ b/org.jacoco.report/src/org/jacoco/report/csv/ClassColumn.java
@@ -90,7 +90,7 @@
final ICounter counter = node.getCounter(entity);
writer.write(counter.getCoveredCount());
- writer.write(counter.getNotCoveredCount());
+ writer.write(counter.getMissedCount());
}
writer.nextLine();
diff --git a/org.jacoco.report/src/org/jacoco/report/csv/CsvReportFile.java b/org.jacoco.report/src/org/jacoco/report/csv/CsvReportFile.java
index 6f16f97..f625e0e 100644
--- a/org.jacoco.report/src/org/jacoco/report/csv/CsvReportFile.java
+++ b/org.jacoco.report/src/org/jacoco/report/csv/CsvReportFile.java
@@ -120,7 +120,7 @@
for (final CounterEntity entity : COUNTERS) {
writer.write(entity.name() + "_COVERED");
- writer.write(entity.name() + "_NOTCOVERED");
+ writer.write(entity.name() + "_MISSED");
}
writer.nextLine();
diff --git a/org.jacoco.report/src/org/jacoco/report/html/BarColumn.java b/org.jacoco.report/src/org/jacoco/report/html/BarColumn.java
index da33f08..7e83219 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/BarColumn.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/BarColumn.java
@@ -86,8 +86,8 @@
final HTMLElement td = tr.td();
if (max > 0) {
final ICounter counter = item.getNode().getCounter(entity);
- final int notCovered = counter.getNotCoveredCount();
- bar(td, notCovered, Resources.REDBAR, resources, base);
+ final int missed = counter.getMissedCount();
+ bar(td, missed, Resources.REDBAR, resources, base);
final int covered = counter.getCoveredCount();
bar(td, covered, Resources.GREENBAR, resources, base);
}
diff --git a/org.jacoco.report/src/org/jacoco/report/html/CounterColumn.java b/org.jacoco.report/src/org/jacoco/report/html/CounterColumn.java
index 7f601f4..dea2313 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/CounterColumn.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/CounterColumn.java
@@ -94,7 +94,7 @@
tr.td(); // extra column to allow alignment to the right
final ICounter c = node.getCounter(entity);
tr.td(Styles.CTR1).text(
- integerFormat.format(c.getNotCoveredCount())).text(" / ");
+ integerFormat.format(c.getMissedCount())).text(" / ");
tr.td(Styles.CTR2).text(integerFormat.format(c.getTotalCount()));
}
}
diff --git a/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java b/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java
index ddd2ef3..533e64d 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java
@@ -50,7 +50,7 @@
* The default sorting which is absolute not covered instructions and
* absolute total instructions as the second criterion.
*/
- public static final Comparator<ICoverageNode> DEFAULT_SORTING = CounterComparator.NOTCOVEREDITEMS
+ public static final Comparator<ICoverageNode> DEFAULT_SORTING = CounterComparator.MISSEDITEMS
.reverse().on(CounterEntity.INSTRUCTION).second(
CounterComparator.TOTALITEMS.reverse().on(
CounterEntity.INSTRUCTION));
diff --git a/org.jacoco.report/src/org/jacoco/report/xml/NodeWithCoverage.java b/org.jacoco.report/src/org/jacoco/report/xml/NodeWithCoverage.java
index 7acbb9d..193433e 100644
--- a/org.jacoco.report/src/org/jacoco/report/xml/NodeWithCoverage.java
+++ b/org.jacoco.report/src/org/jacoco/report/xml/NodeWithCoverage.java
@@ -81,8 +81,7 @@
counterNode.attr("type", counterEntity.name());
counterNode
.attr("covered", Integer.toString(counter.getCoveredCount()));
- counterNode.attr("notcovered", Integer.toString(counter
- .getNotCoveredCount()));
+ counterNode.attr("missed", Integer.toString(counter.getMissedCount()));
counterNode.close();
}
diff --git a/org.jacoco.report/src/org/jacoco/report/xml/report.dtd b/org.jacoco.report/src/org/jacoco/report/xml/report.dtd
index e27091e..4d6b7d8 100644
--- a/org.jacoco.report/src/org/jacoco/report/xml/report.dtd
+++ b/org.jacoco.report/src/org/jacoco/report/xml/report.dtd
@@ -38,4 +38,4 @@
<!ATTLIST counter
type CDATA #REQUIRED
covered CDATA #REQUIRED
- notcovered CDATA #REQUIRED>
\ No newline at end of file
+ missed CDATA #REQUIRED>
\ No newline at end of file