[jboss-cvs] JBoss Messaging SVN: r4276 - in trunk/tests/jms-tests/src/org/jboss/test/messaging: jms and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 21 15:37:04 EDT 2008
Author: timfox
Date: 2008-05-21 15:37:04 -0400 (Wed, 21 May 2008)
New Revision: 4276
Modified:
trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java
Log:
Fixed ack tests bar one
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2008-05-21 19:23:21 UTC (rev 4275)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2008-05-21 19:37:04 UTC (rev 4276)
@@ -785,10 +785,11 @@
boolean supportsFailover,
boolean supportsLoadBalancing,
boolean strictTck,
- int dupsOkBatchSize) throws Exception
+ int dupsOkBatchSize,
+ boolean blockOnAcknowledge) throws Exception
{
servers.get(0).deployConnectionFactory(clientId, objectName, jndiBindings, prefetchSize, defaultTempQueueFullSize,
- defaultTempQueuePageSize, defaultTempQueueDownCacheSize, supportsFailover, supportsLoadBalancing, strictTck, dupsOkBatchSize);
+ defaultTempQueuePageSize, defaultTempQueueDownCacheSize, supportsFailover, supportsLoadBalancing, strictTck, dupsOkBatchSize, blockOnAcknowledge);
}
public static void deployConnectionFactory(String objectName,
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2008-05-21 19:23:21 UTC (rev 4275)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2008-05-21 19:37:04 UTC (rev 4276)
@@ -698,7 +698,7 @@
ArrayList<String> bindings = new ArrayList<String>();
bindings.add("mycf");
- deployConnectionFactory(null, "MyConnectionFactory2", bindings, -1, -1, -1, -1, false, false, false, BATCH_SIZE);
+ deployConnectionFactory(null, "MyConnectionFactory2", bindings, -1, -1, -1, -1, false, false, false, BATCH_SIZE, true);
Connection conn = null;
@@ -780,7 +780,7 @@
ArrayList<String> bindings = new ArrayList<String>();
bindings.add("mycf");
- deployConnectionFactory(null, "MyConnectionFactory2", bindings, -1, -1, -1, -1, false, false, false, BATCH_SIZE);
+ deployConnectionFactory(null, "MyConnectionFactory2", bindings, -1, -1, -1, -1, false, false, false, BATCH_SIZE, true);
Connection conn = null;
try
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2008-05-21 19:23:21 UTC (rev 4275)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2008-05-21 19:37:04 UTC (rev 4276)
@@ -596,26 +596,26 @@
public void deployConnectionFactory(String clientId, String objectName,
List<String> jndiBindings) throws Exception
{
- deployConnectionFactory(clientId, objectName, jndiBindings, -1, -1, -1, -1, false, false, false, -1);
+ deployConnectionFactory(clientId, objectName, jndiBindings, -1, -1, -1, -1, false, false, false, -1, false);
}
public void deployConnectionFactory(String objectName,
List<String> jndiBindings,
int consumerWindowSize) throws Exception
{
- deployConnectionFactory(null, objectName, jndiBindings, consumerWindowSize, -1, -1, -1, false, false, false, -1);
+ deployConnectionFactory(null, objectName, jndiBindings, consumerWindowSize, -1, -1, -1, false, false, false, -1, false);
}
public void deployConnectionFactory(String objectName,
List<String> jndiBindings) throws Exception
{
- deployConnectionFactory(null, objectName, jndiBindings, -1, -1, -1, -1, false, false, false, -1);
+ deployConnectionFactory(null, objectName, jndiBindings, -1, -1, -1, -1, false, false, false, -1, false);
}
public void deployConnectionFactory(String objectName, List<String> jndiBindings, boolean strictTck) throws Exception
{
- deployConnectionFactory(null, objectName, jndiBindings, -1, -1, -1, -1, false, false, strictTck, -1);
+ deployConnectionFactory(null, objectName, jndiBindings, -1, -1, -1, -1, false, false, strictTck, -1, false);
}
public void deployConnectionFactory(String objectName,
@@ -626,7 +626,7 @@
int defaultTempQueueDownCacheSize) throws Exception
{
this.deployConnectionFactory(null, objectName, jndiBindings, prefetchSize, defaultTempQueueFullSize,
- defaultTempQueuePageSize, defaultTempQueueDownCacheSize, false, false, false, -1);
+ defaultTempQueuePageSize, defaultTempQueueDownCacheSize, false, false, false, -1, false);
}
public void deployConnectionFactory(String objectName,
@@ -634,7 +634,7 @@
boolean supportsFailover, boolean supportsLoadBalancing) throws Exception
{
this.deployConnectionFactory(null, objectName, jndiBindings, -1, -1,
- -1, -1, supportsFailover, supportsLoadBalancing, false, -1);
+ -1, -1, supportsFailover, supportsLoadBalancing, false, -1, false);
}
public void deployConnectionFactory(String clientId,
@@ -647,11 +647,12 @@
boolean supportsFailover,
boolean supportsLoadBalancing,
boolean strictTck,
- int dupsOkBatchSize) throws Exception
+ int dupsOkBatchSize,
+ boolean blockOnAcknowledge) throws Exception
{
log.info("deploying connection factory with name: " + objectName + " and dupsok: " + dupsOkBatchSize);
getJMSServerManager().createConnectionFactory(objectName, clientId, dupsOkBatchSize,
- strictTck, prefetchSize, -1, 1000, -1, false, true, jndiBindings);
+ strictTck, prefetchSize, -1, 1000, -1, blockOnAcknowledge, true, jndiBindings);
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2008-05-21 19:23:21 UTC (rev 4275)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2008-05-21 19:37:04 UTC (rev 4276)
@@ -435,10 +435,11 @@
boolean supportsFailover,
boolean supportsLoadBalancing,
boolean strictTck,
- int dupsOkBatchSize) throws Exception
+ int dupsOkBatchSize,
+ boolean blockOnAcknowledge) throws Exception
{
server.deployConnectionFactory(clientId, objectName, jndiBindings, prefetchSize, defaultTempQueueFullSize, defaultTempQueuePageSize, defaultTempQueueDownCacheSize,
- supportsFailover, supportsLoadBalancing, strictTck, dupsOkBatchSize);
+ supportsFailover, supportsLoadBalancing, strictTck, dupsOkBatchSize, blockOnAcknowledge);
}
public void deployConnectionFactory(String objectName,
List<String> jndiBindings,
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java 2008-05-21 19:23:21 UTC (rev 4275)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java 2008-05-21 19:37:04 UTC (rev 4276)
@@ -197,7 +197,8 @@
boolean supportsFailover,
boolean supportsLoadBalancing,
boolean strictTck,
- int dupsOkBatchSize) throws Exception;
+ int dupsOkBatchSize,
+ boolean blockOnAcknowledge) throws Exception;
void deployConnectionFactory(String objectName,
List<String> jndiBindings,
More information about the jboss-cvs-commits
mailing list