[hornetq-commits] JBoss hornetq SVN: r9587 - in branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration: persistence and 4 other directories.

Author: jmesnil Date: 2010-08-24 08:16:12 -0400 (Tue, 24 Aug 2010) New Revision: 9587 Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/security/SecurityTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/server/LVQTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java Log: fix use of ServerLocator in tests Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2010-08-24 11:01:12 UTC (rev 9586) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2010-08-24 12:16:12 UTC (rev 9587) @@ -147,15 +147,16 @@ try { ServerLocator locator = createInVMNonHALocator(); - ClientSessionFactory sf = locator.createSessionFactory(); // Making it synchronous, just because we want to stop sending messages as soon as the page-store becomes in // page mode // and we could only guarantee that by setting it to synchronous - sf.getServerLocator().setBlockOnNonDurableSend(true); - sf.getServerLocator().setBlockOnDurableSend(true); - sf.getServerLocator().setBlockOnAcknowledge(true); + locator.setBlockOnNonDurableSend(true); + locator.setBlockOnDurableSend(true); + locator.setBlockOnAcknowledge(true); + ClientSessionFactory sf = locator.createSessionFactory(); + ClientSession session = sf.createSession(null, null, false, !transacted, !transacted, false, 0); session.createQueue(PageCrashTest.ADDRESS, PageCrashTest.ADDRESS, null, true); Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java 2010-08-24 11:01:12 UTC (rev 9586) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java 2010-08-24 12:16:12 UTC (rev 9587) @@ -66,12 +66,13 @@ server.start(); ServerLocator locator = createInVMNonHALocator(); + + locator.setBlockOnDurableSend(true); + locator.setBlockOnNonDurableSend(true); + locator.setMinLargeMessageSize(1024 * 1024); + ClientSessionFactory factory = locator.createSessionFactory(); - factory.getServerLocator().setBlockOnDurableSend(true); - factory.getServerLocator().setBlockOnNonDurableSend(true); - factory.getServerLocator().setMinLargeMessageSize(1024 * 1024); - final ClientSession session = factory.createSession(false, true, true); session.createQueue(DeleteQueueRestartTest.ADDRESS, DeleteQueueRestartTest.ADDRESS, true); Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2010-08-24 11:01:12 UTC (rev 9586) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2010-08-24 12:16:12 UTC (rev 9587) @@ -63,9 +63,9 @@ String address = RandomUtil.randomString(); String queue = RandomUtil.randomString(); ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(getConnectorTransportConfiguration(true)); + locator.setBlockOnNonDurableSend(false); + locator.setBlockOnDurableSend(false); ClientSessionFactory csf = locator.createSessionFactory(); - csf.getServerLocator().setBlockOnNonDurableSend(false); - csf.getServerLocator().setBlockOnDurableSend(false); ClientSession session = null; if (transactional) { Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/security/SecurityTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2010-08-24 11:01:12 UTC (rev 9586) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2010-08-24 12:16:12 UTC (rev 9587) @@ -501,8 +501,8 @@ roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); securityManager.addRole("auser", "arole"); + locator.setBlockOnNonDurableSend(true); ClientSessionFactory cf = locator.createSessionFactory(); - cf.getServerLocator().setBlockOnNonDurableSend(true); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true); ClientProducer cp = session.createProducer(SecurityTest.addressA); @@ -535,8 +535,8 @@ roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); securityManager.addRole("auser", "arole"); + locator.setBlockOnNonDurableSend(true); ClientSessionFactory cf = locator.createSessionFactory(); - cf.getServerLocator().setBlockOnNonDurableSend(true); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true); ClientProducer cp = session.createProducer(SecurityTest.addressA); @@ -940,8 +940,8 @@ roles.add(role); securityRepository.addMatch(configuration.getManagementAddress().toString(), roles); securityManager.addRole("auser", "arole"); + locator.setBlockOnNonDurableSend(true); ClientSessionFactory cf = locator.createSessionFactory(); - cf.getServerLocator().setBlockOnNonDurableSend(true); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); ClientProducer cp = session.createProducer(configuration.getManagementAddress()); cp.send(session.createMessage(false)); @@ -1169,9 +1169,9 @@ ClientSession andrewConnection = null; ClientSession frankConnection = null; ClientSession samConnection = null; + locator.setBlockOnNonDurableSend(true); + locator.setBlockOnDurableSend(true); ClientSessionFactory factory = locator.createSessionFactory(); - factory.getServerLocator().setBlockOnNonDurableSend(true); - factory.getServerLocator().setBlockOnDurableSend(true); ClientSession adminSession = factory.createSession("all", "all", false, true, true, false, -1); String genericQueueName = "genericQueue"; Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/server/LVQTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-08-24 11:01:12 UTC (rev 9586) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-08-24 12:16:12 UTC (rev 9587) @@ -582,9 +582,9 @@ server.getAddressSettingsRepository().addMatch(address.toString(), qs); // then we create a client as normalServer ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + locator.setBlockOnAcknowledge(true); + locator.setAckBatchSize(0); ClientSessionFactory sessionFactory = locator.createSessionFactory(); - sessionFactory.getServerLocator().setBlockOnAcknowledge(true); - sessionFactory.getServerLocator().setAckBatchSize(0); clientSession = sessionFactory.createSession(false, true, true); clientSessionTxReceives = sessionFactory.createSession(false, true, false); clientSessionTxSends = sessionFactory.createSession(false, false, true); Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-08-24 11:01:12 UTC (rev 9586) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-08-24 12:16:12 UTC (rev 9587) @@ -114,8 +114,8 @@ tc.getParams().put(TransportConstants.SSL_ENABLED_PROP_NAME, false); ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(tc); + locator.setCallTimeout(2000); ClientSessionFactory sf = locator.createSessionFactory(); - sf.getServerLocator().setCallTimeout(2000); try { sf.createSession(false, true, true);