[hornetq-commits] JBoss hornetq SVN: r10201 - in branches/Branch_2_2_EAP: src/config/common and 2 other directories.

Author: clebert.suconic(a)jboss.com Date: 2011-02-13 14:27:53 -0500 (Sun, 13 Feb 2011) New Revision: 10201 Modified: branches/Branch_2_2_EAP/.classpath branches/Branch_2_2_EAP/.project branches/Branch_2_2_EAP/build-maven.xml branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties branches/Branch_2_2_EAP/tests/jms-tests/src/org/hornetq/jms/tests/DeliveryOrderTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterTest.java Log: release change Modified: branches/Branch_2_2_EAP/.classpath =================================================================== --- branches/Branch_2_2_EAP/.classpath 2011-02-13 19:00:55 UTC (rev 10200) +++ branches/Branch_2_2_EAP/.classpath 2011-02-13 19:27:53 UTC (rev 10201) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="**/.svn/**/*" kind="src" path="src/main"/> + <classpathentry kind="src" path="order-test"/> <classpathentry kind="src" path="src/config/common"/> <classpathentry kind="src" path="build/src"/> <classpathentry kind="src" path="tests/jms-tests/config"/> Modified: branches/Branch_2_2_EAP/.project =================================================================== --- branches/Branch_2_2_EAP/.project 2011-02-13 19:00:55 UTC (rev 10200) +++ branches/Branch_2_2_EAP/.project 2011-02-13 19:27:53 UTC (rev 10201) @@ -20,4 +20,11 @@ <nature>org.eclipse.jdt.core.javanature</nature> <nature>net.sourceforge.metrics.nature</nature> </natures> + <linkedResources> + <link> + <name>order-test</name> + <type>2</type> + <location>/Users/clebertsuconic/Dropbox/HornetQ-Stuff/order-test</location> + </link> + </linkedResources> </projectDescription> Modified: branches/Branch_2_2_EAP/build-maven.xml =================================================================== --- branches/Branch_2_2_EAP/build-maven.xml 2011-02-13 19:00:55 UTC (rev 10200) +++ branches/Branch_2_2_EAP/build-maven.xml 2011-02-13 19:27:53 UTC (rev 10201) @@ -13,7 +13,7 @@ --> <project default="upload" name="HornetQ"> - <property name="hornetq.version" value="2.2.0.EAP-QA-10198"/> + <property name="hornetq.version" value="2.2.0.EAP-QA-10199"/> <property name="build.dir" value="build"/> <property name="jars.dir" value="${build.dir}/jars"/> Modified: branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties =================================================================== --- branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-02-13 19:00:55 UTC (rev 10200) +++ branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-02-13 19:27:53 UTC (rev 10201) @@ -1,4 +1,4 @@ -hornetq.version.versionName=QA_10198 +hornetq.version.versionName=QA_10199 hornetq.version.majorVersion=2 hornetq.version.minorVersion=2 hornetq.version.microVersion=0 Modified: branches/Branch_2_2_EAP/tests/jms-tests/src/org/hornetq/jms/tests/DeliveryOrderTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/jms-tests/src/org/hornetq/jms/tests/DeliveryOrderTest.java 2011-02-13 19:00:55 UTC (rev 10200) +++ branches/Branch_2_2_EAP/tests/jms-tests/src/org/hornetq/jms/tests/DeliveryOrderTest.java 2011-02-13 19:27:53 UTC (rev 10201) @@ -98,6 +98,68 @@ } } + public void testCancelationOrder() throws Exception + { + Connection conn = null; + try + { + conn = JMSTestCase.cf.createConnection(); + + Session sess = conn.createSession(true, Session.SESSION_TRANSACTED); + + Session sess2 = conn.createSession(true, Session.SESSION_TRANSACTED); + + MessageProducer prod = sess.createProducer(HornetQServerTestCase.queue1); + + MessageConsumer cons = sess2.createConsumer(HornetQServerTestCase.queue1); + + final int NUM_MESSAGES = 5; + + conn.start(); + + for (int i = 0; i < NUM_MESSAGES; i++) + { + TextMessage tm = sess.createTextMessage("message" + i); + + prod.send(tm); + } + sess.commit(); + + for (int i = 0 ; i < NUM_MESSAGES; i++) + { + TextMessage tm = (TextMessage)cons.receive(5000); + assertNotNull(tm); + assertEquals("message" + i, tm.getText()); + } + + cons.close(); + + sess2.close(); + + + sess2 = conn.createSession(true, Session.SESSION_TRANSACTED); + + cons = sess2.createConsumer(queue1); + + for (int i = 0 ; i < NUM_MESSAGES; i++) + { + TextMessage tm = (TextMessage)cons.receive(5000); + assertNotNull(tm); + assertEquals("message" + i, tm.getText()); + } + + sess2.commit(); + + } + finally + { + if (conn != null) + { + conn.close(); + } + } + } + class MyListener implements MessageListener { private int c; Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterTest.java 2011-02-13 19:00:55 UTC (rev 10200) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterTest.java 2011-02-13 19:27:53 UTC (rev 10201) @@ -983,6 +983,19 @@ verifyReceiveRoundRobinInSomeOrder(10, 23, 24, 25); } + + + /*public void testLoop() throws Exception + { + for (int i = 0 ; i < 1000; i++) + { + System.out.println("#test "+ i); + Thread.sleep(1000); + testRouteWhenNoConsumersTrueLoadBalancedQueues(); + tearDown(); + setUp(); + } + }*/ public void testRouteWhenNoConsumersTrueLoadBalancedQueues() throws Exception {