Changeset 48

Timestamp:

06/19/13 11:14:58 (11 years ago)

Author:

stoda

Message:

 

Location:

trunk/src/test/java/omq/test

Files:

• calculator/ServerTest.java (modified) (2 diffs)
• faultTolerance/ServerTest.java (modified) (2 diffs)
• multiProcess/ClientTest.java (modified) (5 diffs)
• multiProcess/ServerTest.java (modified) (3 diffs)
• stopBroker/ServerTest.java (modified) (2 diffs)

trunk/src/test/java/omq/test/calculator/ServerTest.java

@@ -3 +3 @@
 import java.util.Properties;
 
-import org.junit.Test;
-
 import omq.common.broker.Broker;
 import omq.common.util.ParameterQueue;
-import omq.common.util.Serializer;
+
+import org.junit.Test;
 
 public class ServerTest {
@@ -23 +22 @@
                 env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
                 env.setProperty(ParameterQueue.SERVER_PORT, "5672");
-                env.setProperty(ParameterQueue.DURABLE_QUEUES, "true");
-                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
+                env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 

trunk/src/test/java/omq/test/faultTolerance/ServerTest.java

@@ -3 +3 @@
 import java.util.Properties;
 
-import org.junit.Test;
-
 import omq.common.broker.Broker;
 import omq.common.util.ParameterQueue;
-import omq.common.util.Serializer;
 import omq.test.calculator.CalculatorImpl;
+
+import org.junit.Test;
 
 public class ServerTest {
@@ -23 +22 @@
                 env.setProperty(ParameterQueue.SERVER_PORT, "5672");
                 env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 

trunk/src/test/java/omq/test/multiProcess/ClientTest.java

@@ -3 +3 @@
 import static org.junit.Assert.assertEquals;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Properties;
 
@@ -9 +11 @@
 import omq.common.util.Serializer;
 
-import org.junit.BeforeClass;
+import org.junit.After;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(value = Parameterized.class)
 public class ClientTest {
         // Execute ServerTest.java 2 times before start this test
-        public static Number remoteNumber;
+        public Number remoteNumber;
 
-        @BeforeClass
-        public static void startClient() throws Exception {
+        public ClientTest(String type) throws Exception {
                 Properties env = new Properties();
                 env.setProperty(ParameterQueue.USER_NAME, "guest");
@@ -26 +31 @@
                 env.setProperty(ParameterQueue.SERVER_PORT, "5672");
                 env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
+                env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 
@@ -41 +46 @@
         }
 
+        @Parameters
+        public static Collection<Object[]> data() {
+                Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+                return Arrays.asList(data);
+        }
+
+        @After
+        public void stop() throws Exception {
+                Broker.stopBroker();
+        }
+
         @Test
         public void test() {
@@ -46 +62 @@
                 remoteNumber.setNumber(x);
                 int a = remoteNumber.getNumer();
-                assertEquals(a, 0);
+                assertEquals(0, a);
                 int b = remoteNumber.getNumer();
                 assertEquals(x, b);
+                remoteNumber.setNumber(0);
         }
 

trunk/src/test/java/omq/test/multiProcess/ServerTest.java

@@ -3 +3 @@
 import java.util.Properties;
 
+import org.junit.Test;
+
 import omq.common.broker.Broker;
 import omq.common.util.ParameterQueue;
-import omq.common.util.Serializer;
 
 public class ServerTest {
-        public static void main(String[] args) throws Exception {
+        @Test
+        public void test() throws Exception {
                 Properties env = new Properties();
                 env.setProperty(ParameterQueue.USER_NAME, "guest");
@@ -17 +19 @@
                 env.setProperty(ParameterQueue.SERVER_PORT, "5672");
                 env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 
@@ -26 +27 @@
                 Broker.initBroker(env);
                 Broker.bind("number", new NumberImpl());
+
+                Thread.sleep(60 * 1000);
         }
 }

trunk/src/test/java/omq/test/stopBroker/ServerTest.java

@@ -2 +2 @@
 
 import java.util.Properties;
+
+import org.junit.Test;
 
 import omq.common.broker.Broker;
@@ -9 +11 @@
 public class ServerTest {
 
-        /**
-         * @param args
-         */
-        public static void main(String[] args) throws Exception {
+        @Test
+        public void test() throws Exception {
                 Properties env = new Properties();
                 env.setProperty(ParameterQueue.USER_NAME, "guest");