Fix tests where generics interacted badly with varargs

neo4j · May 30, 2017 · ac3ff9d · ac3ff9d
1 parent 12c69d5
commit ac3ff9d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/...g/neo4j/causalclustering/catchup/storecopy/StoreCopyFinishedResponseEncodeDecodeTest.java b/...g/neo4j/causalclustering/catchup/storecopy/StoreCopyFinishedResponseEncodeDecodeTest.java
@@ -40,7 +40,8 @@ public void shouldEncodeAndDecodePullRequestMessage()
 
         // when
         channel.writeOutbound( sent );
-        channel.writeInbound( channel.readOutbound() );
+        Object message = channel.readOutbound();
+        channel.writeInbound( message );
 
         // then
         StoreCopyFinishedResponse received = channel.readInbound();

diff --git a/...ng/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullRequestEncodeDecodeTest.java b/...ng/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullRequestEncodeDecodeTest.java
@@ -39,7 +39,8 @@ public void shouldEncodeAndDecodePullRequestMessage()
 
         // when
         channel.writeOutbound( sent );
-        channel.writeInbound( channel.readOutbound() );
+        Object message = channel.readOutbound();
+        channel.writeInbound( message );
 
         // then
         TxPullRequest received = channel.readInbound();

diff --git a/...g/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullResponseEncodeDecodeTest.java b/...g/src/test/java/org/neo4j/causalclustering/catchup/tx/TxPullResponseEncodeDecodeTest.java
@@ -32,7 +32,7 @@
 import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart;
 import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit;
 
-import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 
@@ -47,7 +47,8 @@ public void shouldEncodeAndDecodePullResponseMessage()
 
         // when
         channel.writeOutbound( sent );
-        channel.writeInbound( channel.readOutbound() );
+        Object message = channel.readOutbound();
+        channel.writeInbound( message );
 
         // then
         TxPullResponse received = channel.readInbound();
@@ -62,7 +63,7 @@ private CommittedTransactionRepresentation newCommittedTransactionRepresentation
                 new Command.NodeCommand( new NodeRecord( arbitraryRecordId ), new NodeRecord( arbitraryRecordId ) );
 
         PhysicalTransactionRepresentation physicalTransactionRepresentation =
-                new PhysicalTransactionRepresentation( asList( new LogEntryCommand( command ).getXaCommand() ) );
+                new PhysicalTransactionRepresentation( singletonList( new LogEntryCommand( command ).getXaCommand() ) );
         physicalTransactionRepresentation.setHeader( new byte[]{}, 0, 0, 0, 0, 0, 0 );
 
         LogEntryStart startEntry = new LogEntryStart( 0, 0, 0L, 0L, new byte[]{}, LogPosition.UNSPECIFIED );

diff --git a/...stering/src/test/java/org/neo4j/causalclustering/messaging/RaftMessageProcessingTest.java b/...stering/src/test/java/org/neo4j/causalclustering/messaging/RaftMessageProcessingTest.java
@@ -106,7 +106,8 @@ public void shouldEncodeAndDecodeVoteRequest()
 
         // when
         channel.writeOutbound( request );
-        channel.writeInbound( channel.readOutbound() );
+        Object message = channel.readOutbound();
+        channel.writeInbound( message );
 
         // then
         assertEquals( request, channel.readInbound() );
@@ -121,7 +122,8 @@ public void shouldEncodeAndDecodeVoteResponse()
 
         // when
         channel.writeOutbound( response );
-        channel.writeInbound( channel.readOutbound() );
+        Object message = channel.readOutbound();
+        channel.writeInbound( message );
 
         // then
         assertEquals( response, channel.readInbound() );
@@ -138,7 +140,8 @@ public void shouldEncodeAndDecodeAppendEntriesRequest()
 
         // when
         channel.writeOutbound( request );
-        channel.writeInbound( channel.readOutbound() );
+        Object message = channel.readOutbound();
+        channel.writeInbound( message );
 
         // then
         assertEquals( request, channel.readInbound() );
@@ -154,7 +157,8 @@ public void shouldEncodeAndDecodeAppendEntriesResponse()
 
         // when
         channel.writeOutbound( response );
-        channel.writeInbound( channel.readOutbound() );
+        Object message = channel.readOutbound();
+        channel.writeInbound( message );
 
         // then
         assertEquals( response, channel.readInbound() );
@@ -170,7 +174,8 @@ public void shouldEncodeAndDecodeNewEntryRequest()
 
         // when
         channel.writeOutbound( request );
-        channel.writeInbound( channel.readOutbound() );
+        Object message = channel.readOutbound();
+        channel.writeInbound( message );
 
         // then
         assertEquals( request, channel.readInbound() );