diff options
Diffstat (limited to 'common/network-common')
5 files changed, 15 insertions, 14 deletions
diff --git a/common/network-common/src/test/java/org/apache/spark/network/ChunkFetchIntegrationSuite.java b/common/network-common/src/test/java/org/apache/spark/network/ChunkFetchIntegrationSuite.java index 70c849d60e..d17e986e17 100644 --- a/common/network-common/src/test/java/org/apache/spark/network/ChunkFetchIntegrationSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/ChunkFetchIntegrationSuite.java @@ -132,7 +132,7 @@ public class ChunkFetchIntegrationSuite { testFile.delete(); } - class FetchResult { + static class FetchResult { public Set<Integer> successChunks; public Set<Integer> failedChunks; public List<ManagedBuffer> buffers; diff --git a/common/network-common/src/test/java/org/apache/spark/network/RequestTimeoutIntegrationSuite.java b/common/network-common/src/test/java/org/apache/spark/network/RequestTimeoutIntegrationSuite.java index f9b5bf96d6..e2d026c66f 100644 --- a/common/network-common/src/test/java/org/apache/spark/network/RequestTimeoutIntegrationSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/RequestTimeoutIntegrationSuite.java @@ -124,8 +124,8 @@ public class RequestTimeoutIntegrationSuite { synchronized (callback1) { client.sendRpc(ByteBuffer.allocate(0), callback1); callback1.wait(4 * 1000); - assert (callback1.failure != null); - assert (callback1.failure instanceof IOException); + assertNotNull(callback1.failure); + assertTrue(callback1.failure instanceof IOException); } semaphore.release(); } @@ -167,8 +167,8 @@ public class RequestTimeoutIntegrationSuite { synchronized (callback0) { client0.sendRpc(ByteBuffer.allocate(0), callback0); callback0.wait(FOREVER); - assert (callback0.failure instanceof IOException); - assert (!client0.isActive()); + assertTrue(callback0.failure instanceof IOException); + assertFalse(client0.isActive()); } // Increment the semaphore and the second request should succeed quickly. @@ -236,7 +236,7 @@ public class RequestTimeoutIntegrationSuite { synchronized (callback1) { // failed at same time as previous - assert (callback0.failure instanceof IOException); + assertTrue(callback0.failure instanceof IOException); } } @@ -244,7 +244,7 @@ public class RequestTimeoutIntegrationSuite { * Callback which sets 'success' or 'failure' on completion. * Additionally notifies all waiters on this callback when invoked. */ - class TestCallback implements RpcResponseCallback, ChunkReceivedCallback { + static class TestCallback implements RpcResponseCallback, ChunkReceivedCallback { int successLength = -1; Throwable failure; diff --git a/common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java b/common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java index 9e9be98c14..a7a99f3bfc 100644 --- a/common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java @@ -91,7 +91,7 @@ public class RpcIntegrationSuite { clientFactory.close(); } - class RpcResult { + static class RpcResult { public Set<String> successMessages; public Set<String> errorMessages; } diff --git a/common/network-common/src/test/java/org/apache/spark/network/TransportClientFactorySuite.java b/common/network-common/src/test/java/org/apache/spark/network/TransportClientFactorySuite.java index dac7d4a5b0..9a89dd114f 100644 --- a/common/network-common/src/test/java/org/apache/spark/network/TransportClientFactorySuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/TransportClientFactorySuite.java @@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.Maps; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -95,7 +96,7 @@ public class TransportClientFactorySuite { try { TransportClient client = factory.createClient(TestUtils.getLocalHost(), server1.getPort()); - assert (client.isActive()); + assertTrue(client.isActive()); clients.add(client); } catch (IOException e) { failed.incrementAndGet(); @@ -115,8 +116,8 @@ public class TransportClientFactorySuite { attempts[i].join(); } - assert(failed.get() == 0); - assert(clients.size() == maxConnections); + Assert.assertEquals(0, failed.get()); + Assert.assertEquals(clients.size(), maxConnections); for (TransportClient client : clients) { client.close(); diff --git a/common/network-common/src/test/java/org/apache/spark/network/protocol/MessageWithHeaderSuite.java b/common/network-common/src/test/java/org/apache/spark/network/protocol/MessageWithHeaderSuite.java index fbbe4b7014..b341c5681e 100644 --- a/common/network-common/src/test/java/org/apache/spark/network/protocol/MessageWithHeaderSuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/protocol/MessageWithHeaderSuite.java @@ -65,7 +65,7 @@ public class MessageWithHeaderSuite { assertEquals(42, result.readLong()); assertEquals(84, result.readLong()); - assert(msg.release()); + assertTrue(msg.release()); assertEquals(0, bodyPassedToNettyManagedBuffer.refCnt()); assertEquals(0, header.refCnt()); } @@ -77,7 +77,7 @@ public class MessageWithHeaderSuite { ByteBuf body = (ByteBuf) managedBuf.convertToNetty(); assertEquals(2, body.refCnt()); MessageWithHeader msg = new MessageWithHeader(managedBuf, header, body, body.readableBytes()); - assert(msg.release()); + assertTrue(msg.release()); Mockito.verify(managedBuf, Mockito.times(1)).release(); assertEquals(0, body.refCnt()); } @@ -94,7 +94,7 @@ public class MessageWithHeaderSuite { for (long i = 0; i < 8; i++) { assertEquals(i, result.readLong()); } - assert(msg.release()); + assertTrue(msg.release()); } private ByteBuf doWrite(MessageWithHeader msg, int minExpectedWrites) throws Exception { |