camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] camel git commit: Fixed tests
Date Thu, 06 Aug 2015 09:06:07 GMT
Repository: camel
Updated Branches:
  refs/heads/master cc158b2ac -> 0a5c9a2c9


Fixed tests


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e54c2f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e54c2f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e54c2f5

Branch: refs/heads/master
Commit: 7e54c2f5eaea6ff53744df48977a5fe175a13f52
Parents: cc158b2
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Aug 6 10:42:03 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Aug 6 10:42:03 2015 +0200

----------------------------------------------------------------------
 .../org/apache/camel/component/quartz/QuartzHelper.java   |  3 ++-
 .../org/apache/camel/component/quartz/BaseQuartzTest.java |  6 ++++--
 .../camel/component/quartz/QuartzManagementTest.java      | 10 ----------
 3 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7e54c2f5/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzHelper.java
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzHelper.java
index 676fbb2..3ed1dda 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzHelper.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzHelper.java
@@ -28,7 +28,8 @@ public final class QuartzHelper {
         if (camelContext.getManagementName() != null) {
             return camelContext.getManagementName();
         } else {
-            return camelContext.getManagementNameStrategy().getName();
+            // fallback as name
+            return camelContext.getName();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7e54c2f5/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
index 512d48b..8508e15 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
@@ -17,11 +17,13 @@
 package org.apache.camel.component.quartz;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.management.JmxSystemPropertyKeys;
 import org.apache.camel.test.junit4.CamelTestSupport;
 
 public class BaseQuartzTest extends CamelTestSupport {
 
-    protected boolean isEnableJmx() {
+    @Override
+    protected boolean useJmx() {
         return true;
     }
 
@@ -30,7 +32,7 @@ public class BaseQuartzTest extends CamelTestSupport {
         CamelContext context = super.createCamelContext();
 
         QuartzComponent quartz = context.getComponent("quartz", QuartzComponent.class);
-        quartz.setEnableJmx(isEnableJmx());
+        quartz.setEnableJmx(useJmx());
 
         return context;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/7e54c2f5/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java
index b428fed..fa8ead7 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java
@@ -24,16 +24,6 @@ import org.junit.Test;
 
 public class QuartzManagementTest extends BaseQuartzTest {
 
-    @Override
-    protected boolean useJmx() {
-        return true;
-    }
-
-    @Override
-    protected boolean isEnableJmx() {
-        return true;
-    }
-
     protected MBeanServer getMBeanServer() {
         return context.getManagementStrategy().getManagementAgent().getMBeanServer();
     }


Mime
View raw message