Changeset 72 for trunk/src/test

Timestamp:

06/29/13 20:44:27 (11 years ago)

Author:

stoda

Message:

Events deleted instead of them there's a new example of how to use the observer pattern

Location:

trunk/src/test/java/omq/test

Files:

• calculator/Calculator.java (modified) (3 diffs)
• calculator/CalculatorImpl.java (modified) (2 diffs)
• calculator/CalculatorTest.java (modified) (1 diff)
• calculator/ZeroEvent.java (deleted)
• calculator/ZeroListener.java (deleted)
• observer/ObserverTest.java (modified) (3 diffs)
• observer/RemoteSubject.java (modified) (2 diffs)
• observer/RemoteSubjectImpl.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package omq.test.calculator;
-
-import java.io.IOException;
 
 import omq.Remote;
@@ -7 +5 @@
 import omq.client.annotation.RemoteInterface;
 import omq.client.annotation.SyncMethod;
-import omq.exception.SerializerException;
 
 @RemoteInterface
@@ -20 +17 @@
         public void sendMessage(Message m);
 
-        @AsyncMethod
-        public void asyncDivideByZero() throws IOException, SerializerException;
-
         @SyncMethod(timeout = 1500)
         public int divideByZero();

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

@@ -1 +1 @@
 package omq.test.calculator;
 
-import java.io.IOException;
-
-import omq.common.broker.Broker;
-import omq.exception.SerializerException;
 import omq.server.RemoteObject;
 
 public class CalculatorImpl extends RemoteObject implements Calculator {
         private int mult = 0;
-        private Broker broker;
 
         public CalculatorImpl() throws Exception {
                 super();
-        }
-
-        public CalculatorImpl(Broker broker) throws Exception {
-                super();
-                this.broker = broker;
         }
 
@@ -41 +31 @@
 
         @Override
-        public void asyncDivideByZero() throws IOException, SerializerException {
-                ZeroEvent ze = new ZeroEvent("my zero event", "zero-event");
-                broker.trigger(ze);
-                // notifyEvent(ze);
-        }
-
-        @Override
         public void sendMessage(Message m) {
                 System.out.println("Code = " + m.getCode());

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

@@ -120 +120 @@
 
         @Test
-        public void notifyEvent() throws Exception {
-                ZeroListener zL = new ZeroListener("zero-event");
-
-                remoteCalc.addListener(zL);
-
-                remoteCalc.asyncDivideByZero();
-
-                Thread.sleep(200);
-        }
-
-        @Test
         public void sendMessage() throws Exception {
                 Message m = new Message(2334, "Hello objectmq");

trunk/src/test/java/omq/test/observer/ObserverTest.java

@@ -23 +23 @@
         private static String OBSERVER = "observer";
         private static Broker broker;
+        private static RemoteSubjectImpl subject;
         private static RemoteSubject remoteSubject;
 
@@ -71 +72 @@
                 env.setProperty(ParameterQueue.RETRY_TIME_CONNECTION, "2000");
 
+                // Set info about the queue & the exchange where the ResponseListener
+                // will listen to.
+                env.setProperty(ParameterQueue.RPC_REPLY_QUEUE, "server_reply_queue");
+                env.setProperty(ParameterQueue.EVENT_REPLY_QUEUE, "server_event_queue");
+
                 Broker broker = new Broker(env);
-                RemoteSubjectImpl subject = new RemoteSubjectImpl();
+                subject = new RemoteSubjectImpl(broker);
                 broker.bind(SUBJECT, subject);
 
@@ -90 +96 @@
                 RemoteObserverImpl observer = new RemoteObserverImpl();
                 broker.bind(OBSERVER, observer);
+                observer.setSubject(remoteSubject);
 
-                remoteSubject.addObserver(observer);
+                remoteSubject.addObserver(observer.getRef());
                 remoteSubject.setState(expected);
-                remoteSubject.notifyObservers();
+                // both proxies are in the same thread for this reason since subject has
+                // a proxy inside we need to use subject or create a new thread
+                subject.notifyObservers();
                 actual = observer.getObsState();
 
                 assertEquals(expected, actual);
-                remoteSubject.setState(null);
+                remoteSubject.setState("");
         }
 

trunk/src/test/java/omq/test/observer/RemoteSubject.java

@@ -4 +4 @@
 import omq.client.annotation.RemoteInterface;
 import omq.client.annotation.SyncMethod;
+import omq.exception.RemoteException;
 
 @RemoteInterface
@@ -15 +16 @@
 
         @SyncMethod(timeout = 1000)
-        public void addObserver(RemoteObserver o);
+        public void addObserver(String ref) throws RemoteException;
 
         @SyncMethod(timeout = 1000)
-        public void removeObserver(RemoteObserver o);
+        public void removeObserver(String ref) throws RemoteException;
 
         @SyncMethod(timeout = 1000)

trunk/src/test/java/omq/test/observer/RemoteSubjectImpl.java

@@ -4 +4 @@
 import java.util.List;
 
+import omq.common.broker.Broker;
+import omq.exception.RemoteException;
 import omq.server.RemoteObject;
 
@@ -13 +15 @@
         private static final long serialVersionUID = 1L;
         private String state;
-        private List<RemoteObserver> list = new ArrayList<RemoteObserver>();
+        private Broker broker;
+        private List<RemoteObserver> list;
 
-        @Override
-        public void addObserver(RemoteObserver o) {
-                list.add(o);
+        public RemoteSubjectImpl(Broker broker) {
+                this.broker = broker;
+                list = new ArrayList<RemoteObserver>();
         }
 
         @Override
-        public void removeObserver(RemoteObserver o) {
-                list.remove(o);
+        public void addObserver(String ref) throws RemoteException {
+                RemoteObserver obs = broker.lookup(ref, RemoteObserver.class);
+                list.add(obs);
+        }
+
+        @Override
+        public void removeObserver(String ref) throws RemoteException {
+                RemoteObserver obs = broker.lookup(ref, RemoteObserver.class);
+                list.remove(obs);
         }