[jboss-cvs] JBossAS SVN: r100994 - in branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging: test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-02-15 16:12:39 -0500 (Mon, 15 Feb 2010)
New Revision: 100994

Modified:
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java
Log:
Tests changes

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java	2010-02-15 21:11:57 UTC (rev 100993)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java	2010-02-15 21:12:39 UTC (rev 100994)
@@ -21,11 +21,14 @@
  */
 package org.jboss.test.jbossmessaging.perf;
 
+import java.util.concurrent.CountDownLatch;
+
 import javax.jms.BytesMessage;
 import javax.jms.DeliveryMode;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
+import javax.jms.Queue;
 import javax.jms.QueueConnection;
 import javax.jms.QueueConnectionFactory;
 import javax.jms.QueueReceiver;
@@ -38,10 +41,9 @@
 import javax.jms.TopicPublisher;
 import javax.jms.TopicSession;
 import javax.jms.TopicSubscriber;
-import javax.jms.Queue;
 import javax.naming.Context;
 
-import junit.framework.Test;
+import junit.framework.TestSuite;
 
 import org.jboss.logging.Logger;
 import org.jboss.test.JBossJMSTestCase;
@@ -241,6 +243,8 @@
 
       final int iterationCount = getIterationCount();
       final Logger log = getLog();
+      
+      final CountDownLatch startFlag = new CountDownLatch(1);
 
       Thread sendThread =
          new Thread()
@@ -258,7 +262,7 @@
 
                   TopicPublisher publisher = session.createPublisher(topic);
 
-                  waitForSynchMessage();
+                  startFlag.await();
 
                   BytesMessage message = session.createBytesMessage();
                   message.writeBytes(PERFORMANCE_TEST_DATA_PAYLOAD);
@@ -345,7 +349,7 @@
       long startTime = System.currentTimeMillis();
       sendThread.start();
       subscriber.setMessageListener(listener);
-      sendSynchMessage();
+      startFlag.countDown();
       synchronized (listener)
       {
          topicConnection.start();
@@ -507,9 +511,12 @@
       }
       final int iterationCount = getIterationCount();
       final Logger log = getLog();
+      
+      final CountDownLatch alignFlag = new CountDownLatch(2);
+      
 
       Thread sendThread =
-         new Thread()
+         new Thread("sendThread transacted = " + transacted + " persistent = " + persistence)
          {
             /**
              * Main processing method for the JBossMQPerfStressTestCase object
@@ -524,7 +531,8 @@
 
                   TopicPublisher publisher = session.createPublisher(topic);
 
-                  waitForSynchMessage();
+                  alignFlag.countDown();
+                  alignFlag.await();
 
                   BytesMessage message = session.createBytesMessage();
                   message.writeBytes(PERFORMANCE_TEST_DATA_PAYLOAD);
@@ -561,7 +569,7 @@
          };
 
       Thread recvThread =
-         new Thread()
+         new Thread("recvThread transacted = " + transacted + " persistent = " + persistence)
          {
             /**
              * Main processing method for the JBossMQPerfStressTestCase object
@@ -575,7 +583,8 @@
                   Topic topic = (Topic)context.lookup(TEST_TOPIC);
                   TopicSubscriber subscriber = session.createSubscriber(topic);
 
-                  sendSynchMessage();
+                  alignFlag.countDown();
+                  alignFlag.await();
 
                   long startTime = System.currentTimeMillis();
                   for (int i = 0; i < iterationCount; i++)
@@ -622,7 +631,7 @@
       getLog().debug("  All threads finished after: " + ((double)pTime / 1000) + " seconds. ");
 
    }
-
+   
    /**
     * A unit test for JUnit
     *
@@ -703,6 +712,14 @@
       getLog().debug("SynchTopicPerformance passed");
    }
 
+//   public static TestSuite suite() throws Exception
+//   {
+//      TestSuite suite = new TestSuite();
+//      suite.addTest(new JMSPerfStressTestCase("testSynchTopicPerformance"));
+//      return suite;
+//   }
+
+
    /**
     * The JUnit setup method
     *
@@ -769,28 +786,5 @@
 
    }
 
-   private void waitForSynchMessage() throws Exception
-   {
-      QueueSession session = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-      Queue queue = (Queue)context.lookup(TEST_QUEUE);
 
-      QueueReceiver receiver = session.createReceiver(queue);
-      receiver.receive();
-      session.close();
-   }
-
-   private void sendSynchMessage() throws Exception
-   {
-      QueueSession session = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-      Queue queue = (Queue)context.lookup(TEST_QUEUE);
-
-      QueueSender sender = session.createSender(queue);
-
-      Message message = session.createMessage();
-      sender.send(message);
-
-      session.close();
-   }
-   
-
 }

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java	2010-02-15 21:11:57 UTC (rev 100993)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java	2010-02-15 21:12:39 UTC (rev 100994)
@@ -21,12 +21,8 @@
  */
 package org.jboss.test.jbossmessaging.test;
 
-import javax.management.ObjectName;
 import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jboss.test.JBossTestSetup;
-import org.jboss.test.JBossJMSTestCase;
+
 import org.jboss.test.jbossmessaging.JMSBase;
 /**
  * Test of security features in JMS providers