Changeset 102 for branches/supervisor/src/test

Timestamp:

10/14/13 16:38:34 (11 years ago)

Author:

stoda

Message:

All tests working

TODO sometimes exceptiontest fails

Location:

branches/supervisor/src/test/java/omq/test

Files:

• lock/SleepTest.java (modified) (1 diff)
• multiThread/ThreadTest.java (modified) (1 diff)
• multiThread2/MultiThreadTest.java (modified) (1 diff)
• multiThread2/PrintTest.java (modified) (1 diff)
• remotePool/RemotePoolTest.java (modified) (1 diff)
• supervisor/SleepTest.java (modified) (2 diffs)

branches/supervisor/src/test/java/omq/test/lock/SleepTest.java

@@ -20 +20 @@
                 env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
                 env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
-                env.setProperty(ParameterQueue.NUM_THREADS, "1");
 
                 for (int i = 0; i < 4; i++) {

branches/supervisor/src/test/java/omq/test/multiThread/ThreadTest.java

@@ -73 +73 @@
                 env.setProperty(ParameterQueue.RPC_EXCHANGE, "rpc_exchange");
                 env.setProperty(ParameterQueue.RETRY_TIME_CONNECTION, "2000");
-                env.setProperty(ParameterQueue.NUM_THREADS, "4");
+                env.setProperty(ParameterQueue.MIN_POOL_THREADS, "4");
+                env.setProperty(ParameterQueue.MAX_POOL_THREADS, "4");
 
                 RemoteMulti rm = new RemoteMulti();

branches/supervisor/src/test/java/omq/test/multiThread2/MultiThreadTest.java

@@ -21 +21 @@
                 env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
                 env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
-                env.setProperty(ParameterQueue.NUM_THREADS, "4");
-
+                env.setProperty(ParameterQueue.MIN_POOL_THREADS, "4");
+                env.setProperty(ParameterQueue.MAX_POOL_THREADS, "4");
                 SleepImpl sleep = new SleepImpl();
 

branches/supervisor/src/test/java/omq/test/multiThread2/PrintTest.java

@@ -21 +21 @@
                 env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
                 env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
-                env.setProperty(ParameterQueue.NUM_THREADS, "2");
+                env.setProperty(ParameterQueue.MIN_POOL_THREADS, "2");
+                env.setProperty(ParameterQueue.MAX_POOL_THREADS, "2");
 
                 PrintImpl print = new PrintImpl(1);

branches/supervisor/src/test/java/omq/test/remotePool/RemotePoolTest.java

@@ -47 +47 @@
                 for (int j = 0; j < 2; j++) {
 
-                        for (int i = 0; i < 4; i++) {
+                        for (int i = 0; i < 8; i++) {
                                 sleep.sleep();
                         }
                         Thread.sleep(3000);
-                        for (int i = 0; i < 4; i++) {
+                        for (int i = 0; i < 12; i++) {
                                 sleep.sleep();
                         }
                         Thread.sleep(10000);
                 }
-                Thread.sleep(20000 * 1000);
+                
         }
 }

branches/supervisor/src/test/java/omq/test/supervisor/SleepTest.java

@@ -24 +24 @@
                 env1.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
                 env1.setProperty(ParameterQueue.RABBIT_PORT, "5672");
-                env1.setProperty(ParameterQueue.NUM_THREADS, "4");
+                env1.setProperty(ParameterQueue.MIN_POOL_THREADS, "4");
+                env1.setProperty(ParameterQueue.MAX_POOL_THREADS, "4");
 
                 Broker broker = new Broker(env1);
@@ -35 +36 @@
                 env2.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
                 env2.setProperty(ParameterQueue.RABBIT_PORT, "5672");
-                env2.setProperty(ParameterQueue.NUM_THREADS, "1");
+                env2.setProperty(ParameterQueue.MIN_POOL_THREADS, "4");
+                env2.setProperty(ParameterQueue.MAX_POOL_THREADS, "4");
 
                 Broker broker2 = new Broker(env2);