Trac #140: API documentation cleanup.

4 files changed, 22 insertions, 24 deletions

diff --git a/org.jacoco.core.test/src/org/jacoco/core/JaCoCoTest.java b/org.jacoco.core.test/src/org/jacoco/core/JaCoCoTest.java
index 608df40e..2b450361 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/JaCoCoTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/JaCoCoTest.java
@@ -17,8 +17,6 @@ import org.junit.Test;
 

 /**

  * Unit tests for {@link JaCoCo}.

- * 

- * @author Marc R. Hoffmann

  */

 public class JaCoCoTest {

 

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 a786b7e4..2f870743 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
@@ -76,8 +76,8 @@ public class CounterComparatorTest {
 

 	@Test

 	public void testNodeComparator1() {

-		ICoverageNode d1 = new MockBlockData(18);

-		ICoverageNode d2 = new MockBlockData(15);

+		ICoverageNode d1 = new MockNode(18);

+		ICoverageNode d2 = new MockNode(15);

 		final Comparator<ICoverageNode> cmp = CounterComparator.TOTALITEMS

 				.on(CounterEntity.INSTRUCTION);

 		assertTrue(cmp.compare(d1, d2) > 0);

@@ -85,8 +85,8 @@ public class CounterComparatorTest {
 

 	@Test

 	public void testNodeComparator2() {

-		ICoverageNode d1 = new MockBlockData(18);

-		ICoverageNode d2 = new MockBlockData(15);

+		ICoverageNode d1 = new MockNode(18);

+		ICoverageNode d2 = new MockNode(15);

 		final Comparator<ICoverageNode> cmp = CounterComparator.TOTALITEMS

 				.on(CounterEntity.LINE);

 		assertEquals(0, cmp.compare(d1, d2), 0.0);

@@ -113,8 +113,8 @@ public class CounterComparatorTest {
 		return CounterImpl.getInstance(missed, covered);

 	}

 

-	private static final class MockBlockData extends CoverageNodeImpl {

-		MockBlockData(int total) {

+	private static final class MockNode extends CoverageNodeImpl {

+		MockNode(int total) {

 			super(GROUP, "mock");

 			instructionCounter = CounterImpl.getInstance(total, 0);

 		}

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 df7f3faf..a29b4d3d 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
@@ -29,11 +29,11 @@ public class NodeComparatorTest {
 

 	@Test

 	public void testSort() {

-		ICoverageNode d1 = new MockBlockData(18);

-		ICoverageNode d2 = new MockBlockData(21);

-		ICoverageNode d3 = new MockBlockData(30);

-		ICoverageNode d4 = new MockBlockData(60);

-		ICoverageNode d5 = new MockBlockData(99);

+		ICoverageNode d1 = new MockNode(18);

+		ICoverageNode d2 = new MockNode(21);

+		ICoverageNode d3 = new MockNode(30);

+		ICoverageNode d4 = new MockNode(60);

+		ICoverageNode d5 = new MockNode(99);

 		final List<ICoverageNode> result = CounterComparator.TOTALITEMS.on(

 				CounterEntity.INSTRUCTION).sort(

 				Arrays.asList(d3, d5, d1, d4, d2));

@@ -42,8 +42,8 @@ public class NodeComparatorTest {
 

 	@Test

 	public void testSecond1() {

-		ICoverageNode d1 = new MockBlockLineData(5, 30);

-		ICoverageNode d2 = new MockBlockLineData(3, 80);

+		ICoverageNode d1 = new MockLineData(5, 30);

+		ICoverageNode d2 = new MockLineData(3, 80);

 		final NodeComparator c1 = CounterComparator.TOTALITEMS

 				.on(CounterEntity.INSTRUCTION);

 		final NodeComparator c2 = CounterComparator.TOTALITEMS

@@ -53,8 +53,8 @@ public class NodeComparatorTest {
 

 	@Test

 	public void testSecond2() {

-		ICoverageNode d1 = new MockBlockLineData(5, 30);

-		ICoverageNode d2 = new MockBlockLineData(5, 80);

+		ICoverageNode d1 = new MockLineData(5, 30);

+		ICoverageNode d2 = new MockLineData(5, 80);

 		final NodeComparator c1 = CounterComparator.TOTALITEMS

 				.on(CounterEntity.INSTRUCTION);

 		final NodeComparator c2 = CounterComparator.TOTALITEMS

@@ -62,15 +62,15 @@ public class NodeComparatorTest {
 		assertTrue(c1.second(c2).compare(d1, d2) < 0);

 	}

 

-	private static final class MockBlockData extends CoverageNodeImpl {

-		MockBlockData(int total) {

+	private static final class MockNode extends CoverageNodeImpl {

+		MockNode(int total) {

 			super(GROUP, "mock");

 			instructionCounter = CounterImpl.getInstance(total, 0);

 		}

 	}

 

-	private static final class MockBlockLineData extends CoverageNodeImpl {

-		MockBlockLineData(int totalInstruction, int totalLine) {

+	private static final class MockLineData extends CoverageNodeImpl {

+		MockLineData(int totalInstruction, int totalLine) {

 			super(GROUP, "mock");

 			instructionCounter = CounterImpl.getInstance(totalInstruction, 0);

 			lineCounter = CounterImpl.getInstance(totalLine, 0);

diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/BlocksBeforeSuperConstructorTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ProbesBeforeSuperConstructorTest.java
index b42784c9..2b1e3aa8 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/BlocksBeforeSuperConstructorTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ProbesBeforeSuperConstructorTest.java
@@ -16,11 +16,11 @@ import org.jacoco.core.test.validation.targets.Target10;
 import org.junit.Test;
 
 /**
- * Test of blocks before the super constructor call.
+ * Test of probes before the super constructor call.
  */
-public class BlocksBeforeSuperConstructorTest extends ValidationTestBase {
+public class ProbesBeforeSuperConstructorTest extends ValidationTestBase {
 
-	public BlocksBeforeSuperConstructorTest() {
+	public ProbesBeforeSuperConstructorTest() {
 		super(Target10.class);
 	}