Apply suggestions from code review

Co-authored-by: Evgeny Mandrikov <138671+Godin@users.noreply.github.com>
jacoco · Feb 3, 2022 · f9e49cf · f9e49cf
1 parent 9e736bf
commit f9e49cf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/CoverageTransformerTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/CoverageTransformerTest.java
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.jacoco.agent.rt.internal;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -214,11 +215,15 @@ public void testTransformFailure() {
 					protectionDomain, null);
 			fail("IllegalClassFormatException expected.");
 		} catch (IllegalClassFormatException e) {
-			assertTrue(e.getMessage(), e.getMessage()
-					.startsWith("Error while instrumenting org.jacoco.Sample"));
+			assertEquals(String.format(
+					"Error while instrumenting %s with JaCoCo %s/%s.",
+					"org.jacoco.Sample", JaCoCo.VERSION, JaCoCo.COMMITID_SHORT),
+					e.getMessage());
 		}
 		recorder.assertException(IllegalClassFormatException.class,
-				"Error while instrumenting org.jacoco.Sample",
+				String.format("Error while instrumenting %s with JaCoCo %s/%s.",
+						"org.jacoco.Sample", JaCoCo.VERSION,
+						JaCoCo.COMMITID_SHORT),
 				IOException.class);
 		recorder.clear();
 	}

diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/ExceptionRecorder.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/ExceptionRecorder.java
@@ -14,7 +14,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * {@link IExceptionLogger} implementation for testing purposes.
@@ -51,7 +50,7 @@ public void assertException(final Class<? extends Throwable> exceptionType,
 	public void assertException(final Class<? extends Throwable> exceptionType,
 			final String message, final Class<? extends Throwable> causeType) {
 		assertEquals(exceptionType, this.exceptionType);
-		assertTrue(this.message, this.message.startsWith(message));
+		assertEquals(message, this.message);
 		assertEquals(causeType, this.causeType);
 	}
 

diff --git a/org.jacoco.core/src/org/jacoco/core/JaCoCo.java b/org.jacoco.core/src/org/jacoco/core/JaCoCo.java
@@ -19,7 +19,7 @@
  */
 public final class JaCoCo {
 
-	/** Version of JaCoCo core. */
+	/** Qualified version of JaCoCo core. */
 	public static final String VERSION;
 
 	/** Commit ID of the source tree of JaCoCo core. */