Author: markt
Date: Wed Dec 19 20:04:21 2012
New Revision: 1424068
URL: http://svn.apache.org/viewvc?rev=1424068&view=rev
Log:
Move the WebSocket unit tests to the new package location.
Added:
tomcat/trunk/test/org/apache/tomcat/websocket/TestUtf8.java
- copied, changed from r1424057,
tomcat/trunk/test/org/apache/catalina/websocket/TestUtf8.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocket.java
- copied, changed from r1424057,
tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
Removed:
tomcat/trunk/test/org/apache/catalina/websocket/
Copied: tomcat/trunk/test/org/apache/tomcat/websocket/TestUtf8.java (from
r1424057, tomcat/trunk/test/org/apache/catalina/websocket/TestUtf8.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestUtf8.java?p2=tomcat/trunk/test/org/apache/tomcat/websocket/TestUtf8.java&p1=tomcat/trunk/test/org/apache/catalina/websocket/TestUtf8.java&r1=1424057&r2=1424068&rev=1424068&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/websocket/TestUtf8.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestUtf8.java Wed Dec 19
20:04:21 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.websocket;
+package org.apache.tomcat.websocket;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
@@ -25,6 +25,7 @@ import java.nio.charset.CodingErrorActio
import static org.junit.Assert.fail;
import org.junit.Test;
+import org.apache.catalina.websocket.Utf8Decoder;
import org.apache.tomcat.util.buf.B2CConverter;
public class TestUtf8 {
Copied: tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocket.java (from
r1424057, tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocket.java?p2=tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocket.java&p1=tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java&r1=1424057&r2=1424068&rev=1424068&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocket.java Wed Dec 19
20:04:21 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.websocket;
+package org.apache.tomcat.websocket;
import java.io.BufferedReader;
import java.io.File;
@@ -46,6 +46,11 @@ import org.apache.catalina.deploy.Contex
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.util.Base64;
+import org.apache.catalina.websocket.Constants;
+import org.apache.catalina.websocket.MessageHandler;
+import org.apache.catalina.websocket.StreamHandler;
+import org.apache.catalina.websocket.WebSocketServlet;
+import org.apache.catalina.websocket.WsOutbound;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.C2BConverter;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
