Changeset 75 for trunk/src/test/java/omq

Timestamp:

07/02/13 11:50:11 (11 years ago)

Author:

stoda

Message:

Multi problem solved

File:

• trunk/src/test/java/omq/test/workspace/WorkspaceTest.java (modified) (4 diffs)

trunk/src/test/java/omq/test/workspace/WorkspaceTest.java

@@ -20 +20 @@
 @RunWith(value = Parameterized.class)
 public class WorkspaceTest {
+        private String type;
         private static Broker serverBroker;
         private static Broker clientBroker1;
         private static Broker clientBroker2;
+        private static RemoteWorkspaceImpl w1C1;
+        private static RemoteWorkspaceImpl w3C1;
+        private static RemoteWorkspaceImpl w1C2;
+        private static RemoteWorkspaceImpl w2C2;
         private static String[] workspaces = { "w1", "w2", "w3" };
         private static RemoteWorkspace[] remoteWorks = new RemoteWorkspace[3];
@@ -28 +33 @@
         // In this case the Constructor acts as a server
         public WorkspaceTest(String type) throws Exception {
+                this.type = type;
                 Properties env = new Properties();
                 env.setProperty(ParameterQueue.USER_NAME, "guest");
@@ -75 +81 @@
                 clientBroker2 = new Broker(env);
 
+                // Client 1 will subscribe to changes in the workspaces w1 and w3
+                w1C1 = new RemoteWorkspaceImpl();
+                w3C1 = new RemoteWorkspaceImpl();
+
+                clientBroker1.bind(workspaces[0], w1C1);
+                clientBroker1.bind(workspaces[2], w3C1);
+
+                // Client 2 will subscribe to changes in the workspaces w1 and w2
+                w1C2 = new RemoteWorkspaceImpl();
+                w2C2 = new RemoteWorkspaceImpl();
+
+                clientBroker2.bind(workspaces[0], w1C2);
+                clientBroker2.bind(workspaces[1], w2C2);
+
                 System.out.println("Client 1 & client2 started");
         }
@@ -85 +105 @@
         @Test
         public void test() throws Exception {
+                System.out.println("Starting test: " + type);
                 String expected = null;
                 String actual = null;
-
-                // Client 1 will subscribe to changes in the workspaces w1 and w3
-                RemoteWorkspaceImpl w1C1 = new RemoteWorkspaceImpl();
-                RemoteWorkspaceImpl w3C1 = new RemoteWorkspaceImpl();
-
-                clientBroker1.bind(workspaces[0], w1C1);
-                clientBroker1.bind(workspaces[2], w3C1);
-
-                // Client 2 will subscribe to changes in the workspaces w1 and w2
-                RemoteWorkspaceImpl w1C2 = new RemoteWorkspaceImpl();
-                RemoteWorkspaceImpl w2C2 = new RemoteWorkspaceImpl();
-
-                clientBroker2.bind(workspaces[0], w1C2);
-                clientBroker2.bind(workspaces[2], w2C2);
 
                 // The server will notify a change in the w2