You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/06/06 08:49:40 UTC
[2/5] git commit: Refactored the camel-rmi unit tests code
Refactored the camel-rmi unit tests code
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a0b87d90
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a0b87d90
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a0b87d90
Branch: refs/heads/master
Commit: a0b87d903c70da01611c4f7f8fb3babf7f469aa5
Parents: b62e932
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 6 13:43:42 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 14:42:41 2014 +0800
----------------------------------------------------------------------
.../camel/component/rmi/RmiConcurrencyTest.java | 36 ++----------
.../component/rmi/RmiDamnExceptionTest.java | 34 +-----------
.../rmi/RmiIllegalArgumentExceptionTest.java | 37 ++-----------
.../camel/component/rmi/RmiRouteTest.java | 36 ++----------
.../component/rmi/RmiRouteTestSupport.java | 58 ++++++++++++++++++++
5 files changed, 73 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a0b87d90/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
index 5428ba7..213c315 100644
--- a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
+++ b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.rmi;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.rmi.registry.LocateRegistry;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -25,22 +23,15 @@ import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* @version
*/
-public class RmiConcurrencyTest extends CamelTestSupport {
+public class RmiConcurrencyTest extends RmiRouteTestSupport {
- private int port;
-
- protected int getPort() {
- if (port == 0) {
- port = AvailablePortFinder.getNextAvailable(37500);
- }
- return port;
+ protected int getStartPort() {
+ return 37500;
}
@Override
@@ -105,24 +96,5 @@ public class RmiConcurrencyTest extends CamelTestSupport {
}
};
}
-
- private boolean classPathHasSpaces() {
- ClassLoader cl = getClass().getClassLoader();
- if (cl instanceof URLClassLoader) {
- URLClassLoader ucl = (URLClassLoader)cl;
- URL[] urls = ucl.getURLs();
- for (URL url : urls) {
- if (url.getPath().contains(" ")) {
- log.error("=======================================================================");
- log.error(" TEST Skipped: " + this.getClass().getName());
- log.error(" Your probably on windows. We detected that the classpath");
- log.error(" has a space in it. Try running maven with the following option: ");
- log.error(" -Dmaven.repo.local=C:\\DOCUME~1\\userid\\.m2\\repository");
- log.error("=======================================================================");
- return true;
- }
- }
- }
- return false;
- }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a0b87d90/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
index 5112b1d..32e7f0f 100644
--- a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
+++ b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.component.rmi;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.rmi.registry.LocateRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* @version
*/
-public class RmiDamnExceptionTest extends CamelTestSupport {
+public class RmiDamnExceptionTest extends RmiRouteTestSupport {
- private int port;
-
- protected int getPort() {
- if (port == 0) {
- port = AvailablePortFinder.getNextAvailable(37501);
- }
- return port;
+ protected int getStartPort() {
+ return 37501;
}
@Override
@@ -89,23 +80,4 @@ public class RmiDamnExceptionTest extends CamelTestSupport {
};
}
- private boolean classPathHasSpaces() {
- ClassLoader cl = getClass().getClassLoader();
- if (cl instanceof URLClassLoader) {
- URLClassLoader ucl = (URLClassLoader)cl;
- URL[] urls = ucl.getURLs();
- for (URL url : urls) {
- if (url.getPath().contains(" ")) {
- log.error("=======================================================================");
- log.error(" TEST Skipped: " + this.getClass().getName());
- log.error(" Your probably on windows. We detected that the classpath");
- log.error(" has a space in it. Try running maven with the following option: ");
- log.error(" -Dmaven.repo.local=C:\\DOCUME~1\\userid\\.m2\\repository");
- log.error("=======================================================================");
- return true;
- }
- }
- }
- return false;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a0b87d90/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiIllegalArgumentExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiIllegalArgumentExceptionTest.java b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiIllegalArgumentExceptionTest.java
index e2ef31e..e567274 100644
--- a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiIllegalArgumentExceptionTest.java
+++ b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiIllegalArgumentExceptionTest.java
@@ -16,32 +16,22 @@
*/
package org.apache.camel.component.rmi;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* @version
*/
-public class RmiIllegalArgumentExceptionTest extends CamelTestSupport {
+public class RmiIllegalArgumentExceptionTest extends RmiRouteTestSupport {
+ private boolean created;
- private static boolean created;
-
- private int port;
-
- protected int getPort() {
- if (port == 0) {
- port = AvailablePortFinder.getNextAvailable(37502);
- }
- return port;
+ protected int getStartPort() {
+ return 37502;
}
@Override
@@ -97,23 +87,4 @@ public class RmiIllegalArgumentExceptionTest extends CamelTestSupport {
};
}
- private boolean classPathHasSpaces() {
- ClassLoader cl = getClass().getClassLoader();
- if (cl instanceof URLClassLoader) {
- URLClassLoader ucl = (URLClassLoader)cl;
- URL[] urls = ucl.getURLs();
- for (URL url : urls) {
- if (url.getPath().contains(" ")) {
- log.error("=======================================================================");
- log.error(" TEST Skipped: " + this.getClass().getName());
- log.error(" Your probably on windows. We detected that the classpath");
- log.error(" has a space in it. Try running maven with the following option: ");
- log.error(" -Dmaven.repo.local=C:\\DOCUME~1\\userid\\.m2\\repository");
- log.error("=======================================================================");
- return true;
- }
- }
- }
- return false;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a0b87d90/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
index 717e509..da67a8f 100644
--- a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
+++ b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.rmi;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.rmi.registry.LocateRegistry;
import org.apache.camel.CamelContext;
@@ -25,23 +23,16 @@ import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.bean.ProxyHelper;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.TestSupport;
import org.apache.camel.util.jndi.JndiContext;
import org.junit.Test;
/**
* @version
*/
-public class RmiRouteTest extends TestSupport {
+public class RmiRouteTest extends RmiRouteTestSupport {
- private int port;
-
- protected int getPort() {
- if (port == 0) {
- port = AvailablePortFinder.getNextAvailable(37503);
- }
- return port;
+ protected int getStartPort() {
+ return 37503;
}
@Test
@@ -90,24 +81,5 @@ public class RmiRouteTest extends TestSupport {
// END SNIPPET: route
};
}
-
- private boolean classPathHasSpaces() {
- ClassLoader cl = getClass().getClassLoader();
- if (cl instanceof URLClassLoader) {
- URLClassLoader ucl = (URLClassLoader)cl;
- URL[] urls = ucl.getURLs();
- for (URL url : urls) {
- if (url.getPath().contains(" ")) {
- log.error("=======================================================================");
- log.error(" TEST Skipped: " + this.getClass().getName());
- log.error(" Your probably on windows. We detected that the classpath");
- log.error(" has a space in it. Try running maven with the following option: ");
- log.error(" -Dmaven.repo.local=C:\\DOCUME~1\\userid\\.m2\\repository");
- log.error("=======================================================================");
- return true;
- }
- }
- }
- return false;
- }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a0b87d90/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTestSupport.java b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTestSupport.java
new file mode 100644
index 0000000..4eaad64
--- /dev/null
+++ b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTestSupport.java
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.rmi;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+public abstract class RmiRouteTestSupport extends CamelTestSupport {
+ private int port;
+
+ protected abstract int getStartPort();
+
+
+ protected int getPort() {
+ if (port == 0) {
+ port = AvailablePortFinder.getNextAvailable(getStartPort());
+ }
+ return port;
+ }
+
+ protected boolean classPathHasSpaces() {
+ ClassLoader cl = getClass().getClassLoader();
+ if (cl instanceof URLClassLoader) {
+ URLClassLoader ucl = (URLClassLoader)cl;
+ URL[] urls = ucl.getURLs();
+ for (URL url : urls) {
+ if (url.getPath().contains(" ")) {
+ log.error("=======================================================================");
+ log.error(" TEST Skipped: " + this.getClass().getName());
+ log.error(" Your probably on windows. We detected that the classpath");
+ log.error(" has a space in it. Try running maven with the following option: ");
+ log.error(" -Dmaven.repo.local=C:\\DOCUME~1\\userid\\.m2\\repository");
+ log.error("=======================================================================");
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+}