svn commit: r989688 - /incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java

[mn...@apache.org]

Author: mnuttall
Date: Thu Aug 26 13:50:35 2010
New Revision: 989688

URL: http://svn.apache.org/viewvc?rev=989688&view=rev
Log:
ARIES-361: Provisioning changes required to support application isolation. Fix unit test problem so that it tolerates Java5 and Java6 at runtime. 

Modified:
    incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java

Modified: incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java?rev=989688&r1=989687&r2=989688&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java Thu Aug 26 13:50:35 2010
@@ -165,8 +165,9 @@ public abstract class AbstractBundleReso
     for(ImportedService svc : bundleResource.getImportedServices()) {
       if (svc.getInterface().equals("aries.ws.eba.import")) {
         count++;
-        assertEquals("The filter is wrong.", "(&(objectClass=aries.ws.eba.import)(service=service)(mandatory:<*service))",
-          svc.getAttributeFilter());
+        assertTrue("objectClass should be aries.ws.eba.import", svc.getAttributeFilter().contains("(objectClass=aries.ws.eba.import)"));
+        assertTrue("(service=service) should be present", svc.getAttributeFilter().contains("(service=service)"));
+        assertTrue("(mandatory:<*service) should be present", svc.getAttributeFilter().contains("(mandatory:<*service)"));        
       } 
     }