You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuweni.apache.org by to...@apache.org on 2020/04/28 08:11:23 UTC
[incubator-tuweni] branch master updated: Fix Assertions qualified
imports
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
The following commit(s) were added to refs/heads/master by this push:
new d286841 Fix Assertions qualified imports
d286841 is described below
commit d286841328d5b8157c28c4286927999004893cf6
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Tue Apr 28 01:07:24 2020 -0700
Fix Assertions qualified imports
---
.../org/apache/tuweni/rlpx/vertx/VertxAcceptanceTest.java | 12 ++++++------
.../org/apache/tuweni/rlpx/vertx/VertxRLPxServiceTest.java | 12 ++++++------
.../discovery/ScuttlebuttLocalDiscoveryServiceTest.java | 8 ++++----
.../scuttlebutt/handshake/vertx/VertxIntegrationTest.java | 8 ++++----
.../tuweni/scuttlebutt/rpc/PatchworkIntegrationTest.java | 6 +++---
.../tuweni/scuttlebutt/rpc/mux/PatchworkIntegrationTest.java | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/rlpx/src/integration-test/java/org/apache/tuweni/rlpx/vertx/VertxAcceptanceTest.java b/rlpx/src/integration-test/java/org/apache/tuweni/rlpx/vertx/VertxAcceptanceTest.java
index e1a4f3f..215d5a3 100644
--- a/rlpx/src/integration-test/java/org/apache/tuweni/rlpx/vertx/VertxAcceptanceTest.java
+++ b/rlpx/src/integration-test/java/org/apache/tuweni/rlpx/vertx/VertxAcceptanceTest.java
@@ -143,7 +143,7 @@ class VertxAcceptanceTest {
AsyncCompletion completion = ((DefaultWireConnection) repository.asMap().values().iterator().next()).sendPing();
completion.join();
- Assertions.assertTrue(completion.isDone());
+ assertTrue(completion.isDone());
} finally {
AsyncCompletion.allOf(service.stop(), secondService.stop());
}
@@ -177,11 +177,11 @@ class VertxAcceptanceTest {
service.connectTo(secondKp.publicKey(), new InetSocketAddress("localhost", secondService.actualPort()));
Thread.sleep(3000);
- Assertions.assertEquals(1, repository.asMap().size());
- Assertions.assertEquals(1, secondRepository.asMap().size());
+ assertEquals(1, repository.asMap().size());
+ assertEquals(1, secondRepository.asMap().size());
- Assertions.assertEquals(1, sp.handler.messages.size());
- Assertions.assertEquals(1, secondSp.handler.messages.size());
+ assertEquals(1, sp.handler.messages.size());
+ assertEquals(1, secondSp.handler.messages.size());
List<AsyncCompletion> completionList = new ArrayList<>();
ExecutorService threadPool = Executors.newFixedThreadPool(16);
@@ -202,7 +202,7 @@ class VertxAcceptanceTest {
AsyncCompletion allTasks = AsyncCompletion.allOf(completionList);
allTasks.join(30, TimeUnit.SECONDS);
- Assertions.assertTrue(allTasks.isDone());
+ assertTrue(allTasks.isDone());
} finally {
AsyncCompletion.allOf(service.stop(), secondService.stop());
diff --git a/rlpx/src/integration-test/java/org/apache/tuweni/rlpx/vertx/VertxRLPxServiceTest.java b/rlpx/src/integration-test/java/org/apache/tuweni/rlpx/vertx/VertxRLPxServiceTest.java
index 462627c..8b9221a 100644
--- a/rlpx/src/integration-test/java/org/apache/tuweni/rlpx/vertx/VertxRLPxServiceTest.java
+++ b/rlpx/src/integration-test/java/org/apache/tuweni/rlpx/vertx/VertxRLPxServiceTest.java
@@ -42,21 +42,21 @@ class VertxRLPxServiceTest {
@Test
void invalidAdvertisedPort(@VertxInstance Vertx vertx) {
- Assertions.assertThrows(
+ assertThrows(
IllegalArgumentException.class,
() -> new VertxRLPxService(vertx, 3, "localhost", -1, SECP256K1.KeyPair.random(), new ArrayList<>(), "a"));
}
@Test
void invalidClientId(@VertxInstance Vertx vertx) {
- Assertions.assertThrows(
+ assertThrows(
IllegalArgumentException.class,
() -> new VertxRLPxService(vertx, 34, "localhost", 23, SECP256K1.KeyPair.random(), new ArrayList<>(), null));
}
@Test
void invalidClientIdSpaces(@VertxInstance Vertx vertx) {
- Assertions.assertThrows(
+ assertThrows(
IllegalArgumentException.class,
() -> new VertxRLPxService(vertx, 34, "localhost", 23, SECP256K1.KeyPair.random(), new ArrayList<>(), " "));
}
@@ -81,7 +81,7 @@ class VertxRLPxServiceTest {
service.start().join();
try {
- Assertions.assertTrue(service.actualPort() != 0);
+ assertTrue(service.actualPort() != 0);
assertEquals(service.actualPort(), service.advertisedPort());
} finally {
service.stop();
@@ -93,7 +93,7 @@ class VertxRLPxServiceTest {
VertxRLPxService service =
new VertxRLPxService(vertx, 0, "localhost", 10000, SECP256K1.KeyPair.random(), new ArrayList<>(), "abc");
AsyncCompletion completion = service.stop();
- Assertions.assertTrue(completion.isDone());
+ assertTrue(completion.isDone());
}
@Test
@@ -133,7 +133,7 @@ class VertxRLPxServiceTest {
try {
service.connectTo(peerPair.publicKey(), new InetSocketAddress("localhost", peerService.actualPort()));
Thread.sleep(3000);
- Assertions.assertEquals(1, repository.asMap().size());
+ assertEquals(1, repository.asMap().size());
} finally {
service.stop();
diff --git a/scuttlebutt-discovery/src/integration-test/java/org/apache/tuweni/scuttlebutt/discovery/ScuttlebuttLocalDiscoveryServiceTest.java b/scuttlebutt-discovery/src/integration-test/java/org/apache/tuweni/scuttlebutt/discovery/ScuttlebuttLocalDiscoveryServiceTest.java
index b5e0d6a..6b8c1ed 100644
--- a/scuttlebutt-discovery/src/integration-test/java/org/apache/tuweni/scuttlebutt/discovery/ScuttlebuttLocalDiscoveryServiceTest.java
+++ b/scuttlebutt-discovery/src/integration-test/java/org/apache/tuweni/scuttlebutt/discovery/ScuttlebuttLocalDiscoveryServiceTest.java
@@ -35,7 +35,7 @@ class ScuttlebuttLocalDiscoveryServiceTest {
@BeforeAll
static void checkAvailable() {
- Assumptions.assumeTrue(Sodium.isAvailable(), "Sodium native library is not available");
+ assumeTrue(Sodium.isAvailable(), "Sodium native library is not available");
}
@Test
@@ -55,7 +55,7 @@ class ScuttlebuttLocalDiscoveryServiceTest {
@Test
void invalidMulticastAddress(@VertxInstance Vertx vertx) throws Exception {
- Assertions.assertThrows(
+ assertThrows(
IllegalArgumentException.class,
() -> new ScuttlebuttLocalDiscoveryService(vertx, 8008, "0.0.0.0", "10.0.0.0"));
}
@@ -85,8 +85,8 @@ class ScuttlebuttLocalDiscoveryServiceTest {
service.start().join();
service.broadcast();
Thread.sleep(1000);
- Assertions.assertNotNull(ref.get());
- Assertions.assertEquals(localId, ref.get());
+ assertNotNull(ref.get());
+ assertEquals(localId, ref.get());
} finally {
AsyncCompletion.allOf(service2.stop(), service.stop()).join();
}
diff --git a/scuttlebutt-handshake/src/integration-test/java/org/apache/tuweni/scuttlebutt/handshake/vertx/VertxIntegrationTest.java b/scuttlebutt-handshake/src/integration-test/java/org/apache/tuweni/scuttlebutt/handshake/vertx/VertxIntegrationTest.java
index b7eaf87..6e39a67 100644
--- a/scuttlebutt-handshake/src/integration-test/java/org/apache/tuweni/scuttlebutt/handshake/vertx/VertxIntegrationTest.java
+++ b/scuttlebutt-handshake/src/integration-test/java/org/apache/tuweni/scuttlebutt/handshake/vertx/VertxIntegrationTest.java
@@ -41,7 +41,7 @@ class VertxIntegrationTest {
@BeforeAll
static void checkAvailable() {
- Assumptions.assumeTrue(Sodium.isAvailable(), "Sodium native library is not available");
+ assumeTrue(Sodium.isAvailable(), "Sodium native library is not available");
}
private static class MyClientHandler implements ClientHandler {
@@ -112,7 +112,7 @@ class VertxIntegrationTest {
MyClientHandler handler = client.connectTo(20000, "0.0.0.0", serverKeyPair.publicKey(), MyClientHandler::new).get();
Thread.sleep(1000);
- Assertions.assertNotNull(handler);
+ assertNotNull(handler);
String rpcRequestBody = "{\"name\": [\"whoami\"],\"type\": \"async\",\"args\":[]}";
Bytes rpcRequest = RPCCodec.encodeRequest(rpcRequestBody, RPCFlag.BodyType.JSON);
@@ -127,11 +127,11 @@ class VertxIntegrationTest {
Bytes requestBody = rpcRequest.slice(9);
- Assertions.assertEquals(requestBody, receivedBody);
+ assertEquals(requestBody, receivedBody);
handler.closeStream();
Thread.sleep(1000);
- Assertions.assertTrue(serverHandler.closed);
+ assertTrue(serverHandler.closed);
client.stop();
server.stop();
diff --git a/scuttlebutt-rpc/src/integration-test/java/org/apache/tuweni/scuttlebutt/rpc/PatchworkIntegrationTest.java b/scuttlebutt-rpc/src/integration-test/java/org/apache/tuweni/scuttlebutt/rpc/PatchworkIntegrationTest.java
index a8c0ad5..e58ee6b 100644
--- a/scuttlebutt-rpc/src/integration-test/java/org/apache/tuweni/scuttlebutt/rpc/PatchworkIntegrationTest.java
+++ b/scuttlebutt-rpc/src/integration-test/java/org/apache/tuweni/scuttlebutt/rpc/PatchworkIntegrationTest.java
@@ -152,10 +152,10 @@ class PatchworkIntegrationTest {
secureScuttlebuttVertxClient.connectTo(port, host, publicKey, MyClientHandler::new);
MyClientHandler clientHandler = (MyClientHandler) onConnect.get();
- Assertions.assertTrue(onConnect.isDone());
- Assertions.assertFalse(onConnect.isCompletedExceptionally());
+ assertTrue(onConnect.isDone());
+ assertFalse(onConnect.isCompletedExceptionally());
Thread.sleep(1000);
- Assertions.assertNotNull(clientHandler);
+ assertNotNull(clientHandler);
// An RPC command that just tells us our public key (like ssb-server whoami on the command line.)
String rpcRequestBody = "{\"name\": [\"whoami\"],\"type\": \"async\",\"args\":[]}";
Bytes rpcRequest = RPCCodec.encodeRequest(rpcRequestBody, RPCFlag.BodyType.JSON);
diff --git a/scuttlebutt-rpc/src/integration-test/java/org/apache/tuweni/scuttlebutt/rpc/mux/PatchworkIntegrationTest.java b/scuttlebutt-rpc/src/integration-test/java/org/apache/tuweni/scuttlebutt/rpc/mux/PatchworkIntegrationTest.java
index 2a71a87..41c892a 100644
--- a/scuttlebutt-rpc/src/integration-test/java/org/apache/tuweni/scuttlebutt/rpc/mux/PatchworkIntegrationTest.java
+++ b/scuttlebutt-rpc/src/integration-test/java/org/apache/tuweni/scuttlebutt/rpc/mux/PatchworkIntegrationTest.java
@@ -68,7 +68,7 @@ public class PatchworkIntegrationTest {
AsyncResult<List<RPCResponse>> allResults = AsyncResult.combine(results);
List<RPCResponse> rpcMessages = allResults.get();
- Assertions.assertEquals(10, rpcMessages.size());
+ assertEquals(10, rpcMessages.size());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org