- more test code

- tiny typo in doc string

2 files changed, 20 insertions, 9 deletions

diff --git a/test_websocket.py b/test_websocket.py
index 8143efc..7fe1fcd 100644
--- a/test_websocket.py
+++ b/test_websocket.py
@@ -4,6 +4,8 @@
 import unittest
 import websocket as ws
 
+TRACABLE=False
+
 class StringSockMock:
     def __init__(self):
         self.set_data("")
@@ -33,7 +35,7 @@ class HeaderSockMock(StringSockMock):
 
 class WebSocketTest(unittest.TestCase):
     def setUp(self):
-        ws.enableTrace(True)
+        ws.enableTrace(TRACABLE)
     
     def tearDown(self):
         pass
@@ -180,6 +182,9 @@ class WebSocketTest(unittest.TestCase):
         s.send("Hello, World")
         result = s.recv()
         self.assertEquals(result, "Hello, World")
+        s.send("こにゃにゃちは、世界")
+        result = s.recv()
+        self.assertEquals(result, "こにゃにゃちは、世界")
         s.close()
 
     def testSecureWebsocket(self):
@@ -188,6 +193,9 @@ class WebSocketTest(unittest.TestCase):
         s.send("Hello, World")
         result = s.recv()
         self.assertEquals(result, "Hello, World")
+        s.send("こにゃにゃちは、世界")
+        result = s.recv()
+        self.assertEquals(result, "こにゃにゃちは、世界")
         s.close()
 
     def testWebSocketWihtCustomHeader(self):
@@ -198,6 +206,15 @@ class WebSocketTest(unittest.TestCase):
         result = s.recv()
         self.assertEquals(result, "Hello, World")
         s.close()
+
+    def testAfterClose(self):
+        from socket import error
+        s  = ws.create_connection("ws://echo.websocket.org/")
+        self.assertNotEquals(s, None)
+        s.close()
+        self.assertRaises(error, s.send, "Hello")
+        self.assertRaises(error, s.recv)
+        
         
 
 if __name__ == "__main__":
diff --git a/websocket.py b/websocket.py
index e5f550a..a1adccd 100644
--- a/websocket.py
+++ b/websocket.py
@@ -173,7 +173,7 @@ class WebSocket(object):
 
     >>> import websocket
     >>> ws = websocket.WebSocket()
-    >>> ws.Connect("ws://echo.websocket.org")
+    >>> ws.connect("ws://echo.websocket.org")
     >>> ws.send("Hello, Server")
     >>> ws.recv()
     'Hello, Server'
@@ -363,7 +363,7 @@ class WebSocket(object):
             bytes = self._recv_strict(length)
             return bytes
         elif frame_type == 0xff:
-            n = self._recv(1)
+            self._recv(1)
             self._closeInternal()
             return None
         else:
@@ -505,7 +505,6 @@ class WebSocketApp(object):
 
 if __name__ == "__main__":
     enableTrace(True)
-    #ws = create_connection("ws://localhost:8080/echo")
     ws = create_connection("ws://echo.websocket.org/")
     print "Sending 'Hello, World'..."
     ws.send("Hello, World")
@@ -514,8 +513,3 @@ if __name__ == "__main__":
     result =  ws.recv()
     print "Received '%s'" % result
     ws.close()
-        
-
-
-
-