You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/01/24 09:18:19 UTC

svn commit: r499306 - in /incubator/tuscany/java/sca/services/discovery/jxta/src: main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTest.java

Author: meerajk
Date: Wed Jan 24 00:18:19 2007
New Revision: 499306

URL: http://svn.apache.org/viewvc?view=rev&rev=499306
Log:
Working unit test.

Modified:
    incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java
    incubator/tuscany/java/sca/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTest.java

Modified: incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java?view=diff&rev=499306&r1=499305&r2=499306
==============================================================================
--- incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java (original)
+++ incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java Wed Jan 24 00:18:19 2007
@@ -155,7 +155,10 @@
 
         try {
             
-            configurator.setName(getRuntimeInfo().getRuntimeId());
+            String runtimeId = getRuntimeInfo().getRuntimeId();
+            
+            configurator.setName(runtimeId);
+            configurator.setHome(new File(runtimeId));
             
             if (configurator.exists()) {
                 File pc = new File(configurator.getHome(), "PlatformConfig");
@@ -194,7 +197,6 @@
                 
         if (auth.isReadyForJoin()){
             membership.join(auth);
-            System.err.println("Joined" + domainGroup.getPeerGroupName());
         } else {
             throw new JxtaException("Unable to join domain group");
         }

Modified: incubator/tuscany/java/sca/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTest.java?view=diff&rev=499306&r1=499305&r2=499306
==============================================================================
--- incubator/tuscany/java/sca/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTest.java (original)
+++ incubator/tuscany/java/sca/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTest.java Wed Jan 24 00:18:19 2007
@@ -26,6 +26,8 @@
 import net.jxta.platform.NetworkConfigurator;
 
 import org.apache.tuscany.host.RuntimeInfo;
+import org.apache.tuscany.spi.services.work.NotificationListener;
+import org.apache.tuscany.spi.services.work.WorkScheduler;
 
 import junit.framework.TestCase;
 
@@ -47,6 +49,15 @@
 
     public void testStartAndStop() {
         
+        JxtaDiscoveryService discoveryService1 = getDiscoveryService("runtime-1", "domain");
+        
+        discoveryService1.start();
+        discoveryService1.stop();
+        
+    }
+    
+    private JxtaDiscoveryService getDiscoveryService(final String runtimeId, final String domain) {
+        
         JxtaDiscoveryService discoveryService = new JxtaDiscoveryService();
         RuntimeInfo runtimeInfo = new RuntimeInfo() {
             public File getApplicationRootDirectory() {
@@ -57,13 +68,13 @@
             }
             public URI getDomain() {
                 try {
-                    return new URI("test-domain");
+                    return new URI(domain);
                 } catch (URISyntaxException ex) {
                     throw new RuntimeException(ex);
                 }
             }
             public String getRuntimeId() {
-                return "test-runtime";
+                return runtimeId;
             }
             public boolean isOnline() {
                 return false;
@@ -77,8 +88,19 @@
         configurator.setPassword("test-password");
         
         discoveryService.setConfigurator(configurator);
-        discoveryService.start();
-        discoveryService.stop();
+        discoveryService.setWorkScheduler(new WorkScheduler() {
+            public <T extends Runnable> void scheduleWork(T work, NotificationListener<T> listener) {
+                scheduleWork(work, null);
+            }
+            public <T extends Runnable> void scheduleWork(final T work) {
+                new Thread() {
+                    public void run() {
+                        work.run();
+                    }
+                }.start();
+            }            
+        });
+        return discoveryService;
         
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org