[camel] branch master updated: Fixing flaky Lumberjack SSL tests

[coheigea]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 7ddae13  Fixing flaky Lumberjack SSL tests
7ddae13 is described below

commit 7ddae135bf6d1978790ceea1da81d32c13c24939
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Jun 25 11:03:32 2019 +0100

    Fixing flaky Lumberjack SSL tests
---
 .../lumberjack/LumberjackComponentGlobalSSLTest.java          |  4 ----
 .../component/lumberjack/LumberjackComponentSSLTest.java      | 11 +++--------
 .../org/apache/camel/component/lumberjack/LumberjackUtil.java |  6 +++---
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git 
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
 
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
index 9f500fd..85b89bc 100644
--- 
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
+++ 
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
@@ -61,10 +61,6 @@ public class LumberjackComponentGlobalSSLTest extends 
CamelTestSupport {
 
     @Test
     public void shouldListenToMessagesOverSSL() throws Exception {
-        // cannot test on java 1.9
-        if (isJava19()) {
-            return;
-        }
 
         // We're expecting 25 messages with Maps
         MockEndpoint mock = getMockEndpoint("mock:output");
diff --git 
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
 
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
index de5b82a..657318e 100644
--- 
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
+++ 
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
@@ -21,7 +21,6 @@ import java.util.Map;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.support.jsse.KeyManagersParameters;
 import org.apache.camel.support.jsse.KeyStoreParameters;
 import org.apache.camel.support.jsse.SSLContextParameters;
@@ -40,14 +39,10 @@ public class LumberjackComponentSSLTest extends 
CamelTestSupport {
     }
 
     @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry registry = super.createRegistry();
-        registry.bind("ssl", createServerSSLContextParameters());
-        return registry;
-    }
-
-    @Override
     protected RouteBuilder createRouteBuilder() {
+
+        context.getRegistry().bind("ssl", createServerSSLContextParameters());
+
         return new RouteBuilder() {
             public void configure() {
                 // Lumberjack configured with SSL
diff --git 
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
 
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
index ae0e229..289dd9c 100644
--- 
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
+++ 
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
@@ -83,11 +83,11 @@ final class LumberjackUtil {
                     .connect("127.0.0.1", port).sync().channel(); //
 
             // Send the 2 window frames
-            TimeUnit.MILLISECONDS.sleep(100);
+            TimeUnit.MILLISECONDS.sleep(500);
             channel.writeAndFlush(readSample("io/window10"));
-            TimeUnit.MILLISECONDS.sleep(100);
+            TimeUnit.MILLISECONDS.sleep(500);
             channel.writeAndFlush(readSample("io/window15"));
-            TimeUnit.MILLISECONDS.sleep(100);
+            TimeUnit.MILLISECONDS.sleep(500);
 
             channel.close();