svn commit: r989794 - /incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java

[mn...@apache.org]

Author: mnuttall
Date: Thu Aug 26 16:03:19 2010
New Revision: 989794

URL: http://svn.apache.org/viewvc?rev=989794&view=rev
Log:
ARIES-361: Provisioning changes required to support application isolation. Disable an itest that's JRE-specific as it stands. 

Modified:
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=989794&r1=989793&r2=989794&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java Thu Aug 26 16:03:19 2010
@@ -56,6 +56,7 @@ import org.apache.felix.bundlerepository
 import org.apache.felix.bundlerepository.RepositoryAdmin;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -63,6 +64,10 @@ import org.ops4j.pax.exam.junit.JUnit4Te
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 
+import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+
+
 @RunWith(JUnit4TestRunner.class)
 public class OBRResolverAdvancedTest extends AbstractIntegrationTest 
 {
@@ -316,6 +321,12 @@ public class OBRResolverAdvancedTest ext
     
   }
 
+  /* MN: This test generates a new repository.xml and compares it with one we made earlier. 
+   * The problem is, the one we made earlier used an IBM JRE, which results in the elements
+   * of the repository.xml coming out in a completely different order to those seen on a Sun
+   * JRE. The test needs rework if it is going to work correctly on both JREs. 
+   */
+  @Ignore
   @Test
   public void testRepo() throws Exception {
     startApplicationRuntimeBundle();
@@ -333,11 +344,9 @@ public class OBRResolverAdvancedTest ext
       
       while (((tempFileline = reader.readLine()) != null)
           && ((expectedFileLine = expectedFileReader.readLine()) != null)) {
-
         if (!(tempFileline.contains("lastmodified"))) {
           assertEquals("The result is not expected.", expectedFileLine, tempFileline);
         }
-
       }
     } finally {
       expectedFileReader.close();
@@ -449,9 +458,9 @@ public class OBRResolverAdvancedTest ext
         mavenBundle("org.osgi", "org.osgi.compendium"),
         mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
 
-        /* For debugging, uncomment the next two lines 
+        /* For debugging, uncomment the next two lines */ 
         vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5010"),
-        waitForFrameworkStartup(), */
+        waitForFrameworkStartup(), 
 
         /* For debugging, add these imports:
         import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;