svn commit: r1367561 - /aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependencyTestBase.java

[mnuttall]

Author: mnuttall
Date: Tue Jul 31 14:08:54 2012
New Revision: 1367561

URL: http://svn.apache.org/viewvc?rev=1367561&view=rev
Log:
Aries-893: org.apache.aries.subsystem.ctt.itests.SubsystemDependency_4CTest 
fails. Improve set logic in checkNoNewBundles

Modified:
    
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependencyTestBase.java

Modified: 
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependencyTestBase.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependencyTestBase.java?rev=1367561&r1=1367560&r2=1367561&view=diff
==============================================================================
--- 
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependencyTestBase.java
 (original)
+++ 
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependencyTestBase.java
 Tue Jul 31 14:08:54 2012
@@ -284,15 +284,20 @@ public abstract class SubsystemDependenc
         * @param rootBundlesAfter Bundles after [x]
         */
        protected void checkNoNewBundles(String failText, Bundle[] 
rootBundlesBefore, Bundle[] rootBundlesAfter) {
-               if (rootBundlesBefore.length != rootBundlesAfter.length) { 
-                       Set<String> bundlesBefore = new HashSet<String>();
-                       for (Bundle b : rootBundlesBefore) { 
-                               bundlesBefore.add(b.getSymbolicName() + "_" + 
b.getVersion().toString());
-                       }
-                       Set<String> bundlesAfter = new HashSet<String>();
-                       for (Bundle b : rootBundlesAfter) { 
-                               bundlesAfter.add(b.getSymbolicName() + "_" + 
b.getVersion().toString());
-                       }
+               Set<String> bundlesBefore = new HashSet<String>();
+               for (Bundle b : rootBundlesBefore) { 
+                       bundlesBefore.add(b.getSymbolicName() + "_" + 
b.getVersion().toString());
+               }
+               
+               Set<String> bundlesAfter = new HashSet<String>();
+               for (Bundle b : rootBundlesAfter) { 
+                       bundlesAfter.add(b.getSymbolicName() + "_" + 
b.getVersion().toString());
+               }
+               
+               boolean unchanged = bundlesBefore.containsAll(bundlesAfter) && 
+                       bundlesAfter.containsAll(bundlesBefore);
+               
+               if (!unchanged) { 
                        bundlesAfter.removeAll(bundlesBefore);
                        fail ("Extra bundles provisioned in " + failText + " : 
" + bundlesAfter);
                }