Author: jglick
Date: Mon Oct 1 14:49:24 2007
New Revision: 581086
URL: http://svn.apache.org/viewvc?rev=581086&view=rev
Log:
merge rev 559393: test compilability
Modified:
ant/core/branches/ANT_17_BRANCH/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
Modified:
ant/core/branches/ANT_17_BRANCH/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java?rev=581086&r1=581085&r2=581086&view=diff
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
Mon Oct 1 14:49:24 2007
@@ -274,30 +274,30 @@
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 );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
