Author: sgoeschl
Date: Sun May 13 13:55:44 2007
New Revision: 537658
URL: http://svn.apache.org/viewvc?view=rev&rev=537658
Log:
The "code-wrestled" resources actually broken the regression tests - fixed it
Modified:
jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java
Modified:
jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java?view=diff&rev=537658&r1=537657&r2=537658
==============================================================================
---
jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java
(original)
+++
jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java
Sun May 13 13:55:44 2007
@@ -132,31 +132,31 @@
String[] resourceContext1 = { "foo" };
assertTrue( this.service.exists( resourceDomain, resourceContext1,
"foo.groovy" ) );
result = new String( this.service.read( resourceDomain,
resourceContext1, "foo.groovy" ) );
- assertEquals( "return \"FOO\";", result );
+ assertTrue( result.indexOf("return \"FOO\";") > 0 );
// direct match
String[] resourceContext2 = { "foo", "bar" };
assertTrue( this.service.exists( resourceDomain, resourceContext2,
"bar.groovy" ) );
result = new String( this.service.read( resourceDomain,
resourceContext2, "bar.groovy" ) );
- assertEquals( "return \"BAR\";", result );
+ assertTrue( result.indexOf("return \"BAR\";") > 0 );
// we have to go up one level to find foo.groofy
String[] resourceContext3 = { "foo", "bar" };
assertTrue( this.service.exists( resourceDomain, resourceContext3,
"foo.groovy" ) );
result = new String( this.service.read( resourceDomain,
resourceContext3, "foo.groovy" ) );
- assertEquals( "return \"FOO\";", result );
+ assertTrue( result.indexOf("return \"FOO\";") > 0 );
// test the locate() method to retrieve foo.groovy
result = this.service.locate( resourceDomain, resourceContext3,
"foo.groovy" );
assertEquals( "foo/foo.groovy", result );
result = new String( this.service.read( resourceDomain, result ) );
- assertEquals( "return \"FOO\";", result );
+ assertTrue( result.indexOf("return \"FOO\";") > 0 );
// we have to go up two levels to find empty.groovy
String[] resourceContext4 = { "foo", "bar" };
assertTrue( this.service.exists( resourceDomain, resourceContext4,
"empty.groovy" ) );
result = new String( this.service.read( resourceDomain,
resourceContext4, "empty.groovy" ) );
- assertEquals( "return true;", result );
+ assertTrue( result.indexOf("return true;") > 0 );
// search for a non-existing resource with an existing context
String[] resourceContext5 = { "foo", "bar" };
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
