Changeset 39 for trunk

Timestamp:

06/14/13 15:11:13 (11 years ago)

Author:

stoda

Message:

Exception test revised.
Broker.lookup does not need the casting
GsonImp? arguments problem solved
MultiProcessTest? added

Location:

trunk/objectmq

Files:

• src/omq/client/proxy/Proxymq.java (modified) (1 diff)
• src/omq/common/broker/Broker.java (modified) (2 diffs)
• src/omq/common/util/Serializers/GsonImp.java (modified) (1 diff)
• src/omq/server/InvocationThread.java (modified) (1 diff)
• test/exceptionTest/ClientTest.java (modified) (3 diffs)
• test/exceptionTest/ServerTest.java (modified) (1 diff)
• test/multiProcessTest (added)
• test/multiProcessTest/ClientTest.java (added)
• test/multiProcessTest/Number.java (added)
• test/multiProcessTest/NumberImpl.java (added)
• test/multiProcessTest/ServerTest.java (added)

trunk/objectmq/src/omq/client/proxy/Proxymq.java

@@ -237 +237 @@
                 if (resp.getError() != null) {
                         OmqException error = resp.getError();
-                        String name = error.getType();System.out.println("Name: "+name);
+                        String name = error.getType();
                         String message = error.getMessage();
                         throw (Exception) Class.forName(name).getConstructor(String.class).newInstance(message);

trunk/objectmq/src/omq/common/broker/Broker.java

@@ -108 +108 @@
         }
 
-        public static Remote lookup(String reference, Class<?> contract) throws RemoteException {
+        @SuppressWarnings("unchecked")
+        public static <T extends Remote> T lookup(String reference, Class<T> contract) throws RemoteException {
                 try {
                         Properties environment = Environment.getEnvironment();
@@ -120 +121 @@
                                 Proxymq proxy = new Proxymq(reference, contract, environment);
                                 Class<?>[] array = { contract };
-                                return (Remote) Proxymq.newProxyInstance(contract.getClassLoader(), array, proxy);
-                        }
-                        return (Remote) Proxymq.getInstance(reference);
+                                return (T) Proxymq.newProxyInstance(contract.getClassLoader(), array, proxy);
+                        }
+                        return (T) Proxymq.getInstance(reference);
 
                 } catch (Exception e) {

trunk/objectmq/src/omq/common/util/Serializers/GsonImp.java

@@ -39 +39 @@
 
                 try {
-                        JsonArray jsonArgs = (JsonArray) jsonObj.get("arguments");
+                        JsonArray jsonArgs = (JsonArray) jsonObj.get("params");
 
                         // TODO: if (jsonArgs.size() == types.size())

trunk/objectmq/src/omq/server/InvocationThread.java

@@ -81 +81 @@
 
                 }
-                System.out.println("Invocation Thread dies!!");
         }
 

trunk/objectmq/test/exceptionTest/ClientTest.java

@@ -3 +3 @@
 import static org.junit.Assert.assertEquals;
 
+import java.lang.reflect.UndeclaredThrowableException;
 import java.util.Properties;
 
@@ -25 +26 @@
                 env.setProperty(ParameterQueue.SERVER_PORT, "5672");
                 env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
+                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.kryo);
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 
@@ -67 +68 @@
         }
 
-        @Test(expected = NoSuchMethodException.class)
+        @Test(expected = UndeclaredThrowableException.class)
+        // This exception will be caused by java.lang.NoSuchMethodException
         public void getTrailer() throws Exception {
                 client.getTrailer();

trunk/objectmq/test/exceptionTest/ServerTest.java

@@ -17 +17 @@
                 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.SERIALIZER_NAME, Serializer.kryo);
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");