From 45fe23822782adc15f50e355fbc5ae5577374f34 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Mon, 27 Jul 2015 11:50:01 +0000
Subject: [PATCH] Refactor SchedulerDead tests

---
 .../client/streaming/impl/ConnectionTest.java | 34 +++++++++++++++++++
 .../streaming/impl/SchedulerDeadTest.java     | 20 ++++-------
 ...stBase.java => TaskSchedulerTestBase.java} | 16 +++++----
 3 files changed, 51 insertions(+), 19 deletions(-)
 create mode 100644 apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectionTest.java
 rename apps/streaming/java/test/junit/net/i2p/client/streaming/impl/{SchedulerImplTestBase.java => TaskSchedulerTestBase.java} (69%)

diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectionTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectionTest.java
new file mode 100644
index 000000000..d332148e2
--- /dev/null
+++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectionTest.java
@@ -0,0 +1,34 @@
+package net.i2p.client.streaming.impl;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.I2PSession;
+import net.i2p.util.SimpleTimer2;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+public class ConnectionTest {
+
+    @Rule
+    public MockitoRule rule = MockitoJUnit.rule();
+
+    @Mock private ConnectionManager manager;
+    @Mock private I2PSession session;
+    @Mock private SchedulerChooser chooser;
+    @Mock private SimpleTimer2 timer;
+    @Mock private PacketQueue queue;
+    @Mock private ConnectionPacketHandler handler;
+    @Mock private ConnectionOptions opts;
+
+    @Test
+    public void test() {
+        //Connection conn = new Connection(I2PAppContext.getGlobalContext(), manager, session, chooser, timer, queue, handler, opts, false);
+    }
+}
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/SchedulerDeadTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/SchedulerDeadTest.java
index 9189fd479..69eb9181b 100644
--- a/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/SchedulerDeadTest.java
+++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/SchedulerDeadTest.java
@@ -6,19 +6,13 @@ import static org.mockito.Mockito.*;
 import org.junit.Test;
 import org.mockito.Mock;
 
-public class SchedulerDeadTest extends SchedulerImplTestBase {
+public class SchedulerDeadTest extends TaskSchedulerTestBase {
 
-    private SchedulerDead s;
     @Mock private Connection con;
     @Mock private ConnectionOptions opts;
 
-    protected void initScheduler() {
-        s = new SchedulerDead(context);
-    }
-
-    @Test
-    public void testAccept_null() {
-        assertFalse(s.accept(null));
+    protected TaskScheduler createScheduler() {
+        return new SchedulerDead(context);
     }
 
     private void setMocks(int now, int discSchOn, int connTimeout, int lifetime, int sendStreamId) {
@@ -33,24 +27,24 @@ public class SchedulerDeadTest extends SchedulerImplTestBase {
     @Test
     public void testAccept_nothingLeftToDo() {
         setMocks(10*60*1000, 9*60*1000 - Connection.DISCONNECT_TIMEOUT, 0, 0, 0);
-        assertTrue(s.accept(con));
+        assertTrue(scheduler.accept(con));
     }
 
     @Test
     public void testAccept_noDisconnectScheduled() {
         setMocks(10*60*1000, 0, 0, 0, 0);
-        assertFalse(s.accept(con));
+        assertFalse(scheduler.accept(con));
     }
 
     @Test
     public void testAccept_timedOut() {
         setMocks(0, 0, Connection.DISCONNECT_TIMEOUT/2, Connection.DISCONNECT_TIMEOUT, 0);
-        assertTrue(s.accept(con));
+        assertTrue(scheduler.accept(con));
     }
 
     @Test
     public void testEventOccurred() {
-        s.eventOccurred(con);
+        scheduler.eventOccurred(con);
         verify(con).disconnectComplete();
     }
 }
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/SchedulerImplTestBase.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/TaskSchedulerTestBase.java
similarity index 69%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/impl/SchedulerImplTestBase.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/TaskSchedulerTestBase.java
index a52acd9aa..a4222c9f0 100644
--- a/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/SchedulerImplTestBase.java
+++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/TaskSchedulerTestBase.java
@@ -1,7 +1,6 @@
 package net.i2p.client.streaming.impl;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
 import static org.mockito.Mockito.*;
 import net.i2p.I2PAppContext;
 import net.i2p.util.Clock;
@@ -15,7 +14,7 @@ import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-public abstract class SchedulerImplTestBase {
+public abstract class TaskSchedulerTestBase {
 
     @Rule
     public MockitoRule rule = MockitoJUnit.rule();
@@ -24,15 +23,20 @@ public abstract class SchedulerImplTestBase {
     @Mock protected Clock clock;
     @Mock protected SimpleTimer2 timer;
 
-    protected SchedulerDead scheduler;
+    protected TaskScheduler scheduler;
 
     @Before
     public void setUp() {
         when(context.clock()).thenReturn(clock);
         when(context.simpleTimer2()).thenReturn(timer);
 
-        initScheduler();
+        scheduler = createScheduler();
     }
 
-    protected abstract void initScheduler();
+    protected abstract TaskScheduler createScheduler();
+
+    @Test
+    public void testAccept_null() {
+        assertFalse(scheduler.accept(null));
+    }
 }