From f25037447d49860bc76e88c5bcaa792a1f164bae Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 21 May 2020 14:11:30 +0000
Subject: [PATCH] unit test tweaks
---
.../junit/net/i2p/router/client/LocalClientManager.java | 2 +-
.../test/junit/net/i2p/router/{ => transport}/SSUDemo.java | 6 ++++--
.../java/test/junit/net/i2p/router/tunnel/OutboundTest.java | 4 ++++
3 files changed, 9 insertions(+), 3 deletions(-)
rename router/java/test/junit/net/i2p/router/{ => transport}/SSUDemo.java (98%)
diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
index 5c230c34a1..e8fbd8f225 100644
--- a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
+++ b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
@@ -76,7 +76,7 @@ class LocalClientManager extends ClientManager {
if (jitter > 0)
delay += (int) (jitter * _ctx.random().nextGaussian());
if (delay > 0) {
- System.out.println("Message " + msgId + " DELAYED " + delay + " ms");
+ //System.out.println("Message " + msgId + " DELAYED " + delay + " ms");
DelayedSend ds = new DelayedSend(_ctx, sender, runner, fromDest, toDest, payload, msgId, messageNonce);
ds.schedule(delay);
return;
diff --git a/router/java/test/junit/net/i2p/router/SSUDemo.java b/router/java/test/junit/net/i2p/router/transport/SSUDemo.java
similarity index 98%
rename from router/java/test/junit/net/i2p/router/SSUDemo.java
rename to router/java/test/junit/net/i2p/router/transport/SSUDemo.java
index 485529d229..534d6457c1 100644
--- a/router/java/test/junit/net/i2p/router/SSUDemo.java
+++ b/router/java/test/junit/net/i2p/router/transport/SSUDemo.java
@@ -28,6 +28,7 @@ public class SSUDemo {
public static void main(String args[]) {
boolean testNTCP = args.length > 0 && args[0].equals("ntcp");
+ System.out.println("Testing " + (testNTCP ? "NTCP" : "SSU"));
SSUDemo demo = new SSUDemo();
demo.run(testNTCP);
}
@@ -38,10 +39,12 @@ public class SSUDemo {
String cfgFile = "router.config";
Properties envProps = getEnv(testNTCP);
Router r = new Router(cfgFile, envProps);
+ System.out.println("Starting router...");
r.runRouter();
_us = r.getContext();
setupHandlers();
// wait for it to warm up a bit
+ System.out.println("30 second warmup...");
try { Thread.sleep(30*1000); } catch (InterruptedException ie) {}
// now write out our ident and info
RouterInfo myInfo = _us.router().getRouterInfo();
@@ -60,8 +63,7 @@ public class SSUDemo {
else
envProps.setProperty("i2np.ntcp.enable", "false");
envProps.setProperty("i2np.upnp.enable", "false");
- // we want SNTP synchronization for replay prevention
- envProps.setProperty("time.disabled", "false");
+ envProps.setProperty("time.disabled", "true");
// allow 127.0.0.1/10.0.0.1/etc (useful for testing). If this is false,
// peers who say they're on an invalid IP are banlisted
envProps.setProperty("i2np.allowLocal", "true");
diff --git a/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java b/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java
index 0c3139eba4..f352d2e337 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java
@@ -46,6 +46,10 @@ public class OutboundTest extends TestCase{
}
boolean eq = DataHelper.eq(orig, 16, message, 16, orig.length - 16);
+ if (!eq) {
+ System.out.println("Orig:\n" + net.i2p.util.HexDump.dump(orig, 16, orig.length - 16));
+ System.out.println("Rcvd:\n" + net.i2p.util.HexDump.dump(message, 16, orig.length - 16));
+ }
assertTrue(eq);
}
--
GitLab