activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/3] activemq-artemis git commit: fixing tests
Date Tue, 04 Aug 2015 15:46:06 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 39b9fd1ce -> bff0886b0


fixing tests

The refactoring on native left a few name changes and a small twek that I needed to make on
buffers


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/517e0766
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/517e0766
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/517e0766

Branch: refs/heads/master
Commit: 517e0766207d93d5b00671fadd04fde0bbff548c
Parents: 7cfc337
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Mon Aug 3 19:26:33 2015 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Aug 3 23:39:35 2015 -0400

----------------------------------------------------------------------
 .../tests/extras/byteman/ClosingConnectionTest.java       |  2 +-
 .../artemis/tests/extras/byteman/PagingLeakTest.java      | 10 +++++-----
 .../tests/integration/cluster/bridge/BridgeTest.java      |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/517e0766/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
index 8515d11..249505d 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
@@ -125,7 +125,7 @@ public class ClosingConnectionTest extends ActiveMQTestBase
                @BMRule
                   (
                      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)",
                      targetLocation = "AT INVOKE java.nio.channels.FileChannel.size()",
                      action = "org.apache.activemq.artemis.tests.extras.byteman.ClosingConnectionTest.killConnection();"

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/517e0766/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
index 0bbebc8..c5d7a13 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
@@ -16,6 +16,10 @@
  */
 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.client.ClientConsumer;
 import org.apache.activemq.artemis.api.core.client.ClientMessage;
@@ -38,10 +42,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
 @RunWith(BMUnitRunner.class)
 public class PagingLeakTest extends ActiveMQTestBase
 {
@@ -122,7 +122,7 @@ public class PagingLeakTest extends ActiveMQTestBase
       // A backup that will be waiting to be activated
       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));
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/517e0766/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
index 151e2b4..470ae07 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
@@ -1345,7 +1345,7 @@ public class BridgeTest extends ActiveMQTestBase
          Map<String, Object> server1Params = new HashMap<String, Object>();
          addTargetParameters(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 queueName0 = "queue0";
@@ -1360,7 +1360,7 @@ public class BridgeTest extends ActiveMQTestBase
 
          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>();
          staticConnectors.add(server1tc.getName());


Mime
View raw message