merge of '9cd70f6c6a5d8100782f92785a0082b09248e6b0'

and 'e6b29f8caf5730bada39b1296ff3eb3b5f363f0e'
This commit is contained in:
kytv
2013-01-04 00:20:03 +00:00
5 changed files with 5 additions and 7 deletions

View File

@ -11,7 +11,6 @@ package net.i2p.router.tunnel;
import java.util.ArrayList; import java.util.ArrayList;
import junit.framework.TestCase; import junit.framework.TestCase;
import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.data.Hash; import net.i2p.data.Hash;
import net.i2p.data.TunnelId; import net.i2p.data.TunnelId;
@ -28,7 +27,7 @@ public class FragmentTest extends TestCase{
protected RouterContext _context; protected RouterContext _context;
public void setUp() { public void setUp() {
_context = (RouterContext) I2PAppContext.getGlobalContext(); _context = new RouterContext(null);
_context.random().nextBoolean(); _context.random().nextBoolean();
FragmentHandler.MAX_DEFRAGMENT_TIME = 10*1000; FragmentHandler.MAX_DEFRAGMENT_TIME = 10*1000;
} }

View File

@ -12,7 +12,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import junit.framework.TestCase; import junit.framework.TestCase;
import net.i2p.I2PAppContext;
import net.i2p.data.Hash; import net.i2p.data.Hash;
import net.i2p.data.TunnelId; import net.i2p.data.TunnelId;
import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.DataMessage;
@ -34,7 +33,7 @@ public class InboundGatewayTest extends TestCase{
private TunnelGateway _gw; private TunnelGateway _gw;
public void setUp() { public void setUp() {
_context = (RouterContext) I2PAppContext.getGlobalContext(); _context = new RouterContext(null);
_config = prepareConfig(8); _config = prepareConfig(8);
_preprocessor = new TrivialPreprocessor(_context); _preprocessor = new TrivialPreprocessor(_context);
_sender = new InboundSender(_context, _config.getConfig(0)); _sender = new InboundSender(_context, _config.getConfig(0));

View File

@ -23,7 +23,7 @@ public class InboundTest extends TestCase{
private RouterContext _context; private RouterContext _context;
public void setUp() { public void setUp() {
_context = (RouterContext) I2PAppContext.getGlobalContext(); _context = new RouterContext(null);
} }
public void testInbound() { public void testInbound() {

View File

@ -32,7 +32,7 @@ public class OutboundGatewayTest extends TestCase{
private TunnelGateway _gw; private TunnelGateway _gw;
public void setUp() { public void setUp() {
_context = (RouterContext) I2PAppContext.getGlobalContext(); _context = new RouterContext(null);
_config = prepareConfig(8); _config = prepareConfig(8);
_preprocessor = new TrivialPreprocessor(_context); _preprocessor = new TrivialPreprocessor(_context);
_sender = new OutboundSender(_context, _config); _sender = new OutboundSender(_context, _config);

View File

@ -23,7 +23,7 @@ public class OutboundTest extends TestCase{
private RouterContext _context; private RouterContext _context;
public void setUp() { public void setUp() {
_context = (RouterContext) I2PAppContext.getGlobalContext(); _context = new RouterContext(null);
} }
public void testOutbound() { public void testOutbound() {