[JENKINS-31718] Fix the tests

- The tests no longer pass in a null buffered input stream and thus we can remove the null handling from the protocols - Unsure whether the buffer may affect JnlpProtocol3 performance, but leaving it there to highlight the potential stream corruption if the buffer gets thrown away.
jenkinsci · Nov 24, 2015 · 015e280 · 015e280
1 parent 1163157
commit 015e280
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 16 deletions.
diff --git a/src/main/java/org/jenkinsci/remoting/engine/JnlpProtocol1.java b/src/main/java/org/jenkinsci/remoting/engine/JnlpProtocol1.java
@@ -76,9 +76,7 @@ boolean performHandshake(DataOutputStream outputStream,
 
     @Override
     Channel buildChannel(Socket socket, ChannelBuilder channelBuilder, BufferedInputStream inputStream) throws IOException {
-        return channelBuilder.build(
-                inputStream == null ? new BufferedInputStream(socket.getInputStream()) : inputStream, // TODO drop null
-                new BufferedOutputStream(socket.getOutputStream()));
+        return channelBuilder.build(inputStream, new BufferedOutputStream(socket.getOutputStream()));
     }
 
     static final String NAME = "JNLP-connect";

diff --git a/src/main/java/org/jenkinsci/remoting/engine/JnlpProtocol2.java b/src/main/java/org/jenkinsci/remoting/engine/JnlpProtocol2.java
@@ -90,9 +90,7 @@ boolean performHandshake(DataOutputStream outputStream,
 
     @Override
     Channel buildChannel(Socket socket, ChannelBuilder channelBuilder, BufferedInputStream inputStream) throws IOException {
-        return channelBuilder.build(
-                inputStream == null ? new BufferedInputStream(socket.getInputStream()) : inputStream, // TODO drop null
-                new BufferedOutputStream(socket.getOutputStream()));
+        return channelBuilder.build(inputStream, new BufferedOutputStream(socket.getOutputStream()));
     }
 
     private void initiateHandshake(DataOutputStream outputStream) throws IOException {

diff --git a/src/main/java/org/jenkinsci/remoting/engine/JnlpProtocol3.java b/src/main/java/org/jenkinsci/remoting/engine/JnlpProtocol3.java
@@ -159,9 +159,7 @@ boolean performHandshake(DataOutputStream outputStream,
     @Override
     Channel buildChannel(Socket socket, ChannelBuilder channelBuilder, BufferedInputStream inputStream) throws IOException {
         return channelBuilder.build(
-                new CipherInputStream(
-                        inputStream == null ? socket.getInputStream() : inputStream, // TODO drop null
-                        channelCiphers.getDecryptCipher()),
+                new CipherInputStream(inputStream, channelCiphers.getDecryptCipher()),
                 new CipherOutputStream(socket.getOutputStream(), channelCiphers.getEncryptCipher())
         );
     }

diff --git a/src/test/java/org/jenkinsci/remoting/engine/JnlpProtocol1Test.java b/src/test/java/org/jenkinsci/remoting/engine/JnlpProtocol1Test.java
@@ -114,9 +114,8 @@ public void testBuildChannel() throws Exception {
         when(mockSocket.getOutputStream()).thenReturn(mockOutputStream);
         when(mockSocket.getInputStream()).thenReturn(mockInputStream);
         whenNew(BufferedOutputStream.class).withArguments(mockOutputStream).thenReturn(mockBufferedOutputStream);
-        whenNew(BufferedInputStream.class).withArguments(mockInputStream).thenReturn(mockBufferedInputStream);
         when(mockChannelBuilder.build(mockBufferedInputStream, mockBufferedOutputStream)).thenReturn(mockChannel);
 
-        assertSame(mockChannel, protocol.buildChannel(mockSocket, mockChannelBuilder, null));
+        assertSame(mockChannel, protocol.buildChannel(mockSocket, mockChannelBuilder, mockBufferedInputStream));
     }
 }
diff --git a/src/test/java/org/jenkinsci/remoting/engine/JnlpProtocol2Test.java b/src/test/java/org/jenkinsci/remoting/engine/JnlpProtocol2Test.java
@@ -178,9 +178,8 @@ public void testBuildChannel() throws Exception {
         when(mockSocket.getOutputStream()).thenReturn(mockOutputStream);
         when(mockSocket.getInputStream()).thenReturn(mockInputStream);
         whenNew(BufferedOutputStream.class).withArguments(mockOutputStream).thenReturn(mockBufferedOutputStream);
-        whenNew(BufferedInputStream.class).withArguments(mockInputStream).thenReturn(mockBufferedInputStream);
         when(mockChannelBuilder.build(mockBufferedInputStream, mockBufferedOutputStream)).thenReturn(mockChannel);
 
-        assertSame(mockChannel, protocol.buildChannel(mockSocket, mockChannelBuilder, null));
+        assertSame(mockChannel, protocol.buildChannel(mockSocket, mockChannelBuilder, mockBufferedInputStream));
     }
 }
diff --git a/src/test/java/org/jenkinsci/remoting/engine/JnlpProtocol3Test.java b/src/test/java/org/jenkinsci/remoting/engine/JnlpProtocol3Test.java
@@ -282,11 +282,11 @@ public void testBuildChannel() throws Exception {
                 .withArguments(mockOutputStream, protocol.getChannelCiphers().getEncryptCipher())
                 .thenReturn(mockCipherOutputStream);
         whenNew(CipherInputStream.class)
-                .withArguments(mockInputStream, protocol.getChannelCiphers().getDecryptCipher())
+                .withArguments(mockBufferedInputStream, protocol.getChannelCiphers().getDecryptCipher())
                 .thenReturn(mockCipherInputStream);
         when(mockChannelBuilder.build(mockCipherInputStream, mockCipherOutputStream))
                 .thenReturn(mockChannel);
 
-        assertSame(mockChannel, protocol.buildChannel(mockSocket, mockChannelBuilder, null));
+        assertSame(mockChannel, protocol.buildChannel(mockSocket, mockChannelBuilder, mockBufferedInputStream));
     }
 }
diff --git a/src/test/java/org/jenkinsci/remoting/engine/JnlpProtocolTest.java b/src/test/java/org/jenkinsci/remoting/engine/JnlpProtocolTest.java
@@ -80,7 +80,7 @@ public void testHandshakeFails() throws Exception {
     @Test
     public void testHandshakeSucceeds() throws Exception {
         when(mockProtocol.performHandshake(mockDataOutputStream, mockBufferedInputStream)).thenReturn(true);
-        when(mockProtocol.buildChannel(mockSocket, mockChannelBuilder, null)).thenReturn(mockChannel);
+        when(mockProtocol.buildChannel(mockSocket, mockChannelBuilder, mockBufferedInputStream)).thenReturn(mockChannel);
 
         assertSame(mockChannel, mockProtocol.establishChannel(mockSocket, mockChannelBuilder));
     }