Bug 184439 - Test failures from getting Ant from Orbit
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
index 8ece1e9..42048c5 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
@@ -580,7 +580,21 @@
String msg= (String)AntTestChecker.getDefault().getMessages().get(15);
//msg depends on whether self hosting testing or build testing
- assertTrue("Message incorrect: " + msg, msg.endsWith("org.apache.ant") || msg.endsWith(PLUGIN_VERSION));
+ assertTrue("Message incorrect: " + msg, checkAntHomeMessage(msg));
+ }
+
+ private boolean checkAntHomeMessage(String message) {
+ if (message.endsWith("org.apache.ant")) {
+ return true;
+ }
+
+ int index = message.lastIndexOf(PLUGIN_VERSION);
+ if (index == -1) {
+ return false;
+ }
+ //org.apache.ant_1.7.0.v200704241635
+ int result = message.length() - (index + PLUGIN_VERSION.length());
+ return result == 14;
}
/**
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java b/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java
index a9006cd..fd6ba33 100644
--- a/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java
+++ b/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java
@@ -217,9 +217,23 @@
launch("environmentVar");
assertTrue("Incorrect number of messages logged for build. Should be 6. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 6);
String message= ConsoleLineTracker.getMessage(1);
- assertTrue("Incorrect message. Should end with org.apache.ant. Message: " + message, message.endsWith("org.apache.ant") || message.endsWith(PLUGIN_VERSION));
+ assertTrue("Incorrect message. Should end with org.apache.ant. Message: " + message, checkAntHomeMessage(message));
message= ConsoleLineTracker.getMessage(2);
- assertTrue("Incorrect message. Should end with org.apache.ant. Message: " + message, message.endsWith("org.apache.ant") || message.endsWith(PLUGIN_VERSION));
+ assertTrue("Incorrect message. Should end with org.apache.ant. Message: " + message, checkAntHomeMessage(message));
}
+
+ private boolean checkAntHomeMessage(String message) {
+ if (message.endsWith("org.apache.ant")) {
+ return true;
+ }
+
+ int index = message.lastIndexOf(PLUGIN_VERSION);
+ if (index == -1) {
+ return false;
+ }
+ //org.apache.ant_1.7.0.v200704241635
+ int result = message.length() - (index + PLUGIN_VERSION.length());
+ return result == 14;
+ }
}
