Add binary/base64 data mode to perf/playback tests.

35785a90 · Joel Martin · 6f4b1e40 · 35785a90 · 35785a90 · 35785a90
Commit 35785a90 authored Oct 17, 2012 by Joel Martin
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

websock.js include/websock.js +2 -1

vnc_perf.html tests/vnc_perf.html +3 -2

vnc_playback.html tests/vnc_playback.html +3 -2

No files found.
--- a/include/websock.js
+++ b/include/websock.js
@@ -371,8 +371,9 @@ function close() {

 // Override internal functions for testing
 // Takes a send function, returns reference to recv function
-function testMode(override_send) {
+function testMode(override_send, data_mode) {
    test_mode = true;
+    mode = data_mode;
    api.send = override_send;
    api.close = function () {};
    return recv_message;

--- a/tests/vnc_perf.html
+++ b/tests/vnc_perf.html
@@ -2,7 +2,6 @@
 <html>
    <head>
        <title>VNC Performance Benchmark</title>
-        <link rel="stylesheet" href="../include/base.css">
    </head>
    <body>

@@ -38,6 +37,8 @@

    <script type="text/javascript">
        var INCLUDE_URI= "../include/";
+        // TODO: Data file should override
+        var VNC_frame_encoding = "base64";
    </script>
    <script src="../include/util.js"></script>
    <script src="../include/playback.js"></script>
@@ -201,7 +202,7 @@
            }
            rfb = new RFB({'target': $D('VNC_canvas'),
                           'updateState': updateState});
-            rfb.testMode(send_array);
+            rfb.testMode(send_array, VNC_frame_encoding);
        }
    </script>
 </html>
--- a/tests/vnc_playback.html
+++ b/tests/vnc_playback.html
@@ -2,7 +2,6 @@
 <html>
    <head>
        <title>VNC Playback</title>
-        <link rel="stylesheet" href="../include/plain.css">
    </head>
    <body>

@@ -40,6 +39,8 @@

    <script type="text/javascript">
        var INCLUDE_URI= "../include/";
+        // TODO: Data file should override
+        var VNC_frame_encoding = "base64";
    </script>
    <script src="../include/util.js"></script>
    <script src="../include/webutil.js"></script>
@@ -98,7 +99,7 @@
                mode = 'realtime';
            }

-            recv_message = rfb.testMode(send_array);
+            recv_message = rfb.testMode(send_array, VNC_frame_encoding);
            next_iteration();
        }