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

Timestamp:

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

Author:

jmoore

Message:

OmeroClustering : Minor Ring changes before moving to jdbc

(cherry picked from commit e149432bb345abc61f7be7c01fbca64848e553e2)

Files:

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

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

@@ -7 +7 @@
 package ome.services.blitz.test.utests;
 
-import junit.framework.TestCase;
 import ome.services.blitz.fire.Ring;
 
 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.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -19 +21 @@
  * @since Beta4
  */
-public class RingTest extends TestCase {
+public class RingTest extends MockObjectTestCase {
 
-    // Using tree directly since the ring hides it
     ReplicatedTree tree1, tree2;
+    Ice.Communicator ic;
+    Mock mockIc; 
     
     @BeforeClass
@@ -30 +33 @@
         tree1.start();
         tree2.start();
+    }
+    
+    @BeforeTest
+    public void setupMethod() throws Exception {
+        mockIc = mock(Ice.Communicator.class);
+        ic = (Ice.Communicator) mockIc.proxy();
     }
     
@@ -41 +50 @@
     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");
+        assertEquals("one", one.getRedirect());
+        Ring two = new Ring("takeover", "session_ring.xml");
+        two.init(ic, "two");
+        assertEquals("one", two.getRedirect());
+    }
+
+    @Test
+    public void testSeveralThreadsStartAndOnlyOneValueIsSet() throws Exception {
+        fail();
+    }
+    
+    @Test
+    public void testHandlesMissingServers() throws Exception {
+        fail();
+    }
+    
+    @Test
+    public void testRemovesUnreachable() throws Exception {
+        fail();
+    }
+    
+    @Test
+    public void testReaddsSelfIfTemporarilyUnreachable() throws Exception {
+        fail();
     }
     
@@ -64 +103 @@
         Ring ring = new Ring("test", "session_ring.xml");
         ring.printTree("/SESSIONS");
+        ring.destroy();
     }