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

More junit5 test fixes 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2018-09-12 16:55:01 -05:00
parent 79460a7cdb
commit 59a9a0114a
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/AbstractLocalServerCase.java
View File

@ -43,10 +43,8 @@ import org.eclipse.jetty.websocket.tests.DataUtils;
import org.eclipse.jetty.websocket.tests.SimpleServletServer;
import org.eclipse.jetty.websocket.tests.UnitGenerator;
import org.eclipse.jetty.websocket.tests.servlets.EchoServlet;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.TestName;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
/**
* Testing against local websocket server using {@link org.eclipse.jetty.server.LocalConnector}
@ -68,8 +66,6 @@ public abstract class AbstractLocalServerCase
protected static SimpleServletServer server;
protected final Logger LOG;
@Rule
public TestName testname = new TestName();
public UnitGenerator generator = new UnitGenerator(WebSocketPolicy.newClientPolicy());
public AbstractLocalServerCase()
@ -77,14 +73,14 @@ public abstract class AbstractLocalServerCase
LOG = Log.getLogger(this.getClass().getName());
}
@BeforeClass
@BeforeAll
public static void startServer() throws Exception
{
server = new SimpleServletServer(new EchoServlet());
server.start();
}
@AfterClass
@AfterAll
public static void stopServer() throws Exception
{
server.stop();

2
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/BinaryTest.java
View File

@ -30,7 +30,7 @@ import org.eclipse.jetty.websocket.common.WebSocketFrame;
import org.eclipse.jetty.websocket.common.frames.BinaryFrame;
import org.eclipse.jetty.websocket.tests.DataUtils;
import org.eclipse.jetty.websocket.tests.LocalFuzzer;
import org.junit.Test;
import org.junit.jupiter.api.Test;
/**
* Binary message / frame tests