diff --git a/src/test/java/net/spy/memcached/protocol/ascii/BaseOpTest.java b/src/test/java/net/spy/memcached/protocol/ascii/BaseOpTest.java index 573eed337..e720a65e1 100644 --- a/src/test/java/net/spy/memcached/protocol/ascii/BaseOpTest.java +++ b/src/test/java/net/spy/memcached/protocol/ascii/BaseOpTest.java @@ -27,44 +27,62 @@ import net.spy.memcached.compat.BaseMockCase; +import static org.junit.Assert.assertNotEquals; + /** * Test the basic operation buffer handling stuff. */ public class BaseOpTest extends BaseMockCase { public void testAssertions() { + String message = "Assertions are not enabled."; + AssertionError error = null; try { assert false; - fail("Assertions are not enabled."); + fail(message); } catch (AssertionError e) { - // OK + error = e; } + assertNotNull(error); + assertNotEquals(error.getMessage(), message); } - public void testDataReadType() throws Exception { + public void testDataReadType() { + String message = "Handled a line in data mode"; + AssertionError error = null; + SimpleOp op = new SimpleOp(OperationReadType.DATA); assertSame(OperationReadType.DATA, op.getReadType()); // Make sure lines aren't handled try { op.handleLine("x"); - fail("Handled a line in data mode"); + fail(message); } catch (AssertionError e) { - // ok + error = e; } + assertNotNull(error); + assertNotEquals(error.getMessage(), message); + op.setBytesToRead(2); op.handleRead(ByteBuffer.wrap("hi".getBytes())); } - public void testLineReadType() throws Exception { + public void testLineReadType() { + String message = "Handled data in line mode"; + AssertionError error = null; + SimpleOp op = new SimpleOp(OperationReadType.LINE); assertSame(OperationReadType.LINE, op.getReadType()); // Make sure lines aren't handled try { op.handleRead(ByteBuffer.allocate(3)); - fail("Handled data in line mode"); + fail(message); } catch (AssertionError e) { - // ok + error = e; } + assertNotNull(error); + assertNotEquals(error.getMessage(), message); + op.handleLine("x"); }