You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/02/05 10:49:13 UTC

[camel] branch master updated (1f92359 -> 6787da0)

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

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


    from 1f92359  CAMEL-12224 - Regen docs
     new 1bfbb77  CAMEL-12224 - Fixed test log filename
     new 6787da0  CAMEL-12224 - Added a Spring-boot test, actually ignored, for camel-elasticsearch-rest

The 2 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:
 .../camel-elasticsearch-rest/src/test/resources/log4j2.properties     | 2 +-
 .../{CamelElasticsearch5Test.java => CamelElasticsearchRestTest.java} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 copy tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelElasticsearch5Test.java => CamelElasticsearchRestTest.java} (92%)

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.

[camel] 01/02: CAMEL-12224 - Fixed test log filename

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

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

commit 1bfbb77ea4af53b6901629d0ac1e67e2018d2121
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 5 11:46:39 2018 +0100

    CAMEL-12224 - Fixed test log filename
---
 .../camel-elasticsearch-rest/src/test/resources/log4j2.properties       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-elasticsearch-rest/src/test/resources/log4j2.properties b/components/camel-elasticsearch-rest/src/test/resources/log4j2.properties
index 8f3f866..23f350d 100644
--- a/components/camel-elasticsearch-rest/src/test/resources/log4j2.properties
+++ b/components/camel-elasticsearch-rest/src/test/resources/log4j2.properties
@@ -17,7 +17,7 @@
 
 appender.file.type = File
 appender.file.name = file
-appender.file.fileName = target/camel-elasticsearch5-rest-test.log
+appender.file.fileName = target/camel-elasticsearch-rest-test.log
 appender.file.layout.type = PatternLayout
 appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
 appender.stdout.type = Console

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.

[camel] 02/02: CAMEL-12224 - Added a Spring-boot test, actually ignored, for camel-elasticsearch-rest

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

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

commit 6787da0a87c1fbed1726a409cc5e410583ab834e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 5 11:48:32 2018 +0100

    CAMEL-12224 - Added a Spring-boot test, actually ignored, for camel-elasticsearch-rest
---
 .../springboot/CamelElasticsearchRestTest.java     | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
new file mode 100644
index 0000000..3bfbb23
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
@@ -0,0 +1,51 @@
+/**
+ * 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.itest.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+@Ignore("Requires Lucene 6.x and Spring-Boot 1.x is using 5.x")
+public class CamelElasticsearchRestTest extends AbstractSpringBootTestSupport {
+
+    @Deployment
+    public static Archive<?> createSpringBootPackage() throws Exception {
+        return ArquillianPackager.springBootPackage(createTestConfig());
+    }
+
+    public static ITestConfig createTestConfig() {
+        return new ITestConfigBuilder()
+                .module(inferModuleName(CamelElasticsearchRestTest.class))
+                .unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseTest$)")
+                .build();
+    }
+
+    @Test
+    public void componentTests() throws Exception {
+        this.runComponentTest(config);
+        this.runModuleUnitTestsIfEnabled(config);
+    }
+
+
+}

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.