From 5b591a506bffa05d82d2d28895dabd600e0496fd Mon Sep 17 00:00:00 2001 From: Jan Materne Date: Wed, 25 Jul 2007 10:49:04 +0000 Subject: [PATCH] Java 1.3 compatibility. (String.contains() is Java5+) git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@559393 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/taskdefs/JarTest.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java index 977767ecf..1fb1f5b62 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java @@ -274,30 +274,30 @@ public class JarTest extends BuildFileTest { public void testNoVersionInfoIgnore() { executeTarget("testNoVersionInfoIgnore"); - assertTrue( getFullLog().contains("No Implementation-Title set.") ); - assertTrue( getFullLog().contains("No Implementation-Version set.") ); - assertTrue( getFullLog().contains("No Implementation-Vendor set.") ); + assertTrue( getFullLog().indexOf("No Implementation-Title set.") > -1 ); + assertTrue( getFullLog().indexOf("No Implementation-Version set.") > -1 ); + assertTrue( getFullLog().indexOf("No Implementation-Vendor set.") > -1 ); } public void testNoVersionInfoWarn() { executeTarget("testNoVersionInfoWarn"); - assertTrue( getLog().contains("No Implementation-Title set.") ); - assertTrue( getLog().contains("No Implementation-Version set.") ); - assertTrue( getLog().contains("No Implementation-Vendor set.") ); + assertTrue( getLog().indexOf("No Implementation-Title set.") > -1 ); + assertTrue( getLog().indexOf("No Implementation-Version set.") > -1 ); + assertTrue( getLog().indexOf("No Implementation-Vendor set.") > -1 ); } public void testNoVersionInfoNoStrict() { executeTarget("testNoVersionInfoNoStrict"); - assertFalse( getLog().contains("No Implementation-Title set.") ); - assertFalse( getLog().contains("No Implementation-Version set.") ); - assertFalse( getLog().contains("No Implementation-Vendor set.") ); + assertFalse( getLog().indexOf("No Implementation-Title set.") > -1 ); + assertFalse( getLog().indexOf("No Implementation-Version set.") > -1 ); + assertFalse( getLog().indexOf("No Implementation-Vendor set.") > -1 ); } public void testHasVersionInfo() { executeTarget("testHasVersionInfo"); - assertFalse( getLog().contains("No Implementation-Title set.") ); - assertFalse( getLog().contains("No Implementation-Version set.") ); - assertFalse( getLog().contains("No Implementation-Vendor set.") ); + assertFalse( getLog().indexOf("No Implementation-Title set.") > -1 ); + assertFalse( getLog().indexOf("No Implementation-Version set.") > -1 ); + assertFalse( getLog().indexOf("No Implementation-Vendor set.") > -1 ); } }