From do-not-reply at jboss.org Thu Nov 10 06:07:46 2011 Content-Type: multipart/mixed; boundary="===============4072650982014563382==" MIME-Version: 1.0 From: do-not-reply at jboss.org To: hornetq-commits at lists.jboss.org Subject: [hornetq-commits] JBoss hornetq SVN: r11684 - trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client. Date: Thu, 10 Nov 2011 06:07:46 -0500 Message-ID: <201111101107.pAAB7kb5006139@svn01.web.mwc.hst.phx2.redhat.com> --===============4072650982014563382== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: borges Date: 2011-11-10 06:07:46 -0500 (Thu, 10 Nov 2011) New Revision: 11684 Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integratio= n/client/ProducerFlowControlTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integratio= n/client/SessionCreateConsumerTest.java Log: Improve clean to make sure everything gets closed. Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/int= egration/client/ProducerFlowControlTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integrati= on/client/ProducerFlowControlTest.java 2011-11-10 11:07:28 UTC (rev 11683) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integrati= on/client/ProducerFlowControlTest.java 2011-11-10 11:07:46 UTC (rev 11684) @@ -43,7 +43,7 @@ import org.hornetq.tests.util.UnitTestCase; = /** - * = + * * A ProducerFlowControlTest * * @author Tim Fox fox @@ -55,6 +55,12 @@ = private ServerLocator locator; = + private ClientSessionFactory sf; + + private ClientSession session; + + private HornetQServer server; + protected boolean isNetty() { return false; @@ -70,7 +76,12 @@ @Override protected void tearDown() throws Exception { - locator.close(); + stopComponent(server); + if (sf !=3D null) + { + sf.close(); + } + closeServerLocator(locator); = super.tearDown(); } @@ -207,7 +218,7 @@ { final SimpleString address =3D new SimpleString("testaddress"); = - HornetQServer server =3D createServer(realFiles, isNetty()); + server =3D createServer(realFiles, isNetty()); = AddressSettings addressSettings =3D new AddressSettings(); addressSettings.setMaxSizeBytes(maxSize); @@ -219,10 +230,7 @@ server.start(); waitForServer(server); = - try - { - - locator.setProducerWindowSize(producerWindowSize); + locator.setProducerWindowSize(producerWindowSize); locator.setConsumerWindowSize(consumerWindowSize); locator.setAckBatchSize(ackBatchSize); = @@ -231,8 +239,8 @@ locator.setMinLargeMessageSize(minLargeMessageSize); } = - ClientSessionFactory sf =3D locator.createSessionFactory(); - ClientSession session =3D sf.createSession(false, true, true, tru= e); + sf =3D locator.createSessionFactory(); + session =3D sf.createSession(false, true, true, true); = session.start(); = @@ -346,22 +354,13 @@ double rate =3D 1000 * (double)numMessages / (end - start); = ProducerFlowControlTest.log.info("rate is " + rate + " msgs / sec= "); - - session.close(); - - sf.close(); - } - finally - { - server.stop(); - } } = public void testClosingSessionUnblocksBlockedProducer() throws Exception { final SimpleString address =3D new SimpleString("testaddress"); = - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = AddressSettings addressSettings =3D new AddressSettings(); addressSettings.setMaxSizeBytes(1024); @@ -373,15 +372,12 @@ server.start(); waitForServer(server); = - try - { - locator.setProducerWindowSize(1024); locator.setConsumerWindowSize(1024); locator.setAckBatchSize(1024); = - ClientSessionFactory sf =3D locator.createSessionFactory(); - final ClientSession session =3D sf.createSession(false, true, tru= e, true); + sf =3D locator.createSessionFactory(); + session =3D sf.createSession(false, true, true, true); = final SimpleString queueName =3D new SimpleString("testqueue"); = @@ -423,18 +419,13 @@ Assert.assertTrue(closed.get()); = t.join(); - } - finally - { - server.stop(); - } } = public void testFlowControlMessageNotRouted() throws Exception { final SimpleString address =3D new SimpleString("testaddress"); = - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = AddressSettings addressSettings =3D new AddressSettings(); addressSettings.setMaxSizeBytes(1024); @@ -446,16 +437,13 @@ server.start(); waitForServer(server); = - try - { - locator.setProducerWindowSize(1024); locator.setConsumerWindowSize(1024); locator.setAckBatchSize(1024); = - ClientSessionFactory sf =3D locator.createSessionFactory(); + sf =3D locator.createSessionFactory(); = - final ClientSession session =3D sf.createSession(false, true, tru= e, true); + session =3D sf.createSession(false, true, true, true); = ClientProducer producer =3D session.createProducer(address); = @@ -471,30 +459,20 @@ = producer.send(message); } - - session.close(); - } - finally - { - server.stop(); - } } = // Not technically a flow control test, but what the hell public void testMultipleConsumers() throws Exception { - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = server.start(); waitForServer(server); = - try - { + sf =3D locator.createSessionFactory(); = - ClientSessionFactory sf =3D locator.createSessionFactory(); + session =3D sf.createSession(false, true, true, true); = - final ClientSession session =3D sf.createSession(false, true, tru= e, true); - session.createQueue("address", "queue1", null, false); session.createQueue("address", "queue2", null, false); session.createQueue("address", "queue3", null, false); @@ -546,29 +524,19 @@ = Assert.assertNotNull(msg); } - - session.close(); - } - finally - { - server.stop(); - } } = public void testProducerCreditsCaching1() throws Exception { - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = server.start(); waitForServer(server); = - try - { + sf =3D locator.createSessionFactory(); = - ClientSessionFactory sf =3D locator.createSessionFactory(); + session =3D sf.createSession(false, true, true, true); = - final ClientSession session =3D sf.createSession(false, true, tru= e, true); - session.createQueue("address", "queue1", null, false); = ClientProducerCredits credits =3D null; @@ -590,29 +558,18 @@ Assert.assertEquals(0, ((ClientSessionInternal)session).getPro= ducerCreditManager() .unRefe= rencedCreditsSize()); } - - session.close(); - } - finally - { - server.stop(); - } } = public void testProducerCreditsCaching2() throws Exception { - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = server.start(); waitForServer(server); + sf =3D locator.createSessionFactory(); = - try - { + session =3D sf.createSession(false, true, true, true); = - ClientSessionFactory sf =3D locator.createSessionFactory(); - - final ClientSession session =3D sf.createSession(false, true, tru= e, true); - session.createQueue("address", "queue1", null, false); = ClientProducerCredits credits =3D null; @@ -636,29 +593,19 @@ Assert.assertEquals(1, ((ClientSessionInternal)session).getPro= ducerCreditManager() .unRefe= rencedCreditsSize()); } - - session.close(); - } - finally - { - server.stop(); - } } = public void testProducerCreditsCaching3() throws Exception { - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = server.start(); waitForServer(server); = - try - { + sf =3D locator.createSessionFactory(); = - ClientSessionFactory sf =3D locator.createSessionFactory(); + session =3D sf.createSession(false, true, true, true); = - final ClientSession session =3D sf.createSession(false, true, tru= e, true); - session.createQueue("address", "queue1", null, false); = ClientProducerCredits credits =3D null; @@ -680,29 +627,18 @@ Assert.assertEquals(0, ((ClientSessionInternal)session).getPro= ducerCreditManager() .unRefe= rencedCreditsSize()); } - - session.close(); - } - finally - { - server.stop(); - } } = public void testProducerCreditsCaching4() throws Exception { - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = server.start(); waitForServer(server); + sf =3D locator.createSessionFactory(); = - try - { + session =3D sf.createSession(false, true, true, true); = - ClientSessionFactory sf =3D locator.createSessionFactory(); - - final ClientSession session =3D sf.createSession(false, true, tru= e, true); - session.createQueue("address", "queue1", null, false); = ClientProducerCredits credits =3D null; @@ -726,29 +662,19 @@ Assert.assertEquals(i + 1, ((ClientSessionInternal)session).ge= tProducerCreditManager() .un= ReferencedCreditsSize()); } - - session.close(); - } - finally - { - server.stop(); - } } = public void testProducerCreditsCaching5() throws Exception { - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = server.start(); waitForServer(server); = - try - { + sf =3D locator.createSessionFactory(); = - ClientSessionFactory sf =3D locator.createSessionFactory(); + session =3D sf.createSession(false, true, true, true); = - final ClientSession session =3D sf.createSession(false, true, tru= e, true); - session.createQueue("address", "queue1", null, false); = ClientProducerCredits credits =3D null; @@ -800,29 +726,18 @@ Assert.assertEquals(0, ((ClientSessionInternal)session).getPro= ducerCreditManager() .unRefe= rencedCreditsSize()); } - - session.close(); - } - finally - { - server.stop(); - } } = public void testProducerCreditsCaching6() throws Exception { - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = server.start(); waitForServer(server); + sf =3D locator.createSessionFactory(); = - try - { + session =3D sf.createSession(false, true, true, true); = - ClientSessionFactory sf =3D locator.createSessionFactory(); - - final ClientSession session =3D sf.createSession(false, true, tru= e, true); - session.createQueue("address", "queue1", null, false); = for (int i =3D 0; i < ClientProducerCreditManagerImpl.MAX_UNREFER= ENCED_CREDITS_CACHE_SIZE; i++) @@ -835,30 +750,19 @@ Assert.assertEquals(1, ((ClientSessionInternal)session).getPro= ducerCreditManager() .unRefe= rencedCreditsSize()); } - - session.close(); - } - finally - { - server.stop(); - } - } = public void testProducerCreditsCaching7() throws Exception { - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = server.start(); waitForServer(server); = - try - { + sf =3D locator.createSessionFactory(); = - ClientSessionFactory sf =3D locator.createSessionFactory(); + session =3D sf.createSession(false, true, true, true); = - final ClientSession session =3D sf.createSession(false, true, tru= e, true); - session.createQueue("address", "queue1", null, false); = for (int i =3D 0; i < ClientProducerCreditManagerImpl.MAX_UNREFER= ENCED_CREDITS_CACHE_SIZE; i++) @@ -895,29 +799,19 @@ Assert.assertEquals(ClientProducerCreditManagerImpl.MAX_UNREFE= RENCED_CREDITS_CACHE_SIZE, ((ClientSessionInternal)session).getProduc= erCreditManager().unReferencedCreditsSize()); } - - session.close(); - } - finally - { - server.stop(); - } } = public void testProducerCreditsRefCounting() throws Exception { - HornetQServer server =3D createServer(false, isNetty()); + server =3D createServer(false, isNetty()); = server.start(); waitForServer(server); = - try - { + sf =3D locator.createSessionFactory(); = - ClientSessionFactory sf =3D locator.createSessionFactory(); + session =3D sf.createSession(false, true, true, true); = - final ClientSession session =3D sf.createSession(false, true, tru= e, true); - session.createQueue("address", "queue1", null, false); = ClientProducer prod1 =3D session.createProducer("address"); @@ -946,13 +840,6 @@ = Assert.assertEquals(1, ((ClientSessionInternal)session).getProduc= erCreditManager().creditsMapSize()); Assert.assertEquals(1, ((ClientSessionInternal)session).getProduc= erCreditManager().unReferencedCreditsSize()); - - session.close(); - } - finally - { - server.stop(); - } } = } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/int= egration/client/SessionCreateConsumerTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integrati= on/client/SessionCreateConsumerTest.java 2011-11-10 11:07:28 UTC (rev 11683) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integrati= on/client/SessionCreateConsumerTest.java 2011-11-10 11:07:46 UTC (rev 11684) @@ -30,56 +30,52 @@ private final String queueName =3D "ClientSessionCreateConsumerTestQ"; = private ServerLocator locator; + private HornetQServer service; + private ClientSessionInternal clientSession; + private ClientSessionFactory cf; = @Override protected void setUp() throws Exception { locator =3D createInVMNonHALocator(); - = - super.setUp(); = + super.setUp(); + + service =3D createServer(false); + service.start(); + locator.setProducerMaxRate(99); + locator.setBlockOnNonDurableSend(true); + locator.setBlockOnNonDurableSend(true); + cf =3D locator.createSessionFactory(); + clientSession =3D (ClientSessionInternal)cf.createSession(false, tru= e, true); } = @Override protected void tearDown() throws Exception { - locator.close(); - = - super.tearDown(); + stopComponent(service); + try + { + if (clientSession !=3D null) + clientSession.close(); + if (cf !=3D null) + cf.close(); + } + finally + { + closeServerLocator(locator); + super.tearDown(); + } } = public void testCreateConsumer() throws Exception { - HornetQServer service =3D createServer(false); - try - { - service.start(); - locator.setProducerMaxRate(99); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnNonDurableSend(true); - ClientSessionFactory cf =3D locator.createSessionFactory(); - ClientSessionInternal clientSession =3D (ClientSessionInternal)cf= .createSession(false, true, true); clientSession.createQueue(queueName, queueName, false); ClientConsumer consumer =3D clientSession.createConsumer(queueNam= e); Assert.assertNotNull(consumer); - clientSession.close(); - } - finally - { - service.stop(); - } } = public void testCreateConsumerNoQ() throws Exception { - HornetQServer service =3D createServer(false); - try - { - service.start(); - locator.setProducerMaxRate(99); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnNonDurableSend(true); - ClientSessionFactory cf =3D locator.createSessionFactory(); - ClientSessionInternal clientSession =3D (ClientSessionInternal)cf= .createSession(false, true, true); try { clientSession.createConsumer(queueName); @@ -89,47 +85,17 @@ { Assert.assertEquals(e.getCode(), HornetQException.QUEUE_DOES_N= OT_EXIST); } - clientSession.close(); - } - finally - { - service.stop(); - } } = public void testCreateConsumerWithFilter() throws Exception { - HornetQServer service =3D createServer(false); - try - { - service.start(); - locator.setProducerMaxRate(99); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnNonDurableSend(true); - ClientSessionFactory cf =3D locator.createSessionFactory(); - ClientSessionInternal clientSession =3D (ClientSessionInternal)cf= .createSession(false, true, true); clientSession.createQueue(queueName, queueName, false); ClientConsumer consumer =3D clientSession.createConsumer(queueNam= e, "foo=3Dbar"); Assert.assertNotNull(consumer); - clientSession.close(); - } - finally - { - service.stop(); - } } = public void testCreateConsumerWithInvalidFilter() throws Exception { - HornetQServer service =3D createServer(false); - try - { - service.start(); - locator.setProducerMaxRate(99); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnNonDurableSend(true); - ClientSessionFactory cf =3D locator.createSessionFactory(); - ClientSessionInternal clientSession =3D (ClientSessionInternal)cf= .createSession(false, true, true); clientSession.createQueue(queueName, queueName, false); try { @@ -140,56 +106,20 @@ { Assert.assertEquals(e.getCode(), HornetQException.INVALID_FILT= ER_EXPRESSION); } - clientSession.close(); - } - finally - { - service.stop(); - } } = public void testCreateConsumerWithBrowseOnly() throws Exception { - HornetQServer service =3D createServer(false); - try - { - service.start(); - locator.setProducerMaxRate(99); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnNonDurableSend(true); - ClientSessionFactory cf =3D locator.createSessionFactory(); - ClientSessionInternal clientSession =3D (ClientSessionInternal)cf= .createSession(false, true, true); clientSession.createQueue(queueName, queueName, false); ClientConsumer consumer =3D clientSession.createConsumer(queueNam= e, null, true); Assert.assertNotNull(consumer); - clientSession.close(); - } - finally - { - service.stop(); - } } = public void testCreateConsumerWithOverrides() throws Exception { - HornetQServer service =3D createServer(false); - try - { - service.start(); - locator.setProducerMaxRate(99); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnNonDurableSend(true); - ClientSessionFactory cf =3D locator.createSessionFactory(); - ClientSessionInternal clientSession =3D (ClientSessionInternal)cf= .createSession(false, true, true); clientSession.createQueue(queueName, queueName, false); ClientConsumer consumer =3D clientSession.createConsumer(queueNam= e, null, 100, 100, false); Assert.assertNotNull(consumer); - clientSession.close(); - } - finally - { - service.stop(); - } } = } --===============4072650982014563382==--