Changeset 3266 for trunk/components/blitz/test/ome/services/blitz/test/utests/RingTest.java

Timestamp:

01/12/09 08:49:32 (19 months ago)

Author:

jmoore

Message:

OmeroClustering : Moving away from jgroups to straight multicast/jdbc approach

The ReplicatedHashMap implementation used from the org.jgroups.blocks
package had issues with our usage of the map. Since we are already
guaranteed a share storage (the db) for all blitz instances within
a single cluster, we are now using Ice's multicast support (from 3.3)
as well as simpleJdbcTemplate to manage the same information that was
previously in jgroups.
(cherry-pick from commit e50eed4204c2a1d360c2b261b5e6a7618573ba65)

Files:

• trunk/components/blitz/test/ome/services/blitz/test/utests/RingTest.java (modified) (3 diffs)

trunk/components/blitz/test/ome/services/blitz/test/utests/RingTest.java

@@ -7 +7 @@
 package ome.services.blitz.test.utests;
 
+import javax.sql.DataSource;
+
 import ome.services.blitz.fire.Ring;
+import ome.system.OmeroContext;
 
-import org.jgroups.blocks.ReplicatedTree;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -23 +24 @@
 public class RingTest extends MockObjectTestCase {
 
-    ReplicatedTree tree1, tree2;
+    OmeroContext ctx;
+    SimpleJdbcTemplate jdbc;
+    Ice.ObjectAdapter oa;
     Ice.Communicator ic;
-    Mock mockIc; 
-    
-    @BeforeClass
-    public void setup() throws Exception {
-        tree1 = new ReplicatedTree("test", "session_ring.xml", 1000);
-        tree2= new ReplicatedTree("test", "session_ring.xml", 1000);
-        tree1.start();
-        tree2.start();
-    }
-    
+    Mock mockIc, mockOa;
+
     @BeforeTest
     public void setupMethod() throws Exception {
         mockIc = mock(Ice.Communicator.class);
         ic = (Ice.Communicator) mockIc.proxy();
+        mockOa = mock(Ice.ObjectAdapter.class);
+        oa = (Ice.ObjectAdapter) mockOa.proxy();
+        ctx = new OmeroContext(new String[] {
+                "classpath:ome/config.xml",
+                "classpath:ome/services/datalayer.xml" });
+        DataSource dataSource = (DataSource) ctx.getBean("dataSource");
+        jdbc = new SimpleJdbcTemplate(dataSource);
+
     }
-    
-    @AfterClass
-    public void tearDown() {
-        tree1.stop();
-        tree2.stop();
-    }
-    
-    //@Test
-    public void testMain() throws Exception {
-        Ring.main(new String[]{});
-    }
-    
+
     @Test
     public void testFirstTakesOver() throws Exception {
-        Ring one = new Ring("takeover", "session_ring.xml");
-        one.init(ic, "one");
+        Ring one = new Ring(jdbc);
+        one.setApplicationEventPublisher(ctx);
+        one.init(oa, "one");
         assertEquals("one", one.getRedirect());
-        Ring two = new Ring("takeover", "session_ring.xml");
-        two.init(ic, "two");
+        Ring two = new Ring(jdbc);
+        two.setApplicationEventPublisher(ctx);
+        two.init(oa, "two");
         assertEquals("one", two.getRedirect());
     }
@@ -66 +60 @@
         fail();
     }
-    
+
     @Test
     public void testHandlesMissingServers() throws Exception {
         fail();
     }
-    
+
     @Test
     public void testRemovesUnreachable() throws Exception {
         fail();
     }
-    
+
     @Test
     public void testReaddsSelfIfTemporarilyUnreachable() throws Exception {
         fail();
     }
-    
+
     @Test
-    public void testLotsOfCalls() throws Exception {
-        int i = 0;
-        int j = 0;
-        long start = System.currentTimeMillis();
-        for (int k = 0; k < 100; k++) {
-            i++; j++;
-            tree1.put("/1", i+"", i+"");
-            tree2.put("/2", j+"", j+"");
-        }
-
-
-        assertEquals(100, tree2.getKeys("/1").size());
-        assertEquals(100, tree1.getKeys("/2").size());
-    
-    }
-    
-    @Test
-    public void testPrintSessions() throws Exception {
-        Ring ring = new Ring("test", "session_ring.xml");
-        ring.printTree("/SESSIONS");
-        ring.destroy();
+    public void testAllSessionRemovedIfDiscoveryFails() throws Exception {
+        fail();
     }
 
+    @Test
+    public void testAllSessionsReassertedIfSessionComesBackOnline()
+            throws Exception {
+        fail();
+    }
 }