also test with xor crypto engine

2 files changed, 25 insertions, 4 deletions

diff --git a/jrt/tests/com/yahoo/jrt/EchoTest.java b/jrt/tests/com/yahoo/jrt/EchoTest.java
index 5acd8221a9b..0523241354a 100644
--- a/jrt/tests/com/yahoo/jrt/EchoTest.java
+++ b/jrt/tests/com/yahoo/jrt/EchoTest.java
@@ -4,9 +4,15 @@ package com.yahoo.jrt;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized;
+
 
 import static org.junit.Assert.assertTrue;
 
+@RunWith(Parameterized.class)
 public class EchoTest {
 
     Supervisor server;
@@ -15,10 +21,15 @@ public class EchoTest {
     Target     target;
     Values     refValues;
 
+    @Parameter public CryptoEngine crypto;
+    @Parameters public static Object[] engines() {
+        return new Object[] { CryptoEngine.createDefault(), new XorCryptoEngine() };
+    }
+
     @Before
     public void setUp() throws ListenFailedException {
-        server   = new Supervisor(new Transport());
-        client   = new Supervisor(new Transport());
+        server   = new Supervisor(new Transport(crypto));
+        client   = new Supervisor(new Transport(crypto));
         acceptor = server.listen(new Spec(0));
         target   = client.connect(new Spec("localhost", acceptor.port()));
         server.addMethod(new Method("echo", "*", "*", this, "rpc_echo"));
diff --git a/jrt/tests/com/yahoo/jrt/SessionTest.java b/jrt/tests/com/yahoo/jrt/SessionTest.java
index 1a788c4038e..2f1a64538de 100644
--- a/jrt/tests/com/yahoo/jrt/SessionTest.java
+++ b/jrt/tests/com/yahoo/jrt/SessionTest.java
@@ -4,13 +4,23 @@ package com.yahoo.jrt;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+@RunWith(Parameterized.class)
 public class SessionTest implements SessionHandler {
 
+    @Parameter public CryptoEngine crypto;
+    @Parameters public static Object[] engines() {
+        return new Object[] { CryptoEngine.createDefault(), new XorCryptoEngine() };
+    }
+
     private static class Session {
         private static int     cnt   = 0;
         private static boolean error = false;
@@ -111,9 +121,9 @@ public class SessionTest implements SessionHandler {
     @Before
     public void setUp() throws ListenFailedException {
         Session.reset();
-        server   = new Test.Orb(new Transport());
+        server   = new Test.Orb(new Transport(crypto));
         server.setSessionHandler(this);
-        client   = new Test.Orb(new Transport());
+        client   = new Test.Orb(new Transport(crypto));
         client.setSessionHandler(this);
         acceptor = server.listen(new Spec(0));
         target   = client.connect(new Spec("localhost", acceptor.port()),