improve error message when parsing short ID fails

Change-Id: Ie36d1279a55cdad56a95cac44c49079264da0c5f

1 files changed, 7 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/ReviewHarness.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/ReviewHarness.java
index a6ac5e8a6..3d5f3683b 100644
--- a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/ReviewHarness.java
+++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/ReviewHarness.java
@@ -152,20 +152,20 @@ class ReviewHarness {
 	}
 
 	String parseShortId(String commitMessage) {
-		String shortId = StringUtils.trimToEmpty(StringUtils.substringAfterLast(commitMessage, "/"));
-		shortId = StringUtils.substringBefore(shortId, " ");
+		String tail = StringUtils.trimToEmpty(StringUtils.substringAfterLast(commitMessage, "/"));
+		String shortId = StringUtils.substringBefore(tail, " ");
 		try {
 			Integer.parseInt(shortId);
 		} catch (NumberFormatException e) {
-			fail("ShortId could not be parsed: " + e.getMessage());
+			fail("ShortId could not be parsed from \"" + tail + "\". Commit message was: " + commitMessage);
 		}
 		return shortId;
 	}
 
 	void assertIsRecent(Date date) {
 		long timeDelta = System.currentTimeMillis() - date.getTime();
-		assertThat("Creation delta out of range : " + timeDelta + " ms", timeDelta > -CREATION_TIME_DELTA
-				&& timeDelta < CREATION_TIME_DELTA, is(true));
+		assertThat("Creation delta out of range : " + timeDelta + " ms",
+				timeDelta > -CREATION_TIME_DELTA && timeDelta < CREATION_TIME_DELTA, is(true));
 	}
 
 	public void dispose() throws GerritException {
@@ -241,8 +241,8 @@ class ReviewHarness {
 						}
 					});
 
-			TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
-					GerritFixture.current().getRepositoryUrl());
+			TaskRepository repository = TasksUiPlugin.getRepositoryManager()
+					.getRepository(GerritFixture.current().getRepositoryUrl());
 			adminClient = GerritClient.create(repository, location);
 		}
 		return adminClient;