From dd24ab6f70f1489a2f86898d86117961b29a5c8e Mon Sep 17 00:00:00 2001 From: str4d Date: Fri, 4 Jan 2013 00:07:15 +0000 Subject: [PATCH] Create a new RouterContext for net.i2p.router.tunnel tests (can't cast I2PAppContext) --- router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java | 3 +-- .../test/junit/net/i2p/router/tunnel/InboundGatewayTest.java | 3 +-- router/java/test/junit/net/i2p/router/tunnel/InboundTest.java | 2 +- .../test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java | 2 +- router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java b/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java index a214db4ffe..6822e358af 100644 --- a/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java +++ b/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java @@ -11,7 +11,6 @@ package net.i2p.router.tunnel; import java.util.ArrayList; import junit.framework.TestCase; -import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.TunnelId; @@ -28,7 +27,7 @@ public class FragmentTest extends TestCase{ protected RouterContext _context; public void setUp() { - _context = (RouterContext) I2PAppContext.getGlobalContext(); + _context = new RouterContext(null); _context.random().nextBoolean(); FragmentHandler.MAX_DEFRAGMENT_TIME = 10*1000; } diff --git a/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java b/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java index 309740f191..087e0ef496 100644 --- a/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java +++ b/router/java/test/junit/net/i2p/router/tunnel/InboundGatewayTest.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.List; import junit.framework.TestCase; -import net.i2p.I2PAppContext; import net.i2p.data.Hash; import net.i2p.data.TunnelId; import net.i2p.data.i2np.DataMessage; @@ -34,7 +33,7 @@ public class InboundGatewayTest extends TestCase{ private TunnelGateway _gw; public void setUp() { - _context = (RouterContext) I2PAppContext.getGlobalContext(); + _context = new RouterContext(null); _config = prepareConfig(8); _preprocessor = new TrivialPreprocessor(_context); _sender = new InboundSender(_context, _config.getConfig(0)); diff --git a/router/java/test/junit/net/i2p/router/tunnel/InboundTest.java b/router/java/test/junit/net/i2p/router/tunnel/InboundTest.java index ded01a9496..b6f60b38f8 100644 --- a/router/java/test/junit/net/i2p/router/tunnel/InboundTest.java +++ b/router/java/test/junit/net/i2p/router/tunnel/InboundTest.java @@ -23,7 +23,7 @@ public class InboundTest extends TestCase{ private RouterContext _context; public void setUp() { - _context = (RouterContext) I2PAppContext.getGlobalContext(); + _context = new RouterContext(null); } public void testInbound() { diff --git a/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java b/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java index 208a6ba9a1..7a4dbbc912 100644 --- a/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java +++ b/router/java/test/junit/net/i2p/router/tunnel/OutboundGatewayTest.java @@ -32,7 +32,7 @@ public class OutboundGatewayTest extends TestCase{ private TunnelGateway _gw; public void setUp() { - _context = (RouterContext) I2PAppContext.getGlobalContext(); + _context = new RouterContext(null); _config = prepareConfig(8); _preprocessor = new TrivialPreprocessor(_context); _sender = new OutboundSender(_context, _config); 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 397e058778..619bab3d86 100644 --- a/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java +++ b/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java @@ -23,7 +23,7 @@ public class OutboundTest extends TestCase{ private RouterContext _context; public void setUp() { - _context = (RouterContext) I2PAppContext.getGlobalContext(); + _context = new RouterContext(null); } public void testOutbound() {