Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaning up tests

This commit is contained in:
Joakim Erdfelt 2013-12-13 09:54:19 -07:00
parent 5bbdbadec7
commit 5c296c99d8
3 changed files with 33 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/LogShush.java
View File

@ -1,36 +0,0 @@
//
// ========================================================================
// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.common;
import org.eclipse.jetty.util.log.StdErrLog;
public class LogShush
{
public static void disableStacks(Class<?> clazz)
{
StdErrLog log = StdErrLog.getLogger(clazz);
log.setHideStacks(true);
}
public static void enableStacks(Class<?> clazz)
{
StdErrLog log = StdErrLog.getLogger(clazz);
log.setHideStacks(false);
}
}

2
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase3.java
View File

@ -89,6 +89,4 @@ public class TestABCase3
{
UnitGenerator.generate(invalidFrame);
}
}

64
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase4.java
View File

@ -20,36 +20,22 @@ package org.eclipse.jetty.websocket.common.ab;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.log.StacklessLogging;
import org.eclipse.jetty.websocket.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.common.IncomingFramesCapture;
import org.eclipse.jetty.websocket.common.LogShush;
import org.eclipse.jetty.websocket.common.Parser;
import org.eclipse.jetty.websocket.common.UnitParser;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
public class TestABCase4
{
@BeforeClass
public static void disableParserStacks()
{
LogShush.disableStacks(Parser.class);
}
@AfterClass
public static void enableParserStacks()
{
LogShush.enableStacks(Parser.class);
}
private WebSocketPolicy policy = new WebSocketPolicy(WebSocketBehavior.CLIENT);
@Test
public void testParserControlOpCode11Case4_2_1()
public void testParserControlOpCode11Case4_2_1() throws Exception
{
ByteBuffer expected = ByteBuffer.allocate(32);
@ -58,10 +44,14 @@ public class TestABCase4
expected.flip();
Parser parser = new UnitParser(policy);
IncomingFramesCapture capture = new IncomingFramesCapture();
parser.setIncomingFramesHandler(capture);
parser.parse(expected);
try (StacklessLogging logging = new StacklessLogging(Parser.class))
{
Parser parser = new UnitParser(policy);
parser.setIncomingFramesHandler(capture);
parser.parse(expected);
}
Assert.assertEquals( "error on undefined opcode", 1, capture.getErrorCount(WebSocketException.class)) ;
@ -71,7 +61,7 @@ public class TestABCase4
}
@Test
public void testParserControlOpCode12WithPayloadCase4_2_2()
public void testParserControlOpCode12WithPayloadCase4_2_2() throws Exception
{
ByteBuffer expected = ByteBuffer.allocate(32);
@ -80,10 +70,14 @@ public class TestABCase4
expected.flip();
Parser parser = new UnitParser(policy);
IncomingFramesCapture capture = new IncomingFramesCapture();
parser.setIncomingFramesHandler(capture);
parser.parse(expected);
try (StacklessLogging logging = new StacklessLogging(Parser.class))
{
Parser parser = new UnitParser(policy);
parser.setIncomingFramesHandler(capture);
parser.parse(expected);
}
Assert.assertEquals( "error on undefined opcode", 1, capture.getErrorCount(WebSocketException.class)) ;
@ -94,7 +88,7 @@ public class TestABCase4
@Test
public void testParserNonControlOpCode3Case4_1_1()
public void testParserNonControlOpCode3Case4_1_1() throws Exception
{
ByteBuffer expected = ByteBuffer.allocate(32);
@ -103,10 +97,14 @@ public class TestABCase4
expected.flip();
Parser parser = new UnitParser(policy);
IncomingFramesCapture capture = new IncomingFramesCapture();
parser.setIncomingFramesHandler(capture);
parser.parse(expected);
try (StacklessLogging logging = new StacklessLogging(Parser.class))
{
Parser parser = new UnitParser(policy);
parser.setIncomingFramesHandler(capture);
parser.parse(expected);
}
Assert.assertEquals( "error on undefined opcode", 1, capture.getErrorCount(WebSocketException.class)) ;
@ -116,7 +114,7 @@ public class TestABCase4
}
@Test
public void testParserNonControlOpCode4WithPayloadCase4_1_2()
public void testParserNonControlOpCode4WithPayloadCase4_1_2() throws Exception
{
ByteBuffer expected = ByteBuffer.allocate(32);
@ -125,10 +123,14 @@ public class TestABCase4
expected.flip();
Parser parser = new UnitParser(policy);
IncomingFramesCapture capture = new IncomingFramesCapture();
parser.setIncomingFramesHandler(capture);
parser.parse(expected);
try (StacklessLogging logging = new StacklessLogging(Parser.class))
{
Parser parser = new UnitParser(policy);
parser.setIncomingFramesHandler(capture);
parser.parse(expected);
}
Assert.assertEquals( "error on undefined opcode", 1, capture.getErrorCount(WebSocketException.class)) ;