From f7399dde4475374f3e4b8a12e928c52dc74cdca9 Mon Sep 17 00:00:00 2001
From: Chris Boden <cboden@gmail.com>
Date: Sat, 17 Nov 2012 19:11:30 -0500
Subject: [PATCH] AB test adjustments

Added libev test
Added lone test for quick compliance checking
Added a test w/o UTF-8 checks to show perf
---
 Makefile                                            |  9 ++++++++-
 tests/AutobahnTestSuite/bin/fuzzingserver-libev.php | 12 ++++++++++++
 .../AutobahnTestSuite/bin/fuzzingserver-noutf8.php  | 13 +++++++++++++
 tests/AutobahnTestSuite/fuzzingclient-all.json      |  8 +++++---
 tests/AutobahnTestSuite/fuzzingclient-profile.json  |  2 +-
 tests/AutobahnTestSuite/fuzzingclient-quick.json    | 12 ++++++++++++
 6 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 tests/AutobahnTestSuite/bin/fuzzingserver-libev.php
 create mode 100644 tests/AutobahnTestSuite/bin/fuzzingserver-noutf8.php
 create mode 100644 tests/AutobahnTestSuite/fuzzingclient-quick.json

diff --git a/Makefile b/Makefile
index 20be8ef..e413a9a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,17 @@ cover:
 abtests:
 	ulimit -n 2048 && php tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php &
 	ulimit -n 2048 && php tests/AutobahnTestSuite/bin/fuzzingserver-stream.php &
-	wstest -m testeeserver -w ws://localhost:8002 &
+	ulimit -n 2048 && php tests/AutobahnTestSuite/bin/fuzzingserver-libev.php &
+	ulimit -n 2048 && php tests/AutobahnTestSuite/bin/fuzzingserver-noutf8.php &
+	wstest -m testeeserver -w ws://localhost:8004 &
 	wstest -m fuzzingclient -s tests/AutobahnTestSuite/fuzzingclient-all.json
 	killall php wstest
 
+abtest:
+	ulimit -n 2048 && php tests/AutobahnTestSuite/bin/fuzzingserver-stream.php &
+	wstest -m fuzzingclient -s tests/AutobahnTestSuite/fuzzingclient-quick.json
+	killall php
+
 profile:
 	php -d 'xdebug.profiler_enable=1' tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php &
 	wstest -m fuzzingclient -s tests/AutobahnTestSuite/fuzzingclient-profile.json
diff --git a/tests/AutobahnTestSuite/bin/fuzzingserver-libev.php b/tests/AutobahnTestSuite/bin/fuzzingserver-libev.php
new file mode 100644
index 0000000..8069cd2
--- /dev/null
+++ b/tests/AutobahnTestSuite/bin/fuzzingserver-libev.php
@@ -0,0 +1,12 @@
+<?php
+
+    require dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
+
+    $loop = new React\EventLoop\LibEvLoop;
+    $sock = new React\Socket\Server($loop);
+    $app  = new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer);
+
+    $sock->listen(8002, '0.0.0.0');
+
+    $server = new Ratchet\Server\IoServer($app, $sock, $loop);
+    $server->run();
diff --git a/tests/AutobahnTestSuite/bin/fuzzingserver-noutf8.php b/tests/AutobahnTestSuite/bin/fuzzingserver-noutf8.php
new file mode 100644
index 0000000..d95a494
--- /dev/null
+++ b/tests/AutobahnTestSuite/bin/fuzzingserver-noutf8.php
@@ -0,0 +1,13 @@
+<?php
+
+    require dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
+
+    $loop = new React\EventLoop\StreamSelectLoop;
+    $sock = new React\Socket\Server($loop);
+    $app  = new Ratchet\WebSocket\WsServer(new Ratchet\Tests\AbFuzzyServer);
+    $app->setEncodingChecks(false);
+
+    $sock->listen(8003, '0.0.0.0');
+
+    $server = new Ratchet\Server\IoServer($app, $sock, $loop);
+    $server->run();
diff --git a/tests/AutobahnTestSuite/fuzzingclient-all.json b/tests/AutobahnTestSuite/fuzzingclient-all.json
index 5fa09f2..d290aee 100644
--- a/tests/AutobahnTestSuite/fuzzingclient-all.json
+++ b/tests/AutobahnTestSuite/fuzzingclient-all.json
@@ -3,9 +3,11 @@
   , "outdir": "reports/ab"
 
   , "servers": [
-        {"agent": "Ratchet/0.2 libevent", "url": "ws://localhost:8000", "options": {"version": 18}}
-      , {"agent": "Ratchet/0.2 streams", "url": "ws://localhost:8001", "options": {"version": 18}}
-      , {"agent": "AutobahnTestSuite/0.5.2", "url": "ws://localhost:8002", "options": {"version": 18}}
+        {"agent": "Ratchet/0.2.3 libevent", "url": "ws://localhost:8000", "options": {"version": 18}}
+      , {"agent": "Ratchet/0.2.3 libev", "url": "ws://localhost:8002", "options": {"version": 18}}
+      , {"agent": "Ratchet/0.2.3 -utf8", "url": "ws://localhost:8003", "options": {"version": 18}}
+      , {"agent": "Ratchet/0.2.3 streams", "url": "ws://localhost:8001", "options": {"version": 18}}
+      , {"agent": "AutobahnTestSuite/0.5.9", "url": "ws://localhost:8004", "options": {"version": 18}}
     ]
 
   , "cases": ["*"]
diff --git a/tests/AutobahnTestSuite/fuzzingclient-profile.json b/tests/AutobahnTestSuite/fuzzingclient-profile.json
index 7621585..e81a9fd 100644
--- a/tests/AutobahnTestSuite/fuzzingclient-profile.json
+++ b/tests/AutobahnTestSuite/fuzzingclient-profile.json
@@ -3,7 +3,7 @@
   , "outdir": "reports/profile"
 
   , "servers": [
-        {"agent": "Ratchet-libevent/0.2", "url": "ws://localhost:8000", "options": {"version": 18}}
+        {"agent": "Ratchet", "url": "ws://localhost:8000", "options": {"version": 18}}
     ]
 
   , "cases": ["9.7.4"]
diff --git a/tests/AutobahnTestSuite/fuzzingclient-quick.json b/tests/AutobahnTestSuite/fuzzingclient-quick.json
new file mode 100644
index 0000000..87bfd15
--- /dev/null
+++ b/tests/AutobahnTestSuite/fuzzingclient-quick.json
@@ -0,0 +1,12 @@
+{
+    "options": {"failByDrop": false}
+  , "outdir": "reports/rfc"
+
+  , "servers": [
+       {"agent": "Ratchet", "url": "ws://localhost:8001", "options": {"version": 18}}
+    ]
+
+  , "cases": ["*"]
+  , "exclude-cases": ["1.2.*", "2.3", "2.4", "2.6", "9.2.*", "9.4.*", "9.6.*", "9.8.*"]
+  , "exclude-agent-cases": {}
+}