Refactor some TLS tests

peterdettman · peterdettman · commit a4b063895266 · 2025-07-25T12:40:41.000+07:00
diff --git a/tls/src/test/java/org/bouncycastle/tls/test/TlsProtocolHybridTest.java b/tls/src/test/java/org/bouncycastle/tls/test/TlsProtocolHybridTest.java
@@ -7,6 +7,7 @@
 
 import org.bouncycastle.tls.NamedGroup;
 import org.bouncycastle.tls.TlsClientProtocol;
+import org.bouncycastle.tls.TlsServer;
 import org.bouncycastle.tls.TlsServerProtocol;
 import org.bouncycastle.tls.crypto.TlsCrypto;
 import org.bouncycastle.util.Arrays;
@@ -35,7 +36,13 @@ public void testMismatchedGroups() throws Exception
         TlsClientProtocol clientProtocol = new TlsClientProtocol(clientRead, clientWrite);
         TlsServerProtocol serverProtocol = new TlsServerProtocol(serverRead, serverWrite);
 
-        ServerThread serverThread = new ServerThread(crypto, serverProtocol, new int[]{ NamedGroup.X25519MLKEM768 }, true);
+        MockTlsHybridClient client = new MockTlsHybridClient(crypto, null);
+        MockTlsHybridServer server = new MockTlsHybridServer(crypto);
+
+        client.setNamedGroups(new int[]{ NamedGroup.SecP256r1MLKEM768 });
+        server.setNamedGroups(new int[]{ NamedGroup.X25519MLKEM768 });
+
+        ServerThread serverThread = new ServerThread(serverProtocol, server, true);
         try
         {
             serverThread.start();
@@ -44,8 +51,6 @@ public void testMismatchedGroups() throws Exception
         {
         }
 
-        MockTlsHybridClient client = new MockTlsHybridClient(crypto, null);
-        client.setNamedGroups(new int[]{ NamedGroup.SecP256r1MLKEM768 });
         try
         {
             clientProtocol.connect(client);
@@ -83,11 +88,14 @@ private void implTestClientServer(int hybridGroup) throws Exception
         TlsClientProtocol clientProtocol = new TlsClientProtocol(clientRead, clientWrite);
         TlsServerProtocol serverProtocol = new TlsServerProtocol(serverRead, serverWrite);
 
-        ServerThread serverThread = new ServerThread(crypto, serverProtocol, new int[]{ hybridGroup }, false);
-        serverThread.start();
-
         MockTlsHybridClient client = new MockTlsHybridClient(crypto, null);
+        MockTlsHybridServer server = new MockTlsHybridServer(crypto);
+
         client.setNamedGroups(new int[]{ hybridGroup });
+        server.setNamedGroups(new int[]{ hybridGroup });
+
+        ServerThread serverThread = new ServerThread(serverProtocol, server, false);
+        serverThread.start();
 
         clientProtocol.connect(client);
 
@@ -114,36 +122,30 @@ private void implTestClientServer(int hybridGroup) throws Exception
     static class ServerThread
         extends Thread
     {
-        private final TlsCrypto crypto;
         private final TlsServerProtocol serverProtocol;
-        private final int[] namedGroups;
-        private boolean shouldFail = false;
+        private final TlsServer server;
+        private final boolean shouldFail;
 
-        ServerThread(TlsCrypto crypto, TlsServerProtocol serverProtocol, int[] namedGroups, boolean shouldFail)
+        ServerThread(TlsServerProtocol serverProtocol, TlsServer server, boolean shouldFail)
         {
-            this.crypto = crypto;
             this.serverProtocol = serverProtocol;
-            this.namedGroups = namedGroups;
+            this.server = server;
             this.shouldFail = shouldFail;
         }
 
         public void run()
         {
             try
             {
-                MockTlsHybridServer server = new MockTlsHybridServer(crypto);
-                if (namedGroups != null)
-                {
-                    server.setNamedGroups(namedGroups);
-                }
-
                 try
                 {
                     serverProtocol.accept(server);
                     if (shouldFail)
                     {
                         fail();
                     }
+
+                    Streams.pipeAll(serverProtocol.getInputStream(), serverProtocol.getOutputStream());
                 }
                 catch (IOException ignored)
                 {
@@ -153,12 +155,10 @@ public void run()
                     }
                 }
 
-                Streams.pipeAll(serverProtocol.getInputStream(), serverProtocol.getOutputStream());
                 serverProtocol.close();
             }
             catch (Exception e)
             {
-//                throw new RuntimeException(e);
             }
         }
     }
diff --git a/tls/src/test/java/org/bouncycastle/tls/test/TlsProtocolKemTest.java b/tls/src/test/java/org/bouncycastle/tls/test/TlsProtocolKemTest.java
@@ -7,6 +7,7 @@
 
 import org.bouncycastle.tls.NamedGroup;
 import org.bouncycastle.tls.TlsClientProtocol;
+import org.bouncycastle.tls.TlsServer;
 import org.bouncycastle.tls.TlsServerProtocol;
 import org.bouncycastle.tls.crypto.TlsCrypto;
 import org.bouncycastle.util.Arrays;
@@ -35,7 +36,13 @@ public void testMismatchedGroups() throws Exception
         TlsClientProtocol clientProtocol = new TlsClientProtocol(clientRead, clientWrite);
         TlsServerProtocol serverProtocol = new TlsServerProtocol(serverRead, serverWrite);
 
-        ServerThread serverThread = new ServerThread(crypto, serverProtocol, new int[]{ NamedGroup.MLKEM768 }, true);
+        MockTlsKemClient client = new MockTlsKemClient(crypto, null);
+        MockTlsKemServer server = new MockTlsKemServer(crypto);
+
+        client.setNamedGroups(new int[]{ NamedGroup.MLKEM512 });
+        server.setNamedGroups(new int[]{ NamedGroup.MLKEM768 });
+
+        ServerThread serverThread = new ServerThread(serverProtocol, server, true);
         try
         {
             serverThread.start();
@@ -44,8 +51,6 @@ public void testMismatchedGroups() throws Exception
         {
         }
 
-        MockTlsKemClient client = new MockTlsKemClient(crypto, null);
-        client.setNamedGroups(new int[]{ NamedGroup.MLKEM512 });
         try
         {
             clientProtocol.connect(client);
@@ -83,11 +88,14 @@ private void implTestClientServer(int kemGroup) throws Exception
         TlsClientProtocol clientProtocol = new TlsClientProtocol(clientRead, clientWrite);
         TlsServerProtocol serverProtocol = new TlsServerProtocol(serverRead, serverWrite);
 
-        ServerThread serverThread = new ServerThread(crypto, serverProtocol, new int[]{ kemGroup }, false);
-        serverThread.start();
-
         MockTlsKemClient client = new MockTlsKemClient(crypto, null);
+        MockTlsKemServer server = new MockTlsKemServer(crypto);
+
         client.setNamedGroups(new int[]{ kemGroup });
+        server.setNamedGroups(new int[]{ kemGroup });
+
+        ServerThread serverThread = new ServerThread(serverProtocol, server, false);
+        serverThread.start();
 
         clientProtocol.connect(client);
 
@@ -114,36 +122,30 @@ private void implTestClientServer(int kemGroup) throws Exception
     static class ServerThread
         extends Thread
     {
-        private final TlsCrypto crypto;
         private final TlsServerProtocol serverProtocol;
-        private final int[] namedGroups;
-        private boolean shouldFail = false;
+        private final TlsServer server;
+        private final boolean shouldFail;
 
-        ServerThread(TlsCrypto crypto, TlsServerProtocol serverProtocol, int[] namedGroups, boolean shouldFail)
+        ServerThread(TlsServerProtocol serverProtocol, TlsServer server, boolean shouldFail)
         {
-            this.crypto = crypto;
             this.serverProtocol = serverProtocol;
-            this.namedGroups = namedGroups;
+            this.server = server;
             this.shouldFail = shouldFail;
         }
 
         public void run()
         {
             try
             {
-                MockTlsKemServer server = new MockTlsKemServer(crypto);
-                if (namedGroups != null)
-                {
-                    server.setNamedGroups(namedGroups);
-                }
-
                 try
                 {
                     serverProtocol.accept(server);
                     if (shouldFail)
                     {
                         fail();
                     }
+
+                    Streams.pipeAll(serverProtocol.getInputStream(), serverProtocol.getOutputStream());
                 }
                 catch (IOException ignored)
                 {
@@ -153,12 +155,10 @@ public void run()
                     }
                 }
 
-                Streams.pipeAll(serverProtocol.getInputStream(), serverProtocol.getOutputStream());
                 serverProtocol.close();
             }
             catch (Exception e)
             {
-//                throw new RuntimeException(e);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`import org.bouncycastle.tls.NamedGroup;`
`9`	`9`	`import org.bouncycastle.tls.TlsClientProtocol;`
	`10`	`+import org.bouncycastle.tls.TlsServer;`
`10`	`11`	`import org.bouncycastle.tls.TlsServerProtocol;`
`11`	`12`	`import org.bouncycastle.tls.crypto.TlsCrypto;`
`12`	`13`	`import org.bouncycastle.util.Arrays;`
`@@ -35,7 +36,13 @@ public void testMismatchedGroups() throws Exception`
`35`	`36`	`TlsClientProtocol clientProtocol = new TlsClientProtocol(clientRead, clientWrite);`
`36`	`37`	`TlsServerProtocol serverProtocol = new TlsServerProtocol(serverRead, serverWrite);`
`37`	`38`
`38`		`- ServerThread serverThread = new ServerThread(crypto, serverProtocol, new int[]{ NamedGroup.X25519MLKEM768 }, true);`
	`39`	`+ MockTlsHybridClient client = new MockTlsHybridClient(crypto, null);`
	`40`	`+ MockTlsHybridServer server = new MockTlsHybridServer(crypto);`
	`41`	`+`
	`42`	`+ client.setNamedGroups(new int[]{ NamedGroup.SecP256r1MLKEM768 });`
	`43`	`+ server.setNamedGroups(new int[]{ NamedGroup.X25519MLKEM768 });`
	`44`	`+`
	`45`	`+ ServerThread serverThread = new ServerThread(serverProtocol, server, true);`
`39`	`46`	`try`
`40`	`47`	`{`
`41`	`48`	`serverThread.start();`
`@@ -44,8 +51,6 @@ public void testMismatchedGroups() throws Exception`
`44`	`51`	`{`
`45`	`52`	`}`
`46`	`53`
`47`		`- MockTlsHybridClient client = new MockTlsHybridClient(crypto, null);`
`48`		`- client.setNamedGroups(new int[]{ NamedGroup.SecP256r1MLKEM768 });`
`49`	`54`	`try`
`50`	`55`	`{`
`51`	`56`	`clientProtocol.connect(client);`
`@@ -83,11 +88,14 @@ private void implTestClientServer(int hybridGroup) throws Exception`
`83`	`88`	`TlsClientProtocol clientProtocol = new TlsClientProtocol(clientRead, clientWrite);`
`84`	`89`	`TlsServerProtocol serverProtocol = new TlsServerProtocol(serverRead, serverWrite);`
`85`	`90`
`86`		`- ServerThread serverThread = new ServerThread(crypto, serverProtocol, new int[]{ hybridGroup }, false);`
`87`		`- serverThread.start();`
`88`		`-`
`89`	`91`	`MockTlsHybridClient client = new MockTlsHybridClient(crypto, null);`
	`92`	`+ MockTlsHybridServer server = new MockTlsHybridServer(crypto);`
	`93`	`+`
`90`	`94`	`client.setNamedGroups(new int[]{ hybridGroup });`
	`95`	`+ server.setNamedGroups(new int[]{ hybridGroup });`
	`96`	`+`
	`97`	`+ ServerThread serverThread = new ServerThread(serverProtocol, server, false);`
	`98`	`+ serverThread.start();`
`91`	`99`
`92`	`100`	`clientProtocol.connect(client);`
`93`	`101`
`@@ -114,36 +122,30 @@ private void implTestClientServer(int hybridGroup) throws Exception`
`114`	`122`	`static class ServerThread`
`115`	`123`	`extends Thread`
`116`	`124`	`{`
`117`		`- private final TlsCrypto crypto;`
`118`	`125`	`private final TlsServerProtocol serverProtocol;`
`119`		`- private final int[] namedGroups;`
`120`		`- private boolean shouldFail = false;`
	`126`	`+ private final TlsServer server;`
	`127`	`+ private final boolean shouldFail;`
`121`	`128`
`122`		`- ServerThread(TlsCrypto crypto, TlsServerProtocol serverProtocol, int[] namedGroups, boolean shouldFail)`
	`129`	`+ ServerThread(TlsServerProtocol serverProtocol, TlsServer server, boolean shouldFail)`
`123`	`130`	`{`
`124`		`- this.crypto = crypto;`
`125`	`131`	`this.serverProtocol = serverProtocol;`
`126`		`- this.namedGroups = namedGroups;`
	`132`	`+ this.server = server;`
`127`	`133`	`this.shouldFail = shouldFail;`
`128`	`134`	`}`
`129`	`135`
`130`	`136`	`public void run()`
`131`	`137`	`{`
`132`	`138`	`try`
`133`	`139`	`{`
`134`		`- MockTlsHybridServer server = new MockTlsHybridServer(crypto);`
`135`		`- if (namedGroups != null)`
`136`		`- {`
`137`		`- server.setNamedGroups(namedGroups);`
`138`		`- }`
`139`		`-`
`140`	`140`	`try`
`141`	`141`	`{`
`142`	`142`	`serverProtocol.accept(server);`
`143`	`143`	`if (shouldFail)`
`144`	`144`	`{`
`145`	`145`	`fail();`
`146`	`146`	`}`
	`147`	`+`
	`148`	`+ Streams.pipeAll(serverProtocol.getInputStream(), serverProtocol.getOutputStream());`
`147`	`149`	`}`
`148`	`150`	`catch (IOException ignored)`
`149`	`151`	`{`
`@@ -153,12 +155,10 @@ public void run()`
`153`	`155`	`}`
`154`	`156`	`}`
`155`	`157`
`156`		`- Streams.pipeAll(serverProtocol.getInputStream(), serverProtocol.getOutputStream());`
`157`	`158`	`serverProtocol.close();`
`158`	`159`	`}`
`159`	`160`	`catch (Exception e)`
`160`	`161`	`{`
`161`		`-// throw new RuntimeException(e);`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`}`