Start separating transport

socketIO_client/tests/__init__.py

@@ -6,11 +6,19 @@ from .. import SocketIO, LoggingSocketIONamespace, find_callback
 
 HOST = 'localhost'
 PORT = 8000
+DATA = 'xxx'
+PAYLOAD = {'xxx': 'yyy'}
 logging.basicConfig(level=logging.DEBUG)
 
 
 class BaseMixin(object):
 
+    def setUp(self):
+        self.called_on_response = False
+
+    def tearDown(self):
+        del self.socketIO
+
     def test_emit(self):
         'Emit'
         namespace = self.socketIO.define(Namespace)
@@ -20,6 +28,84 @@ class BaseMixin(object):
             'emit_response': (),
         })
 
+    def test_emit_with_payload(self):
+        'Emit with payload'
+        namespace = self.socketIO.define(Namespace)
+        self.socketIO.emit('emit_with_payload', PAYLOAD)
+        self.socketIO.wait(self.wait_time_in_seconds)
+        self.assertEqual(namespace.args_by_event, {
+            'emit_with_payload_response': (PAYLOAD,),
+        })
+
+    def test_emit_with_multiple_payloads(self):
+        'Emit with multiple payloads'
+        namespace = self.socketIO.define(Namespace)
+        self.socketIO.emit('emit_with_multiple_payloads', PAYLOAD, PAYLOAD)
+        self.socketIO.wait(self.wait_time_in_seconds)
+        self.assertEqual(namespace.args_by_event, {
+            'emit_with_multiple_payloads_response': (PAYLOAD, PAYLOAD),
+        })
+
+    def test_emit_with_callback(self):
+        'Emit with callback'
+        self.socketIO.define(LoggingSocketIONamespace)
+        self.socketIO.emit('emit_with_callback', self.on_response)
+        self.socketIO.wait_for_callbacks(seconds=self.wait_time_in_seconds)
+        self.assertTrue(self.called_on_response)
+
+    def test_emit_with_callback_with_payload(self):
+        'Emit with callback with payload'
+        self.socketIO.define(LoggingSocketIONamespace)
+        self.socketIO.emit(
+            'emit_with_callback_with_payload', self.on_response)
+        self.socketIO.wait_for_callbacks(seconds=self.wait_time_in_seconds)
+        self.assertTrue(self.called_on_response)
+
+    def test_emit_with_callback_with_multiple_payloads(self):
+        'Emit with callback with multiple payloads'
+        self.socketIO.define(LoggingSocketIONamespace)
+        self.socketIO.emit(
+            'emit_with_callback_with_multiple_payloads', self.on_response)
+        self.socketIO.wait_for_callbacks(seconds=self.wait_time_in_seconds)
+        self.assertTrue(self.called_on_response)
+
+    def test_emit_with_event(self):
+        'Emit to trigger an event'
+        self.socketIO.on('emit_with_event_response', self.on_response)
+        self.socketIO.emit('emit_with_event', PAYLOAD)
+        self.socketIO.wait(self.wait_time_in_seconds)
+        self.assertTrue(self.called_on_response)
+
+    def test_send(self):
+        'Send'
+        namespace = self.socketIO.define(Namespace)
+        self.socketIO.send()
+        self.socketIO.wait(self.wait_time_in_seconds)
+        self.assertEqual(namespace.response, 'message_response')
+
+    def test_send_with_data(self):
+        'Send with data'
+        namespace = self.socketIO.define(Namespace)
+        self.socketIO.send(DATA)
+        self.socketIO.wait(self.wait_time_in_seconds)
+        self.assertEqual(namespace.response, DATA)
+
+    def on_response(self, *args):
+        for arg in args:
+            if isinstance(arg, dict):
+                self.assertEqual(arg, PAYLOAD)
+            else:
+                self.assertEqual(arg, DATA)
+        self.called_on_response = True
+
+
+# class Test_WebsocketTransport(TestCase, BaseMixin):
+
+    # def setUp(self):
+        # super(Test_WebsocketTransport, self).setUp()
+        # self.socketIO = SocketIO(HOST, PORT, transports=['websocket'])
+        # self.wait_time_in_seconds = 0.1
+
 
 class Test_XHR_PollingTransport(TestCase, BaseMixin):
 
@@ -32,10 +118,21 @@ class Test_XHR_PollingTransport(TestCase, BaseMixin):
 class Namespace(LoggingSocketIONamespace):
 
     def initialize(self):
+        self.called_on_disconnect = False
         self.args_by_event = {}
+        self.response = None
+
+    def on_disconnect(self):
+        self.called_on_disconnect = True
+
+    def on_wait_with_disconnect_response(self):
+        self.disconnect()
 
     def on_event(self, event, *args):
         callback, args = find_callback(args)
         if callback:
             callback(*args)
         self.args_by_event[event] = args
+
+    def on_message(self, data):
+        self.response = data

socketIO_client/tests/index.html

@@ -1,4 +1,25 @@
 <script src="/socket.io/socket.io.js"></script>
 <script>
 var socket = io('http://localhost');
+var chat = io('/chat');
+var news = io('/news');
+
+socket.on('server_expects_callback', function(payload, fn) {fn(payload)});
+socket.emit('trigger_server_expects_callback', 'whee');
+socket.emit('emit');
+socket.emit('emit_with_payload');
+socket.emit('emit_with_multiple_payloads', 'aaa', 'bbb');
+socket.emit('emit_with_callback', function() {console.log('whee')});
+socket.emit('emit_with_callback_with_payload', function(x) {console.log('whee ' + x)});
+socket.emit('emit_with_callback_with_multiple_payloads', function(x, y) {console.log('whee ' + x + ' ' + y)});
+socket.emit('emit_with_event');
+socket.emit('aaa');
+
+chat.on('server_expects_callback', function(payload, fn) {fn(payload)});
+chat.emit('trigger_server_expects_callback', 'whee');
+chat.emit('emit_with_payload');
+chat.emit('aaa');
+
+news.emit('emit_with_payload');
+news.emit('aaa');
 </script>

socketIO_client/tests/proxy.js

@@ -1,5 +1,8 @@
 var proxy = require('http-proxy').createProxyServer({
   target: {host: 'localhost', port: 9000}
+}).on('error', function(err, req, res) {
+  console.log('[ERROR] %s', err);
+  res.end();
 });
 var server = require('http').createServer(function(req, res) {
   console.log('[REQUEST.%s] %s', req.method, req.url);

socketIO_client/tests/serve.js

@@ -43,9 +43,9 @@ io.on('connection', function(socket) {
   socket.on('emit_with_event', function(payload) {
     socket.emit('emit_with_event_response', payload);
   });
-  socket.on('ack', function(payload) {
-    socket.emit('ack_response', payload, function(payload) {
-      socket.emit('ack_callback_response', payload);
+  socket.on('trigger_server_expects_callback', function(payload) {
+    socket.emit('server_expects_callback', payload, function(payload) {
+      socket.emit('server_received_callback', payload);
     });
   });
   socket.on('aaa', function() {
@@ -66,9 +66,9 @@ io.of('/chat').on('connection', function(socket) {
   socket.on('aaa', function() {
     socket.emit('aaa_response', 'in chat');
   });
-  socket.on('ack', function(payload) {
-    socket.emit('ack_response', payload, function(payload) {
-      socket.emit('ack_callback_response', payload);
+  socket.on('trigger_server_expects_callback', function(payload) {
+    socket.emit('server_expects_callback', payload, function(payload) {
+      socket.emit('server_received_callback', payload);
     });
   });
 });