diff options
Diffstat (limited to 'jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase3.java')
-rw-r--r-- | jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase3.java | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase3.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase3.java index c2c13dc0f1..ce6e363170 100644 --- a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase3.java +++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase3.java @@ -25,9 +25,10 @@ import java.util.List; import org.eclipse.jetty.toolchain.test.TestTracker; import org.eclipse.jetty.websocket.api.ProtocolException; import org.eclipse.jetty.websocket.common.CloseInfo; -import org.eclipse.jetty.websocket.common.Generator; import org.eclipse.jetty.websocket.common.UnitGenerator; import org.eclipse.jetty.websocket.common.WebSocketFrame; +import org.eclipse.jetty.websocket.common.frames.PingFrame; +import org.eclipse.jetty.websocket.common.frames.PongFrame; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,21 +47,21 @@ public class TestABCase3 List<WebSocketFrame[]> data = new ArrayList<>(); // @formatter:off data.add(new WebSocketFrame[] - { WebSocketFrame.ping().setFin(false) }); + { new PingFrame().setFin(false) }); data.add(new WebSocketFrame[] - { WebSocketFrame.ping().setRsv1(true) }); + { new PingFrame().setRsv1(true) }); data.add(new WebSocketFrame[] - { WebSocketFrame.ping().setRsv2(true) }); + { new PingFrame().setRsv2(true) }); data.add(new WebSocketFrame[] - { WebSocketFrame.ping().setRsv3(true) }); + { new PingFrame().setRsv3(true) }); data.add(new WebSocketFrame[] - { WebSocketFrame.pong().setFin(false) }); + { new PongFrame().setFin(false) }); data.add(new WebSocketFrame[] - { WebSocketFrame.ping().setRsv1(true) }); + { new PingFrame().setRsv1(true) }); data.add(new WebSocketFrame[] - { WebSocketFrame.pong().setRsv2(true) }); + { new PongFrame().setRsv2(true) }); data.add(new WebSocketFrame[] - { WebSocketFrame.pong().setRsv3(true) }); + { new PongFrame().setRsv3(true) }); data.add(new WebSocketFrame[] { new CloseInfo().asFrame().setFin(false) }); data.add(new WebSocketFrame[] @@ -86,9 +87,7 @@ public class TestABCase3 @Test(expected = ProtocolException.class) public void testGenerateInvalidControlFrame() { - Generator generator = new UnitGenerator(); - - generator.generate(invalidFrame); + UnitGenerator.generate(invalidFrame); } |