You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2017/04/11 16:16:59 UTC
[2/3] camel git commit: CAMEL-11134: enable ignored tests for https4
CAMEL-11134: enable ignored tests for https4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ce78e0a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ce78e0a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ce78e0a
Branch: refs/heads/apache-master
Commit: 3ce78e0a92ba38234ccaf28b7a570168669e4440
Parents: 085736d
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Tue Apr 11 18:07:35 2017 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Tue Apr 11 18:07:35 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/jetty9/Jetty9SSLTest.java | 2 --
.../component/netty4/http/springboot/Netty4HttpSSLTest.java | 6 +-----
2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3ce78e0a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java
index 6b40ff6..7e80043 100644
--- a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java
+++ b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.component.jetty9.springboot.JettyHttpComponentAutoConfig
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +54,6 @@ import static org.junit.Assert.assertEquals;
"camel.component.jetty.use-global-ssl-context-parameters=true",
"camel.component.http4.use-global-ssl-context-parameters=true",
})
-@Ignore("Bug in https4 spring-boot configuration")
public class Jetty9SSLTest {
private static int port;
http://git-wip-us.apache.org/repos/asf/camel/blob/3ce78e0a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
index d8451b7..68d10fa 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
+++ b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
@@ -16,12 +16,9 @@
*/
package org.apache.camel.component.netty4.http.springboot;
-import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,9 +50,8 @@ import static org.junit.Assert.assertEquals;
"camel.ssl.config.trust-managers.key-store.password=changeit",
"camel.ssl.config.trust-managers.key-store.type=jks",
"camel.component.netty4-http.use-global-ssl-context-parameters=true",
- "camel.component.http.use-global-ssl-context-parameters=true"
+ "camel.component.http4.use-global-ssl-context-parameters=true"
})
-@Ignore("Bug in https4 spring-boot configuration")
public class Netty4HttpSSLTest {
@Autowired