| commit | f0048215abea8d873842b184df30982ff55c31d1 | [log] [tgz] |
|---|---|---|
| author | Darin Wright <darin> | Mon Jan 26 14:59:56 2009 +0000 |
| committer | Darin Wright <darin> | Mon Jan 26 14:59:56 2009 +0000 |
| tree | 777c6261968d1a84a3bf131e0718106d98be3b4a | |
| parent | 67e504aff1d57baa462937682b93842dfab7f655 [diff] |
Bug 262378 - Ant test suite does not handle dynamic plugin version length
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 807da53..de6ed19 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
@@ -594,7 +594,10 @@ } //org.apache.ant_1.7.1.v200704241635 - msg = msg.substring(0, msg.length() - 14); + int index = msg.lastIndexOf('.'); + if (index > 0) { + msg = msg.substring(0, index); + } return msg.endsWith(PLUGIN_VERSION); }
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 d1f1e3a..c1870b9 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
@@ -225,16 +225,20 @@ } private boolean checkAntHomeMessage(String message) { - if (message.endsWith("org.apache.ant")) { + String msg = message; + if (msg.endsWith("org.apache.ant")) { return true; } - if (message.endsWith(PLUGIN_VERSION)) { + if (msg.endsWith(PLUGIN_VERSION)) { return true; } //org.apache.ant_1.7.1.v200704241635 - message = message.substring(0, message.length() - 14); - return message.endsWith(PLUGIN_VERSION); + int index = msg.lastIndexOf('.'); + if (index > 0) { + msg = msg.substring(0, index); + } + return msg.endsWith(PLUGIN_VERSION); } }