You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2017/11/12 19:58:34 UTC

[camel] branch master updated (a7ca8ce -> 0de8f2a)

This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from a7ca8ce  camel-http4: speed-up tests by not forking the JVM for every test executed
     new f106a3f  camel-jms: make tests with JMX access succeed when other tests are run before
     new 2824a19  camel-hazelcast: HazelcastAggregationRepositoryOperationsTest use different keys, to prevent OptimisticLockingExceptions when running all test methods
     new ec6bfd6  camel-sjms2: speed-up tests by not forking the JVM for every test executed
     new fd3cfe7  camel-mina: speed-up tests by not forking the JVM for every test executed
     new 0de8f2a  camel-mina2: speed-up tests by not forking the JVM for every test executed

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../hazelcast/HazelcastAggregationRepositoryOperationsTest.java    | 4 ++--
 .../org/apache/camel/component/jms/ManagedJmsEndpointTest.java     | 7 ++++++-
 .../apache/camel/component/jms/ManagedJmsEndpointTopicTest.java    | 7 ++++++-
 .../jms/tx/JMSTransactionIsTransactedRedeliveredTest.java          | 6 +++++-
 components/camel-mina/pom.xml                                      | 2 --
 components/camel-mina2/pom.xml                                     | 2 --
 components/camel-sjms2/pom.xml                                     | 2 --
 7 files changed, 19 insertions(+), 11 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].

[camel] 05/05: camel-mina2: speed-up tests by not forking the JVM for every test executed

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 0de8f2a79cd9a700d5ca7e570be0a7430d7c4a6e
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Nov 12 20:57:45 2017 +0100

    camel-mina2: speed-up tests by not forking the JVM for every test executed
---
 components/camel-mina2/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml
index 63891b9..6159d9e 100644
--- a/components/camel-mina2/pom.xml
+++ b/components/camel-mina2/pom.xml
@@ -94,8 +94,6 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                <forkCount>1</forkCount>
-                <reuseForks>false</reuseForks>
                 <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
                     <excludes>
                         <!-- This test just show the shutdown error -->

-- 
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.

[camel] 01/05: camel-jms: make tests with JMX access succeed when other tests are run before

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit f106a3f8c0f48e4a382b0014759a07773aba7dca
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Nov 12 19:15:36 2017 +0100

    camel-jms: make tests with JMX access succeed when other tests are run before
---
 .../org/apache/camel/component/jms/ManagedJmsEndpointTest.java     | 7 ++++++-
 .../apache/camel/component/jms/ManagedJmsEndpointTopicTest.java    | 7 ++++++-
 .../jms/tx/JMSTransactionIsTransactedRedeliveredTest.java          | 6 +++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
index 0ce6cff..ad3b31b 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
@@ -28,6 +28,8 @@ import org.junit.Test;
 
 import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
 
+import java.util.Set;
+
 /**
  *
  */
@@ -55,7 +57,10 @@ public class ManagedJmsEndpointTest extends CamelTestSupport {
     public void testJmsEndpoint() throws Exception {
         MBeanServer mbeanServer = getMBeanServer();
 
-        ObjectName name = ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"activemq://queue:start\"");
+        Set<ObjectName> objectNames = mbeanServer.queryNames(new ObjectName("org.apache.camel:context=camel-*,type=endpoints,name=\"activemq://queue:start\""), null);
+        assertEquals(1, objectNames.size());
+        ObjectName name = objectNames.iterator().next();
+
         String uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
         assertEquals("activemq://queue:start", uri);
 
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
index c51a9bd..de62cdc 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
@@ -28,6 +28,8 @@ import org.junit.Test;
 
 import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
 
+import java.util.Set;
+
 /**
  *
  */
@@ -55,7 +57,10 @@ public class ManagedJmsEndpointTopicTest extends CamelTestSupport {
     public void testJmsEndpoint() throws Exception {
         MBeanServer mbeanServer = getMBeanServer();
 
-        ObjectName name = ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"activemq://topic:start\"");
+        Set<ObjectName> objectNames = mbeanServer.queryNames(new ObjectName("org.apache.camel:context=camel-*,type=endpoints,name=\"activemq://topic:start\""), null);
+        assertEquals(1, objectNames.size());
+        ObjectName name = objectNames.iterator().next();
+
         String uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
         assertEquals("activemq://topic:start", uri);
 
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java
index 802d7a1..96d6e04 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.jms.tx;
 
+import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -75,7 +77,9 @@ public class JMSTransactionIsTransactedRedeliveredTest extends CamelSpringTestSu
         // need a little sleep to ensure JMX is updated
         Thread.sleep(500);
 
-        ObjectName name = ObjectName.getInstance("org.apache.camel:context=camel-1,type=routes,name=\"myRoute\"");
+        Set<ObjectName> objectNames = getMBeanServer().queryNames(new ObjectName("org.apache.camel:context=camel-*,type=routes,name=\"myRoute\""), null);
+        assertEquals(1, objectNames.size());
+        ObjectName name = objectNames.iterator().next();
 
         Long total = (Long) getMBeanServer().getAttribute(name, "ExchangesTotal");
         assertEquals(3, total.intValue());

-- 
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.

[camel] 02/05: camel-hazelcast: HazelcastAggregationRepositoryOperationsTest use different keys, to prevent OptimisticLockingExceptions when running all test methods

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 2824a193a09fc7e220078229fc088292cb57837c
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Nov 12 19:29:51 2017 +0100

    camel-hazelcast: HazelcastAggregationRepositoryOperationsTest use different keys, to prevent OptimisticLockingExceptions when running all test methods
---
 .../hazelcast/HazelcastAggregationRepositoryOperationsTest.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java
index 651cd75..4e8d863 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java
@@ -96,7 +96,7 @@ public class HazelcastAggregationRepositoryOperationsTest extends HazelcastAggre
             repoTwo.start();
 
             final String testBody = "This is an optimistic test body. Sincerely yours, Captain Obvious.";
-            final String key = "optimisticKey";
+            final String key = "optimisticGetKey";
 
             Exchange ex = createExchangeWithBody(testBody);
             repoOne.add(context(), key, null, ex);
@@ -149,7 +149,7 @@ public class HazelcastAggregationRepositoryOperationsTest extends HazelcastAggre
             repoTwo.doStart();
 
             final String testBody = "This is an optimistic test body. Sincerely yours, Captain Obvious.";
-            final String key = "optimisticKey";
+            final String key = "optimisticPersistentRemoveKey";
 
             Exchange ex = createExchangeWithBody(testBody);
 

-- 
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.

[camel] 04/05: camel-mina: speed-up tests by not forking the JVM for every test executed

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fd3cfe7d8f41abb9ceb2c9c1ab2d2fda19cdfe30
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Nov 12 20:49:56 2017 +0100

    camel-mina: speed-up tests by not forking the JVM for every test executed
---
 components/camel-mina/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
index d59c56a..d017aa8 100644
--- a/components/camel-mina/pom.xml
+++ b/components/camel-mina/pom.xml
@@ -99,8 +99,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
-          		<forkCount>1</forkCount>
-	  		<reuseForks>false</reuseForks>
                     <excludes>
                         <!-- This test just show the shutdown error -->
                         <exclude>**/MinaProducerShutdownTest.*</exclude>

-- 
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.

[camel] 03/05: camel-sjms2: speed-up tests by not forking the JVM for every test executed

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ec6bfd6bfe864340089cf79ca1a4b817772f6c22
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Nov 12 20:40:39 2017 +0100

    camel-sjms2: speed-up tests by not forking the JVM for every test executed
---
 components/camel-sjms2/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index e62c536..0dfcc36 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -146,8 +146,6 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkCount>1</forkCount>
-          <reuseForks>false</reuseForks>
           <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds>
         </configuration>
       </plugin>

-- 
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.