From 3d39d0a916114b5ba29c2b9e89b80310048df3bb Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 10 Jul 2012 12:20:40 -0700
Subject: [PATCH] Updating tests for WebSocketFrame

---
 .../jetty/websocket/ab/TestABCase3.java       | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase3.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase3.java
index e1d26662ce6..df8a7b6507c 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase3.java
+++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase3.java
@@ -5,9 +5,9 @@ import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.jetty.websocket.api.ProtocolException;
-import org.eclipse.jetty.websocket.api.WebSocketPolicy;
 import org.eclipse.jetty.websocket.generator.Generator;
-import org.eclipse.jetty.websocket.protocol.FrameBuilder;
+import org.eclipse.jetty.websocket.protocol.CloseInfo;
+import org.eclipse.jetty.websocket.protocol.UnitGenerator;
 import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,29 +24,29 @@ public class TestABCase3
         List<WebSocketFrame[]> data = new ArrayList<>();
         // @formatter:off
         data.add(new WebSocketFrame[]
-                { FrameBuilder.ping().fin(false).asFrame() });
+                { WebSocketFrame.ping().setFin(false) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.ping().rsv1(true).asFrame() });
+                { WebSocketFrame.ping().setRsv1(true) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.ping().rsv2(true).asFrame() });
+                { WebSocketFrame.ping().setRsv2(true) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.ping().rsv3(true).asFrame() });
+                { WebSocketFrame.ping().setRsv3(true) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.pong().fin(false).asFrame() });
+                { WebSocketFrame.pong().setFin(false) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.ping().rsv1(true).asFrame() });
+                { WebSocketFrame.ping().setRsv1(true) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.pong().rsv2(true).asFrame() });
+                { WebSocketFrame.pong().setRsv2(true) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.pong().rsv3(true).asFrame() });
+                { WebSocketFrame.pong().setRsv3(true) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.close().fin(false).asFrame() });
+                { new CloseInfo().asFrame().setFin(false) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.close().rsv1(true).asFrame() });
+                { new CloseInfo().asFrame().setRsv1(true) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.close().rsv2(true).asFrame() });
+                { new CloseInfo().asFrame().setRsv2(true) });
         data.add(new WebSocketFrame[]
-                { FrameBuilder.close().rsv3(true).asFrame() });
+                { new CloseInfo().asFrame().setRsv3(true) });
         // @formatter:on
         return data;
     }
@@ -61,7 +61,7 @@ public class TestABCase3
     @Test(expected = ProtocolException.class)
     public void testGenerateInvalidControlFrame()
     {
-        Generator generator = new Generator(WebSocketPolicy.newServerPolicy());
+        Generator generator = new UnitGenerator();
 
         generator.generate(invalidFrame);
     }