svn commit: r904511 - in /cxf/dosgi/trunk/systests2: common/src/main/java/org/apache/cxf/dosgi/systests2/common/ multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/ single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/

[davidb]

Author: davidb
Date: Fri Jan 29 15:03:04 2010
New Revision: 904511

URL: http://svn.apache.org/viewvc?rev=904511&view=rev
Log:
Some tweaks to the Discovery System Tests.

Modified:
    
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestDiscoveryRoundtrip.java
    
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
    
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
    
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java

Modified: 
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestDiscoveryRoundtrip.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestDiscoveryRoundtrip.java?rev=904511&r1=904510&r2=904511&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestDiscoveryRoundtrip.java
 (original)
+++ 
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestDiscoveryRoundtrip.java
 Fri Jan 29 15:03:04 2010
@@ -23,8 +23,6 @@
 import java.net.ServerSocket;
 import java.util.Hashtable;
 
-import javax.swing.JOptionPane;
-
 import org.apache.cxf.dosgi.systests2.common.test2.Test2Service;
 import org.apache.cxf.dosgi.systests2.common.test2.client.ClientActivator;
 import org.apache.cxf.dosgi.systests2.common.test2.client.Test2ServiceTracker;
@@ -65,7 +63,7 @@
     public void baseTestDiscoveryRoundtrip() throws Exception {
         for( Bundle b : getBundleContext().getBundles() )
         {
-            System.out.println( "*** Bundle " + b.getBundleId() + " : " + 
b.getSymbolicName() );
+            System.out.println( "*** Bundle " + b.getBundleId() + " : " + 
b.getSymbolicName() + "/" + b.getState());
         }
         
         // Find a free port to run the Zookeeper Server on
@@ -107,7 +105,7 @@
             Assert.assertFalse("Stack trace must not contain client packages. 
" +
                 "Invocation should go through the protocol stack. " +
                 "It should not be directly invoked. " + trace,
-                
trace.contains("org.apache.cxf.dosgi.systests2.single.test2.client"));
+                
trace.contains("org.apache.cxf.dosgi.systests2.common.test2.client"));
             
             // If gone through the protocol stack the following packages 
should be 
             // in there:

Modified: 
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java?rev=904511&r1=904510&r2=904511&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
 (original)
+++ 
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
 Fri Jan 29 15:03:04 2010
@@ -67,7 +67,7 @@
                 }
             }
         }
-        return startLevel;
+        return startLevel + 1; // Add 1 to start level to be on the safe side
     }
 
     private static File getRootDirectory() {

Modified: 
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java?rev=904511&r1=904510&r2=904511&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
 (original)
+++ 
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryRountrip.java
 Fri Jan 29 15:03:04 2010
@@ -45,7 +45,15 @@
         
         List<Option> opts = new ArrayList<Option>();
         
+        // Run this test under Equinox. 
+        opts.add(CoreOptions.frameworks(CoreOptions.equinox()));
+        
+        // This property sets the start level for felix
         
opts.add(CoreOptions.systemProperty("org.osgi.framework.startlevel.beginning").value(""
 + startLevel));
+        
+        // This property sets the start level for equinox
+        opts.add(CoreOptions.systemProperty("osgi.startLevel").value("" + 
startLevel));
+
         
opts.add(CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject());
         for(Map.Entry<Integer, String> entry : bundles.entrySet()) {
             
opts.add(CoreOptions.bundle(entry.getValue()).startLevel(entry.getKey()));
@@ -69,7 +77,7 @@
 
     @Test
     public void testDiscoveryRoundtrip() throws Exception {
-        // enabled soon
+        // Enabled soon
         // baseTestDiscoveryRoundtrip();
     }
 }

Modified: 
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java?rev=904511&r1=904510&r2=904511&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
 (original)
+++ 
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
 Fri Jan 29 15:03:04 2010
@@ -46,6 +46,7 @@
                 
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(),
                 
                 
CoreOptions.mavenBundle().groupId("org.apache.log4j").artifactId("com.springsource.org.apache.log4j").versionAsInProject(),
+                
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper").versionAsInProject(),
                 
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-discovery-distributed-zookeeper-server").versionAsInProject(),
                 
                 // This bundle contains the common system testing code
@@ -62,7 +63,7 @@
 
     @Test
     public void testDiscoveryRoundtrip() throws Exception {
-        // enabled soon
-        // baseTestDiscoveryRoundtrip();
+         // Enabled soon
+         // baseTestDiscoveryRoundtrip();
     }
 }