Skip to content

Commit

Permalink
tests restored
Browse files Browse the repository at this point in the history
  • Loading branch information
@ceki
ceki committed May 3, 2013
1 parent 5927d20 commit f3bc798
Show file tree
Hide file tree
Showing 2 changed files with 121 additions and 122 deletions.
120 changes: 60 additions & 60 deletions ...ack-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverTest.java
View file
Expand Up @@ -40,65 +40,65 @@
*/
public class ServerSocketReceiverTest {

// private MockContext context = new MockContext();
//
// private MockServerRunner<RemoteAppenderClient> runner =
// new MockServerRunner<RemoteAppenderClient>();
//
// private MockServerListener listener = new MockServerListenerRemoteAppenderClient();
//
// private ServerSocket serverSocket;
// private InstrumentedServerSocketReceiver receiver;
//
// @Before
// public void setUp() throws Exception {
// serverSocket = ServerSocketUtil.createServerSocket();
// receiver = new InstrumentedServerSocketReceiver(serverSocket, listener, runner);
// receiver.setContext(context);
// }
//
// @After
// public void tearDown() throws Exception {
// serverSocket.close();
// }
//
// @Test
// public void testStartStop() throws Exception {
// receiver.start();
// assertTrue(runner.isContextInjected());
// assertTrue(runner.isRunning());
// assertSame(listener, receiver.getLastListener());
//
// receiver.stop();
// assertFalse(runner.isRunning());
// }
//
// @Test
// public void testStartWhenAlreadyStarted() throws Exception {
// receiver.start();
// receiver.start();
// assertEquals(1, runner.getStartCount());
// }
//
// @Test
// public void testStopThrowsException() throws Exception {
// receiver.start();
// assertTrue(receiver.isStarted());
// IOException ex = new IOException("test exception");
// runner.setStopException(ex);
// receiver.stop();
//
// Status status = context.getLastStatus();
// assertNotNull(status);
// assertTrue(status instanceof ErrorStatus);
// assertTrue(status.getMessage().contains(ex.getMessage()));
// assertSame(ex, status.getThrowable());
// }
//
// @Test
// public void testStopWhenNotStarted() throws Exception {
// receiver.stop();
// assertEquals(0, runner.getStartCount());
// }
private MockContext context = new MockContext();

private MockServerRunner<RemoteAppenderClient> runner =
new MockServerRunner<RemoteAppenderClient>();

private MockServerListener listener = new MockServerListener();

private ServerSocket serverSocket;
private InstrumentedServerSocketReceiver receiver;

@Before
public void setUp() throws Exception {
serverSocket = ServerSocketUtil.createServerSocket();
receiver = new InstrumentedServerSocketReceiver(serverSocket, listener, runner);
receiver.setContext(context);
}

@After
public void tearDown() throws Exception {
serverSocket.close();
}

@Test
public void testStartStop() throws Exception {
receiver.start();
assertTrue(runner.isContextInjected());
assertTrue(runner.isRunning());
assertSame(listener, receiver.getLastListener());

receiver.stop();
assertFalse(runner.isRunning());
}

@Test
public void testStartWhenAlreadyStarted() throws Exception {
receiver.start();
receiver.start();
assertEquals(1, runner.getStartCount());
}

@Test
public void testStopThrowsException() throws Exception {
receiver.start();
assertTrue(receiver.isStarted());
IOException ex = new IOException("test exception");
runner.setStopException(ex);
receiver.stop();

Status status = context.getLastStatus();
assertNotNull(status);
assertTrue(status instanceof ErrorStatus);
assertTrue(status.getMessage().contains(ex.getMessage()));
assertSame(ex, status.getThrowable());
}

@Test
public void testStopWhenNotStarted() throws Exception {
receiver.stop();
assertEquals(0, runner.getStartCount());
}

}
123 changes: 61 additions & 62 deletions ...k-core/src/test/java/ch/qos/logback/core/net/server/AbstractServerSocketAppenderTest.java
View file
Expand Up @@ -37,67 +37,66 @@
*/
public class AbstractServerSocketAppenderTest {

//
// private MockContext context = new MockContext();
//
// private MockServerRunner<RemoteReceiverClient> runner =
// new MockServerRunner<RemoteReceiverClient>();
//
// private MockServerListener<RemoteReceiverClient> listener =
// new MockServerListener<RemoteReceiverClient>();
//
// private ServerSocket serverSocket;
// private InstrumentedServerSocketAppenderBase appender;
//
// @Before
// public void setUp() throws Exception {
// serverSocket = ServerSocketUtil.createServerSocket();
// appender = new InstrumentedServerSocketAppenderBase(serverSocket, listener, runner);
// appender.setContext(context);
// }
//
// @After
// public void tearDown() throws Exception {
// serverSocket.close();
// }
//
// @Test
// public void testStartStop() throws Exception {
// appender.start();
// assertTrue(runner.isContextInjected());
// assertTrue(runner.isRunning());
// assertSame(listener, appender.getLastListener());
//
// appender.stop();
// assertFalse(runner.isRunning());
// }
//
// @Test
// public void testStartWhenAlreadyStarted() throws Exception {
// appender.start();
// appender.start();
// assertEquals(1, runner.getStartCount());
// }
//
// @Test
// public void testStopThrowsException() throws Exception {
// appender.start();
// assertTrue(appender.isStarted());
// IOException ex = new IOException("test exception");
// runner.setStopException(ex);
// appender.stop();
//
// Status status = context.getLastStatus();
// assertNotNull(status);
// assertTrue(status instanceof ErrorStatus);
// assertTrue(status.getMessage().contains(ex.getMessage()));
// assertSame(ex, status.getThrowable());
// }
//
// @Test
// public void testStopWhenNotStarted() throws Exception {
// appender.stop();
// assertEquals(0, runner.getStartCount());
// }

private MockContext context = new MockContext();

private MockServerRunner<RemoteReceiverClient> runner =
new MockServerRunner<RemoteReceiverClient>();

private MockServerListener listener = new MockServerListener();

private ServerSocket serverSocket;
private InstrumentedServerSocketAppenderBase appender;

@Before
public void setUp() throws Exception {
serverSocket = ServerSocketUtil.createServerSocket();
appender = new InstrumentedServerSocketAppenderBase(serverSocket, listener, runner);
appender.setContext(context);
}

@After
public void tearDown() throws Exception {
serverSocket.close();
}

@Test
public void testStartStop() throws Exception {
appender.start();
assertTrue(runner.isContextInjected());
assertTrue(runner.isRunning());
assertSame(listener, appender.getLastListener());

appender.stop();
assertFalse(runner.isRunning());
}

@Test
public void testStartWhenAlreadyStarted() throws Exception {
appender.start();
appender.start();
assertEquals(1, runner.getStartCount());
}

@Test
public void testStopThrowsException() throws Exception {
appender.start();
assertTrue(appender.isStarted());
IOException ex = new IOException("test exception");
runner.setStopException(ex);
appender.stop();

Status status = context.getLastStatus();
assertNotNull(status);
assertTrue(status instanceof ErrorStatus);
assertTrue(status.getMessage().contains(ex.getMessage()));
assertSame(ex, status.getThrowable());
}

@Test
public void testStopWhenNotStarted() throws Exception {
appender.stop();
assertEquals(0, runner.getStartCount());
}

}

0 comments on commit f3bc798

Please sign in to comment.