You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ni...@apache.org on 2018/12/14 10:34:41 UTC

[3/3] activemq-artemis git commit: #ARTEMIS-2201 Added tests on DEFAULT_JOURNAL_FILE_OPEN_TIMEOUT value

#ARTEMIS-2201 Added tests on DEFAULT_JOURNAL_FILE_OPEN_TIMEOUT value


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

Branch: refs/heads/master
Commit: 6dfa9a1fa4a22705ed6c3ee9a1c0f20046cbfb0a
Parents: aac7b83
Author: feuillemorte <it...@me.fmorte.org>
Authored: Tue Dec 11 15:05:45 2018 +0100
Committer: Francesco Nigro <ni...@gmail.com>
Committed: Fri Dec 14 11:32:13 2018 +0100

----------------------------------------------------------------------
 .../core/config/impl/FileConfigurationTest.java | 35 ++++++++++++++++++++
 1 file changed, 35 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6dfa9a1f/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
index a60eb2d..cf78e2d 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -29,7 +29,9 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
 import org.apache.activemq.artemis.core.server.plugin.ActiveMQServerBasePlugin;
+import org.apache.activemq.artemis.utils.RandomUtil;
 import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerPolicy;
 import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration;
 import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
@@ -670,6 +672,31 @@ public class FileConfigurationTest extends ConfigurationImplTest {
       assertTrue("check failed, " + defaultConfirmationWinSize + ":" + defaultIdCacheSize, ConfigurationImpl.checkoutDupCacheSize(defaultConfirmationWinSize, defaultIdCacheSize));
    }
 
+   @Test
+   public void testJournalFileOpenTimeoutDefaultValue() throws Exception {
+      ActiveMQServerImpl server = new ActiveMQServerImpl();
+      try {
+         server.start();
+         Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileOpenTimeout(), server.getConfiguration().getJournalFileOpenTimeout());
+      } finally {
+         server.stop();
+      }
+   }
+
+   @Test
+   public void testJournalFileOpenTimeoutValue() throws Exception {
+      int timeout = RandomUtil.randomInt();
+      Configuration configuration = createConfiguration("shared-store-master-hapolicy-config.xml");
+      configuration.setJournalFileOpenTimeout(timeout);
+      ActiveMQServerImpl server = new ActiveMQServerImpl(configuration);
+      try {
+         server.start();
+         Assert.assertEquals(timeout, server.getConfiguration().getJournalFileOpenTimeout());
+      } finally {
+         server.stop();
+      }
+   }
+
    @Override
    protected Configuration createConfiguration() throws Exception {
       FileConfiguration fc = new FileConfiguration();
@@ -679,6 +706,14 @@ public class FileConfigurationTest extends ConfigurationImplTest {
       return fc;
    }
 
+   private Configuration createConfiguration(String filename) throws Exception {
+      FileConfiguration fc = new FileConfiguration();
+      FileDeploymentManager deploymentManager = new FileDeploymentManager(filename);
+      deploymentManager.addDeployable(fc);
+      deploymentManager.readConfiguration();
+      return fc;
+   }
+
    public static class EmptyPlugin1 implements ActiveMQServerPlugin {
 
    }