Changeset 47 for trunk/src/test/java/omq/test/exception

Timestamp:

06/18/13 16:51:22 (11 years ago)

Author:

stoda

Message:

Refactoring Environment class - deleted.
StopBroker? problems solved (?)
Server can receive send and receive messages in different formats.
Some tests modified

TODO: finish all the tests, add log4j

Location:

trunk/src/test/java/omq/test/exception

Files:

• ClientTest.java (modified) (4 diffs)
• ServerTest.java (modified) (3 diffs)

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

@@ -4 +4 @@
 
 import java.lang.reflect.UndeclaredThrowableException;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Properties;
 
@@ -10 +12 @@
 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 {
-        private static ClientInterface client;
+        private ClientInterface client;
 
-        @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.kryo);
+                env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 
@@ -39 +44 @@
                 Broker.initBroker(env);
                 client = (ClientInterface) Broker.lookup("server", ClientInterface.class);
+        }
+
+        @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();
         }
 

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

@@ -5 +5 @@
 import omq.common.broker.Broker;
 import omq.common.util.ParameterQueue;
-import omq.common.util.Serializer;
+
+import org.junit.Test;
 
 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");
@@ -18 +20 @@
                 env.setProperty(ParameterQueue.SERVER_PORT, "5672");
                 env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.kryo);
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 
@@ -29 +30 @@
                 Broker.initBroker(env);
                 Broker.bind("server", server);
+
+                Thread.sleep(60 * 60 * 1000);
         }
 }