You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/09/11 13:20:42 UTC
[01/11] git commit: Skip tests on aix
Updated Branches:
refs/heads/camel-2.11.x e2b2f6cd0 -> 2fd7c90cc
refs/heads/camel-2.12.x 88b24c480 -> 281f3e893
refs/heads/master a4b78c53e -> 5fdb8b00d
Skip tests on aix
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2de561c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2de561c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2de561c
Branch: refs/heads/master
Commit: c2de561c1aaa2721624a4096ddb07717429f5e55
Parents: a4b78c5
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 12:58:37 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 12:58:37 2013 +0200
----------------------------------------------------------------------
.../BeanValidatorConfigurationTest.java | 10 +++++
.../bean/validator/BeanValidatorRouteTest.java | 40 ++++++++++++++++++++
2 files changed, 50 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c2de561c/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
index ce97c33..b24a417 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
@@ -65,6 +65,11 @@ public class BeanValidatorConfigurationTest extends CamelTestSupport {
@Test
public void configureWithDefaults() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
ProcessorEndpoint endpoint = context.getEndpoint("bean-validator://x", ProcessorEndpoint.class);
BeanValidator processor = (BeanValidator) endpoint.getProcessor();
@@ -77,6 +82,11 @@ public class BeanValidatorConfigurationTest extends CamelTestSupport {
@Test
public void configureBeanValidator() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
ProcessorEndpoint endpoint = context.getEndpoint("bean-validator://x"
+ "?group=org.apache.camel.component.bean.validator.OptionalChecks"
+ "&messageInterpolator=#myMessageInterpolator"
http://git-wip-us.apache.org/repos/asf/camel/blob/c2de561c/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
index f2052dd..261df77 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
@@ -48,6 +48,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldSuccessWithImpliciteDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
Exchange exchange = template.request("bean-validator://x", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody(createCar("BMW", "DD-AB-123"));
@@ -59,6 +64,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldSuccessWithExpliciteDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
Exchange exchange = template.request("bean-validator://x?group=javax.validation.groups.Default", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody(createCar("BMW", "DD-AB-123"));
@@ -70,6 +80,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldFailWithImpliciteDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x";
final Car car = createCar("BMW", null);
@@ -102,6 +117,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldFailWithExpliciteDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x?group=javax.validation.groups.Default";
final Car car = createCar("BMW", null);
@@ -134,6 +154,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldFailWithOptionalChecksGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x?group=org.apache.camel.component.bean.validator.OptionalChecks";
final Car car = createCar("BMW", "D-A");
@@ -166,6 +191,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldFailWithOrderedChecksGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x?group=org.apache.camel.component.bean.validator.OrderedChecks";
final Car car = createCar(null, "D-A");
@@ -216,6 +246,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldSuccessWithRedefinedDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x";
final Car car = new CarWithRedefinedDefaultGroup(null, "DD-AB-123");
@@ -230,6 +265,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldFailWithRedefinedDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x";
final Car car = new CarWithRedefinedDefaultGroup(null, "D-A");
[10/11] git commit: Fixed test on windows
Posted by da...@apache.org.
Fixed test on windows
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/281f3e89
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/281f3e89
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/281f3e89
Branch: refs/heads/camel-2.12.x
Commit: 281f3e89386ec50333092d67666655a5e952909c
Parents: c3afdd2
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 13:19:42 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 13:19:42 2013 +0200
----------------------------------------------------------------------
.../camel/management/ManagedStreamCachingStrategyTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/281f3e89/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
index 47b4f0e..32c5238 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
@@ -23,8 +23,11 @@ import javax.management.ObjectName;
import org.apache.camel.StreamCache;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
+import static org.apache.camel.util.FileUtil.normalizePath;
+
/**
* @version
*/
@@ -50,7 +53,7 @@ public class ManagedStreamCachingStrategyTest extends ManagementTestSupport {
assertEquals(Boolean.TRUE, enabled);
String dir = (String) mbeanServer.getAttribute(name, "SpoolDirectory");
- assertEquals("target/cachedir/myCamel", dir);
+ assertEquals(normalizePath("target/cachedir/myCamel"), normalizePath(dir));
Long threshold = (Long) mbeanServer.getAttribute(name, "SpoolThreshold");
assertEquals(StreamCache.DEFAULT_SPOOL_THRESHOLD, threshold.longValue());
[07/11] git commit: Skip weather test by default as it requires
online access to remote service.
Posted by da...@apache.org.
Skip weather test by default as it requires online access to remote service.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/18755411
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/18755411
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/18755411
Branch: refs/heads/master
Commit: 187554118aaba4f0e7ed36482fd947155ed106ac
Parents: 16f8281
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 13:16:36 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 13:16:36 2013 +0200
----------------------------------------------------------------------
components/camel-weather/pom.xml | 40 ++++++++++++++++++++++++++++++-----
1 file changed, 35 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/18755411/components/camel-weather/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml
index 28e7f79..e46cbd6 100644
--- a/components/camel-weather/pom.xml
+++ b/components/camel-weather/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,12 +30,12 @@
<packaging>bundle</packaging>
<name>Camel :: Weather</name>
<description>Camel Weather support</description>
-
+
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.weather.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=weather</camel.osgi.export.service>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -45,11 +46,11 @@
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson-version}</version>
</dependency>
-
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -59,4 +60,33 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>weather-test</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
</project>
[03/11] git commit: camel-cmis should unit test with dynamic port
number assigned.
Posted by da...@apache.org.
camel-cmis should unit test with dynamic port number assigned.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c8df239
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c8df239
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c8df239
Branch: refs/heads/master
Commit: 7c8df239d7a390ba5d9665a7a44c07ea3bf53cce
Parents: c2de561
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 13:04:39 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 13:04:39 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/cmis/CMISConsumerTest.java | 4 ++--
.../apache/camel/component/cmis/CMISProducerTest.java | 4 ++--
.../camel/component/cmis/CMISQueryProducerTest.java | 8 ++++----
.../apache/camel/component/cmis/CMISTestSupport.java | 13 ++++++++++---
4 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7c8df239/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
index 007822a..41c3351 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
@@ -38,7 +38,7 @@ public class CMISConsumerTest extends CMISTestSupport {
public void getAllContentFromServerOrderedFromRootToLeaves() throws Exception {
resultEndpoint.expectedMessageCount(5);
- Consumer treeBasedConsumer = createConsumerFor(CMIS_ENDPOINT_TEST_SERVER);
+ Consumer treeBasedConsumer = createConsumerFor(getUrl());
treeBasedConsumer.start();
resultEndpoint.assertIsSatisfied();
@@ -57,7 +57,7 @@ public class CMISConsumerTest extends CMISTestSupport {
resultEndpoint.expectedMessageCount(2);
Consumer queryBasedConsumer = createConsumerFor(
- CMIS_ENDPOINT_TEST_SERVER + "?query=SELECT * FROM cmis:document");
+ getUrl() + "?query=SELECT * FROM cmis:document");
queryBasedConsumer.start();
resultEndpoint.assertIsSatisfied();
queryBasedConsumer.stop();
http://git-wip-us.apache.org/repos/asf/camel/blob/7c8df239/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
index b8d5d78..10fc7ce 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
@@ -126,7 +126,7 @@ public class CMISProducerTest extends CMISTestSupport {
@Test(expected = ResolveEndpointFailedException.class)
public void failConnectingToNonExistingRepository() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl()
+ "?username=admin&password=admin&repositoryId=NON_EXISTING_ID");
Producer producer = endpoint.createProducer();
@@ -172,7 +172,7 @@ public class CMISProducerTest extends CMISTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("cmis://" + CMIS_ENDPOINT_TEST_SERVER);
+ .to("cmis://" + getUrl());
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7c8df239/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
index db6af6a..7c31abc 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
@@ -39,7 +39,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void queryServerForDocumentWithSpecificName() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
@@ -54,7 +54,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void getResultCountFromHeader() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
@@ -69,7 +69,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void limitNumberOfResultsWithReadSizeHeader() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
@@ -85,7 +85,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void retrieveAlsoDocumentContent() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
http://git-wip-us.apache.org/repos/asf/camel/blob/7c8df239/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
index a466a01..6f2bd32 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.client.api.Document;
@@ -50,11 +51,16 @@ import org.junit.BeforeClass;
public class CMISTestSupport extends CamelTestSupport {
protected static final String CMIS_ENDPOINT_TEST_SERVER
- = "http://localhost:9090/chemistry-opencmis-server-inmemory/atom";
+ = "http://localhost:%s/chemistry-opencmis-server-inmemory/atom";
protected static final String OPEN_CMIS_SERVER_WAR_PATH
= "target/dependency/chemistry-opencmis-server-inmemory-0.8.0.war";
protected static Server cmisServer;
+ protected static int port;
+
+ protected String getUrl() {
+ return String.format(CMIS_ENDPOINT_TEST_SERVER, port);
+ }
protected Exchange createExchangeWithInBody(String body) {
DefaultExchange exchange = new DefaultExchange(context);
@@ -90,7 +96,7 @@ public class CMISTestSupport extends CamelTestSupport {
protected Session createSession() {
SessionFactory sessionFactory = SessionFactoryImpl.newInstance();
Map<String, String> parameter = new HashMap<String, String>();
- parameter.put(SessionParameter.ATOMPUB_URL, CMIS_ENDPOINT_TEST_SERVER);
+ parameter.put(SessionParameter.ATOMPUB_URL, getUrl());
parameter.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
Repository repository = sessionFactory.getRepositories(parameter).get(0);
@@ -143,7 +149,8 @@ public class CMISTestSupport extends CamelTestSupport {
@BeforeClass
public static void startServer() throws Exception {
- cmisServer = new Server(9090);
+ port = AvailablePortFinder.getNextAvailable(26500);
+ cmisServer = new Server(port);
cmisServer.setHandler(new WebAppContext(OPEN_CMIS_SERVER_WAR_PATH, "/chemistry-opencmis-server-inmemory"));
cmisServer.start();
}
[06/11] git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16f82817
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16f82817
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16f82817
Branch: refs/heads/master
Commit: 16f82817ce0328eb316b7afec72c5b0c4a42d404
Parents: 7c8df23
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 13:09:07 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 13:09:07 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/crypto/ECDSASignatureTest.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/16f82817/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
index 85f5981..4f8760f 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
@@ -42,10 +42,8 @@ public class ECDSASignatureTest extends CamelTestSupport {
private boolean ibmJDK;
public ECDSASignatureTest() throws Exception {
- //
// BouncyCastle is required for ECDSA support for JDK 1.6
- //
- if (System.getProperty("java.version").startsWith("1.6")
+ if (isJava16()
&& Security.getProvider("BC") == null) {
Constructor<?> cons = null;
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
@@ -55,10 +53,8 @@ public class ECDSASignatureTest extends CamelTestSupport {
Security.insertProviderAt(provider, 2);
}
- //
// This test fails with the IBM JDK
- //
- if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+ if (isJavaVendor("IBM")) {
ibmJDK = true;
}
}
[04/11] git commit: camel-cmis should unit test with dynamic port
number assigned.
Posted by da...@apache.org.
camel-cmis should unit test with dynamic port number assigned.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d43fe60a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d43fe60a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d43fe60a
Branch: refs/heads/camel-2.12.x
Commit: d43fe60a82b2d5c2a3c9a20005091cfb66cfefad
Parents: 9fe8113
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 13:04:39 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 13:04:53 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/cmis/CMISConsumerTest.java | 4 ++--
.../apache/camel/component/cmis/CMISProducerTest.java | 4 ++--
.../camel/component/cmis/CMISQueryProducerTest.java | 8 ++++----
.../apache/camel/component/cmis/CMISTestSupport.java | 13 ++++++++++---
4 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d43fe60a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
index 007822a..41c3351 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
@@ -38,7 +38,7 @@ public class CMISConsumerTest extends CMISTestSupport {
public void getAllContentFromServerOrderedFromRootToLeaves() throws Exception {
resultEndpoint.expectedMessageCount(5);
- Consumer treeBasedConsumer = createConsumerFor(CMIS_ENDPOINT_TEST_SERVER);
+ Consumer treeBasedConsumer = createConsumerFor(getUrl());
treeBasedConsumer.start();
resultEndpoint.assertIsSatisfied();
@@ -57,7 +57,7 @@ public class CMISConsumerTest extends CMISTestSupport {
resultEndpoint.expectedMessageCount(2);
Consumer queryBasedConsumer = createConsumerFor(
- CMIS_ENDPOINT_TEST_SERVER + "?query=SELECT * FROM cmis:document");
+ getUrl() + "?query=SELECT * FROM cmis:document");
queryBasedConsumer.start();
resultEndpoint.assertIsSatisfied();
queryBasedConsumer.stop();
http://git-wip-us.apache.org/repos/asf/camel/blob/d43fe60a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
index b8d5d78..10fc7ce 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
@@ -126,7 +126,7 @@ public class CMISProducerTest extends CMISTestSupport {
@Test(expected = ResolveEndpointFailedException.class)
public void failConnectingToNonExistingRepository() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl()
+ "?username=admin&password=admin&repositoryId=NON_EXISTING_ID");
Producer producer = endpoint.createProducer();
@@ -172,7 +172,7 @@ public class CMISProducerTest extends CMISTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("cmis://" + CMIS_ENDPOINT_TEST_SERVER);
+ .to("cmis://" + getUrl());
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d43fe60a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
index db6af6a..7c31abc 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
@@ -39,7 +39,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void queryServerForDocumentWithSpecificName() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
@@ -54,7 +54,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void getResultCountFromHeader() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
@@ -69,7 +69,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void limitNumberOfResultsWithReadSizeHeader() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
@@ -85,7 +85,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void retrieveAlsoDocumentContent() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
http://git-wip-us.apache.org/repos/asf/camel/blob/d43fe60a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
index a466a01..6f2bd32 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.client.api.Document;
@@ -50,11 +51,16 @@ import org.junit.BeforeClass;
public class CMISTestSupport extends CamelTestSupport {
protected static final String CMIS_ENDPOINT_TEST_SERVER
- = "http://localhost:9090/chemistry-opencmis-server-inmemory/atom";
+ = "http://localhost:%s/chemistry-opencmis-server-inmemory/atom";
protected static final String OPEN_CMIS_SERVER_WAR_PATH
= "target/dependency/chemistry-opencmis-server-inmemory-0.8.0.war";
protected static Server cmisServer;
+ protected static int port;
+
+ protected String getUrl() {
+ return String.format(CMIS_ENDPOINT_TEST_SERVER, port);
+ }
protected Exchange createExchangeWithInBody(String body) {
DefaultExchange exchange = new DefaultExchange(context);
@@ -90,7 +96,7 @@ public class CMISTestSupport extends CamelTestSupport {
protected Session createSession() {
SessionFactory sessionFactory = SessionFactoryImpl.newInstance();
Map<String, String> parameter = new HashMap<String, String>();
- parameter.put(SessionParameter.ATOMPUB_URL, CMIS_ENDPOINT_TEST_SERVER);
+ parameter.put(SessionParameter.ATOMPUB_URL, getUrl());
parameter.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
Repository repository = sessionFactory.getRepositories(parameter).get(0);
@@ -143,7 +149,8 @@ public class CMISTestSupport extends CamelTestSupport {
@BeforeClass
public static void startServer() throws Exception {
- cmisServer = new Server(9090);
+ port = AvailablePortFinder.getNextAvailable(26500);
+ cmisServer = new Server(port);
cmisServer.setHandler(new WebAppContext(OPEN_CMIS_SERVER_WAR_PATH, "/chemistry-opencmis-server-inmemory"));
cmisServer.start();
}
[05/11] git commit: camel-cmis should unit test with dynamic port
number assigned.
Posted by da...@apache.org.
camel-cmis should unit test with dynamic port number assigned.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2fd7c90c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2fd7c90c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2fd7c90c
Branch: refs/heads/camel-2.11.x
Commit: 2fd7c90cc4ffa3b9b42a71c0f6891b119774950b
Parents: e2b2f6c
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 13:04:39 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 13:05:06 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/cmis/CMISConsumerTest.java | 4 ++--
.../apache/camel/component/cmis/CMISProducerTest.java | 4 ++--
.../camel/component/cmis/CMISQueryProducerTest.java | 8 ++++----
.../apache/camel/component/cmis/CMISTestSupport.java | 13 ++++++++++---
4 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2fd7c90c/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
index 007822a..41c3351 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
@@ -38,7 +38,7 @@ public class CMISConsumerTest extends CMISTestSupport {
public void getAllContentFromServerOrderedFromRootToLeaves() throws Exception {
resultEndpoint.expectedMessageCount(5);
- Consumer treeBasedConsumer = createConsumerFor(CMIS_ENDPOINT_TEST_SERVER);
+ Consumer treeBasedConsumer = createConsumerFor(getUrl());
treeBasedConsumer.start();
resultEndpoint.assertIsSatisfied();
@@ -57,7 +57,7 @@ public class CMISConsumerTest extends CMISTestSupport {
resultEndpoint.expectedMessageCount(2);
Consumer queryBasedConsumer = createConsumerFor(
- CMIS_ENDPOINT_TEST_SERVER + "?query=SELECT * FROM cmis:document");
+ getUrl() + "?query=SELECT * FROM cmis:document");
queryBasedConsumer.start();
resultEndpoint.assertIsSatisfied();
queryBasedConsumer.stop();
http://git-wip-us.apache.org/repos/asf/camel/blob/2fd7c90c/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
index b8d5d78..10fc7ce 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
@@ -126,7 +126,7 @@ public class CMISProducerTest extends CMISTestSupport {
@Test(expected = ResolveEndpointFailedException.class)
public void failConnectingToNonExistingRepository() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl()
+ "?username=admin&password=admin&repositoryId=NON_EXISTING_ID");
Producer producer = endpoint.createProducer();
@@ -172,7 +172,7 @@ public class CMISProducerTest extends CMISTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("cmis://" + CMIS_ENDPOINT_TEST_SERVER);
+ .to("cmis://" + getUrl());
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2fd7c90c/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
index db6af6a..7c31abc 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
@@ -39,7 +39,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void queryServerForDocumentWithSpecificName() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
@@ -54,7 +54,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void getResultCountFromHeader() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
@@ -69,7 +69,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void limitNumberOfResultsWithReadSizeHeader() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
@@ -85,7 +85,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
@Test
public void retrieveAlsoDocumentContent() throws Exception {
- Endpoint endpoint = context.getEndpoint("cmis://" + CMIS_ENDPOINT_TEST_SERVER + "?queryMode=true");
+ Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() + "?queryMode=true");
Producer producer = endpoint.createProducer();
Exchange exchange = createExchangeWithInBody(
http://git-wip-us.apache.org/repos/asf/camel/blob/2fd7c90c/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
index a466a01..6f2bd32 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.client.api.Document;
@@ -50,11 +51,16 @@ import org.junit.BeforeClass;
public class CMISTestSupport extends CamelTestSupport {
protected static final String CMIS_ENDPOINT_TEST_SERVER
- = "http://localhost:9090/chemistry-opencmis-server-inmemory/atom";
+ = "http://localhost:%s/chemistry-opencmis-server-inmemory/atom";
protected static final String OPEN_CMIS_SERVER_WAR_PATH
= "target/dependency/chemistry-opencmis-server-inmemory-0.8.0.war";
protected static Server cmisServer;
+ protected static int port;
+
+ protected String getUrl() {
+ return String.format(CMIS_ENDPOINT_TEST_SERVER, port);
+ }
protected Exchange createExchangeWithInBody(String body) {
DefaultExchange exchange = new DefaultExchange(context);
@@ -90,7 +96,7 @@ public class CMISTestSupport extends CamelTestSupport {
protected Session createSession() {
SessionFactory sessionFactory = SessionFactoryImpl.newInstance();
Map<String, String> parameter = new HashMap<String, String>();
- parameter.put(SessionParameter.ATOMPUB_URL, CMIS_ENDPOINT_TEST_SERVER);
+ parameter.put(SessionParameter.ATOMPUB_URL, getUrl());
parameter.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
Repository repository = sessionFactory.getRepositories(parameter).get(0);
@@ -143,7 +149,8 @@ public class CMISTestSupport extends CamelTestSupport {
@BeforeClass
public static void startServer() throws Exception {
- cmisServer = new Server(9090);
+ port = AvailablePortFinder.getNextAvailable(26500);
+ cmisServer = new Server(port);
cmisServer.setHandler(new WebAppContext(OPEN_CMIS_SERVER_WAR_PATH, "/chemistry-opencmis-server-inmemory"));
cmisServer.start();
}
[02/11] git commit: Skip tests on aix
Posted by da...@apache.org.
Skip tests on aix
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9fe81135
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9fe81135
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9fe81135
Branch: refs/heads/camel-2.12.x
Commit: 9fe811351248cee0aac35c24a7ae396292547365
Parents: 88b24c4
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 12:58:37 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 12:58:53 2013 +0200
----------------------------------------------------------------------
.../BeanValidatorConfigurationTest.java | 10 +++++
.../bean/validator/BeanValidatorRouteTest.java | 40 ++++++++++++++++++++
2 files changed, 50 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9fe81135/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
index ce97c33..b24a417 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
@@ -65,6 +65,11 @@ public class BeanValidatorConfigurationTest extends CamelTestSupport {
@Test
public void configureWithDefaults() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
ProcessorEndpoint endpoint = context.getEndpoint("bean-validator://x", ProcessorEndpoint.class);
BeanValidator processor = (BeanValidator) endpoint.getProcessor();
@@ -77,6 +82,11 @@ public class BeanValidatorConfigurationTest extends CamelTestSupport {
@Test
public void configureBeanValidator() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
ProcessorEndpoint endpoint = context.getEndpoint("bean-validator://x"
+ "?group=org.apache.camel.component.bean.validator.OptionalChecks"
+ "&messageInterpolator=#myMessageInterpolator"
http://git-wip-us.apache.org/repos/asf/camel/blob/9fe81135/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
index f2052dd..261df77 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
@@ -48,6 +48,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldSuccessWithImpliciteDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
Exchange exchange = template.request("bean-validator://x", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody(createCar("BMW", "DD-AB-123"));
@@ -59,6 +64,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldSuccessWithExpliciteDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
Exchange exchange = template.request("bean-validator://x?group=javax.validation.groups.Default", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody(createCar("BMW", "DD-AB-123"));
@@ -70,6 +80,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldFailWithImpliciteDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x";
final Car car = createCar("BMW", null);
@@ -102,6 +117,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldFailWithExpliciteDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x?group=javax.validation.groups.Default";
final Car car = createCar("BMW", null);
@@ -134,6 +154,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldFailWithOptionalChecksGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x?group=org.apache.camel.component.bean.validator.OptionalChecks";
final Car car = createCar("BMW", "D-A");
@@ -166,6 +191,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldFailWithOrderedChecksGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x?group=org.apache.camel.component.bean.validator.OrderedChecks";
final Car car = createCar(null, "D-A");
@@ -216,6 +246,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldSuccessWithRedefinedDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x";
final Car car = new CarWithRedefinedDefaultGroup(null, "DD-AB-123");
@@ -230,6 +265,11 @@ public class BeanValidatorRouteTest extends CamelTestSupport {
@Test
public void validateShouldFailWithRedefinedDefaultGroup() throws Exception {
+ if (isPlatform("aix")) {
+ // cannot run on aix
+ return;
+ }
+
final String url = "bean-validator://x";
final Car car = new CarWithRedefinedDefaultGroup(null, "D-A");
[11/11] git commit: Fixed test on windows
Posted by da...@apache.org.
Fixed test on windows
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5fdb8b00
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5fdb8b00
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5fdb8b00
Branch: refs/heads/master
Commit: 5fdb8b00d9d6defb8a8091ebad9250c8eb79adfb
Parents: 1875541
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 13:19:42 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 13:20:32 2013 +0200
----------------------------------------------------------------------
.../camel/management/ManagedStreamCachingStrategyTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5fdb8b00/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
index 47b4f0e..32c5238 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
@@ -23,8 +23,11 @@ import javax.management.ObjectName;
import org.apache.camel.StreamCache;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
+import static org.apache.camel.util.FileUtil.normalizePath;
+
/**
* @version
*/
@@ -50,7 +53,7 @@ public class ManagedStreamCachingStrategyTest extends ManagementTestSupport {
assertEquals(Boolean.TRUE, enabled);
String dir = (String) mbeanServer.getAttribute(name, "SpoolDirectory");
- assertEquals("target/cachedir/myCamel", dir);
+ assertEquals(normalizePath("target/cachedir/myCamel"), normalizePath(dir));
Long threshold = (Long) mbeanServer.getAttribute(name, "SpoolThreshold");
assertEquals(StreamCache.DEFAULT_SPOOL_THRESHOLD, threshold.longValue());
[08/11] git commit: Skip weather test by default as it requires
online access to remote service.
Posted by da...@apache.org.
Skip weather test by default as it requires online access to remote service.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/779995af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/779995af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/779995af
Branch: refs/heads/camel-2.12.x
Commit: 779995af557bfa776a9c35f33ed37834aeadba0e
Parents: d43fe60
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 13:16:36 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 13:16:50 2013 +0200
----------------------------------------------------------------------
components/camel-weather/pom.xml | 40 ++++++++++++++++++++++++++++++-----
1 file changed, 35 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/779995af/components/camel-weather/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml
index 6e831ba..7a49bfd 100644
--- a/components/camel-weather/pom.xml
+++ b/components/camel-weather/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,12 +30,12 @@
<packaging>bundle</packaging>
<name>Camel :: Weather</name>
<description>Camel Weather support</description>
-
+
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.weather.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=weather</camel.osgi.export.service>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -45,11 +46,11 @@
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson-version}</version>
</dependency>
-
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -59,4 +60,33 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>weather-test</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
</project>
[09/11] git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c3afdd20
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c3afdd20
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c3afdd20
Branch: refs/heads/camel-2.12.x
Commit: c3afdd2099b7bfc45c38b0e88985a3326779b8c5
Parents: 779995a
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 11 13:09:07 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 11 13:16:58 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/crypto/ECDSASignatureTest.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c3afdd20/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
index 85f5981..4f8760f 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
@@ -42,10 +42,8 @@ public class ECDSASignatureTest extends CamelTestSupport {
private boolean ibmJDK;
public ECDSASignatureTest() throws Exception {
- //
// BouncyCastle is required for ECDSA support for JDK 1.6
- //
- if (System.getProperty("java.version").startsWith("1.6")
+ if (isJava16()
&& Security.getProvider("BC") == null) {
Constructor<?> cons = null;
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
@@ -55,10 +53,8 @@ public class ECDSASignatureTest extends CamelTestSupport {
Security.insertProviderAt(provider, 2);
}
- //
// This test fails with the IBM JDK
- //
- if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+ if (isJavaVendor("IBM")) {
ibmJDK = true;
}
}