Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing tests 

The refactoring on native left a few name changes and a small twek that I needed to make on buffers
This commit is contained in:
Clebert Suconic 2015-08-03 19:26:33 -04:00
parent 7cfc33790d
commit 517e076620
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
View File

@ -125,7 +125,7 @@ public class ClosingConnectionTest extends ActiveMQTestBase
@BMRule @BMRule
( (
name = "rule to kill connection", name = "rule to kill connection",
targetClass = "org.apache.activemq.artemis.core.journal.impl.NIOSequentialFile", targetClass = "org.apache.activemq.artemis.core.io.nio.NIOSequentialFile",
targetMethod = "open(int, boolean)", targetMethod = "open(int, boolean)",
targetLocation = "AT INVOKE java.nio.channels.FileChannel.size()", targetLocation = "AT INVOKE java.nio.channels.FileChannel.size()",
action = "org.apache.activemq.artemis.tests.extras.byteman.ClosingConnectionTest.killConnection();" action = "org.apache.activemq.artemis.tests.extras.byteman.ClosingConnectionTest.killConnection();"

10
tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
View File

@ -16,6 +16,10 @@
*/ */
package org.apache.activemq.artemis.tests.extras.byteman; package org.apache.activemq.artemis.tests.extras.byteman;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientConsumer;
import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientMessage;
@ -38,10 +42,6 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@RunWith(BMUnitRunner.class) @RunWith(BMUnitRunner.class)
public class PagingLeakTest extends ActiveMQTestBase public class PagingLeakTest extends ActiveMQTestBase
{ {
@ -122,7 +122,7 @@ public class PagingLeakTest extends ActiveMQTestBase
// A backup that will be waiting to be activated // A backup that will be waiting to be activated
Configuration config = createDefaultNettyConfig(); Configuration config = createDefaultNettyConfig();
config.setJournalBufferTimeout_AIO(0).setJournalBufferTimeout_NIO(0); config.setJournalBufferTimeout_AIO(10).setJournalBufferTimeout_NIO(10);
final ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, true)); final ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, true));

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
View File

@ -1345,7 +1345,7 @@ public class BridgeTest extends ActiveMQTestBase
Map<String, Object> server1Params = new HashMap<String, Object>(); Map<String, Object> server1Params = new HashMap<String, Object>();
addTargetParameters(server1Params); addTargetParameters(server1Params);
server1 = createClusteredServerWithParams(isNetty(), 1, true, PAGE_SIZE, PAGE_MAX, server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, true, PAGE_SIZE, PAGE_MAX, server1Params);
server1.getConfiguration().setJournalBufferTimeout_AIO(0).setJournalBufferTimeout_NIO(0); server1.getConfiguration().setJournalBufferTimeout_AIO(10).setJournalBufferTimeout_NIO(10);
final String testAddress = "testAddress"; final String testAddress = "testAddress";
final String queueName0 = "queue0"; final String queueName0 = "queue0";
@ -1360,7 +1360,7 @@ public class BridgeTest extends ActiveMQTestBase
server0.getConfiguration().setConnectorConfigurations(connectors); server0.getConfiguration().setConnectorConfigurations(connectors);
server0.getConfiguration().setIDCacheSize(20000).setJournalBufferTimeout_NIO(0).setJournalBufferTimeout_AIO(0); server0.getConfiguration().setIDCacheSize(20000).setJournalBufferTimeout_NIO(10).setJournalBufferTimeout_AIO(10);
ArrayList<String> staticConnectors = new ArrayList<String>(); ArrayList<String> staticConnectors = new ArrayList<String>();
staticConnectors.add(server1tc.getName()); staticConnectors.add(server1tc.getName());