[hornetq-commits] JBoss hornetq SVN: r8249 - trunk/tests/src/org/hornetq/tests/integration/client.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2009-11-06 19:49:27 -0500 (Fri, 06 Nov 2009)
New Revision: 8249

Modified:
   trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java
Log:
minor tweaks

Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java	2009-11-07 00:33:24 UTC (rev 8248)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java	2009-11-07 00:49:27 UTC (rev 8249)
@@ -22,7 +22,6 @@
 import org.hornetq.core.client.ClientSessionFactory;
 import org.hornetq.core.client.MessageHandler;
 import org.hornetq.core.client.impl.ClientMessageImpl;
-import org.hornetq.core.config.Configuration;
 import org.hornetq.core.logging.Logger;
 import org.hornetq.core.paging.impl.TestSupportPageStore;
 import org.hornetq.core.server.HornetQServer;
@@ -181,10 +180,8 @@
    {
       final SimpleString address = new SimpleString("testaddress");
 
-      Configuration config = super.createDefaultConfig(isNetty());
+      HornetQServer server = createServer(realFiles, isNetty());
 
-      HornetQServer server = createServer(realFiles, config);
-
       AddressSettings addressSettings = new AddressSettings();
       addressSettings.setMaxSizeBytes(maxSize);
       addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK);
@@ -194,17 +191,8 @@
 
       server.start();
 
-      ClientSessionFactory sf;
+      ClientSessionFactory sf = createFactory(isNetty());
 
-      if (isNetty())
-      {
-         sf = createNettyFactory();
-      }
-      else
-      {
-         sf = createInVMFactory();
-      }
-
       sf.setProducerWindowSize(producerWindowSize);
       sf.setConsumerWindowSize(consumerWindowSize);
       sf.setAckBatchSize(ackBatchSize);
@@ -349,10 +337,8 @@
    {
       final SimpleString address = new SimpleString("testaddress");
 
-      Configuration config = super.createDefaultConfig(false);
+      HornetQServer server = createServer(false, isNetty());
 
-      HornetQServer server = createServer(false, config);
-
       AddressSettings addressSettings = new AddressSettings();
       addressSettings.setMaxSizeBytes(1024);
       addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK);
@@ -362,7 +348,7 @@
 
       server.start();
 
-      ClientSessionFactory sf = createInVMFactory();
+      ClientSessionFactory sf = createFactory(isNetty());
 
       sf.setProducerWindowSize(1024);
       sf.setConsumerWindowSize(1024);
@@ -454,10 +440,8 @@
    {
       final SimpleString address = new SimpleString("testaddress");
 
-      Configuration config = super.createDefaultConfig(false);
+      HornetQServer server = createServer(false, isNetty());
 
-      HornetQServer server = createServer(false, config);
-
       AddressSettings addressSettings = new AddressSettings();
       addressSettings.setMaxSizeBytes(1024);
       addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK);
@@ -467,7 +451,7 @@
 
       server.start();
 
-      ClientSessionFactory sf = createInVMFactory();
+      ClientSessionFactory sf = createFactory(isNetty());
 
       sf.setProducerWindowSize(1024);
       sf.setConsumerWindowSize(1024);
@@ -530,10 +514,8 @@
    {
       final SimpleString address = new SimpleString("testaddress");
 
-      Configuration config = super.createDefaultConfig(false);
+      HornetQServer server = createServer(false, isNetty());
 
-      HornetQServer server = createServer(false, config);
-
       AddressSettings addressSettings = new AddressSettings();
       addressSettings.setMaxSizeBytes(1024);
       addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK);
@@ -543,7 +525,7 @@
 
       server.start();
 
-      ClientSessionFactory sf = createInVMFactory();
+      ClientSessionFactory sf = createFactory(isNetty());
 
       sf.setProducerWindowSize(1024);
       sf.setConsumerWindowSize(1024);
@@ -624,10 +606,8 @@
    {
       final SimpleString address = new SimpleString("testaddress");
 
-      Configuration config = super.createDefaultConfig(false);
+      HornetQServer server = createServer(false, isNetty());
 
-      HornetQServer server = createServer(false, config);
-
       AddressSettings addressSettings = new AddressSettings();
       addressSettings.setMaxSizeBytes(1024);
       addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK);
@@ -637,7 +617,7 @@
 
       server.start();
 
-      ClientSessionFactory sf = createInVMFactory();
+      ClientSessionFactory sf = createFactory(isNetty());
 
       sf.setProducerWindowSize(1024);
       sf.setConsumerWindowSize(1024);
@@ -697,10 +677,8 @@
    {
       final SimpleString address = new SimpleString("testaddress");
 
-      Configuration config = super.createDefaultConfig(false);
+      HornetQServer server = createServer(false, isNetty());
 
-      HornetQServer server = createServer(false, config);
-
       AddressSettings addressSettings = new AddressSettings();
       addressSettings.setMaxSizeBytes(1024);
       addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK);
@@ -710,7 +688,7 @@
 
       server.start();
 
-      ClientSessionFactory sf = createInVMFactory();
+      ClientSessionFactory sf = createFactory(isNetty());
 
       sf.setProducerWindowSize(1024);
       sf.setConsumerWindowSize(1024);