From 0c55aa6bef9cf4e04f5c915bde1980ad0eec006a Mon Sep 17 00:00:00 2001
From: Chris Boden <cboden@gmail.com>
Date: Fri, 13 Jul 2012 19:53:18 -0400
Subject: [PATCH] Test cleanup

Added the AutobahnTestSuite Fuzzing Server to AB tests
giving another language (Python) to compare Ratchet to
Added a profile option for make
Cleaned up the tests directory structure
---
 Makefile                                           | 14 ++++++++++----
 .../bin/fuzzingserver-libevent.php                 |  2 +-
 .../AutobahnTestSuite/bin/fuzzingserver-stream.php |  2 +-
 tests/AutobahnTestSuite/fuzzingclient-all.json     |  9 +++++----
 tests/AutobahnTestSuite/fuzzingclient-profile.json | 12 ++++++++++++
 5 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 tests/AutobahnTestSuite/fuzzingclient-profile.json

diff --git a/Makefile b/Makefile
index 3f4acc0..ee20908 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,17 @@ cover:
 
 abtests:
 	ulimit -n 2048
-	php tests/ab-wstest-libevent.php &
-	php tests/ab-wstest-stream.php &
-	cd tests && wstest -m fuzzingclient -s ab-wstest-fuzzyconf.json
+	php tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php &
+	php tests/AutobahnTestSuite/bin/fuzzingserver-stream.php &
+	wstest -m testeeserver -w ws://localhost:8002 &
+	wstest -m fuzzingclient -s tests/AutobahnTestSuite/fuzzingclient-all.json
+	killall php
+	killall python
+
+profile:
+	php -d 'xdebug.profiler_enable=1' tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php &
+	wstest -m fuzzingclient -s tests/AutobahnTestSuite/fuzzingclient-profile.json
 	killall php
-	echo
 
 apidocs:
 	apigen --title Ratchet -d reports/api -s src/ \
diff --git a/tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php b/tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php
index af120e4..df0c419 100644
--- a/tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php
+++ b/tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php
@@ -1,6 +1,6 @@
 <?php
 
-    require dirname(__DIR__) . '/vendor/autoload.php';
+    require dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
 
     $loop = new React\EventLoop\LibEventLoop;
     $sock = new React\Socket\Server($loop);
diff --git a/tests/AutobahnTestSuite/bin/fuzzingserver-stream.php b/tests/AutobahnTestSuite/bin/fuzzingserver-stream.php
index d0b08dd..66ff8b5 100644
--- a/tests/AutobahnTestSuite/bin/fuzzingserver-stream.php
+++ b/tests/AutobahnTestSuite/bin/fuzzingserver-stream.php
@@ -1,6 +1,6 @@
 <?php
 
-    require dirname(__DIR__) . '/vendor/autoload.php';
+    require dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
 
     $loop = new React\EventLoop\StreamSelectLoop;
     $sock = new React\Socket\Server($loop);
diff --git a/tests/AutobahnTestSuite/fuzzingclient-all.json b/tests/AutobahnTestSuite/fuzzingclient-all.json
index 436408f..f875434 100644
--- a/tests/AutobahnTestSuite/fuzzingclient-all.json
+++ b/tests/AutobahnTestSuite/fuzzingclient-all.json
@@ -1,13 +1,14 @@
 {
     "options": {"failByDrop": false}
-  , "outdir": "../reports/ab"
+  , "outdir": "reports/ab"
 
   , "servers": [
-        {"agent": "Ratchet-libevent/v0.2b", "url": "ws://localhost:8000", "options": {"version": 18}}
-      , {"agent": "Ratchet-stream/v0.2b", "url": "ws://localhost:8001", "options": {"version": 18}}
+        {"agent": "Ratchet-libevent/0.2b", "url": "ws://localhost:8000", "options": {"version": 18}}
+      , {"agent": "Ratchet-stream/0.2b", "url": "ws://localhost:8001", "options": {"version": 18}}
+      , {"agent": "AutobahnTestSuite/0.5.1-0.5.2", "url": "ws://localhost:8002", "options": {"version": 18}}
     ]
 
   , "cases": ["*"]
-  , "exclude-cases": ["1.2.*", "2.3", "2.4", "2.6", "9.2.*", "9.4.*", "9.6.*", "9.8.*"]
+  , "exclude-cases": ["9.*", "1.2.*", "2.3", "2.4", "2.6", "9.2.*", "9.4.*", "9.6.*", "9.8.*"]
   , "exclude-agent-cases": {}
 }
diff --git a/tests/AutobahnTestSuite/fuzzingclient-profile.json b/tests/AutobahnTestSuite/fuzzingclient-profile.json
new file mode 100644
index 0000000..cc9a2a6
--- /dev/null
+++ b/tests/AutobahnTestSuite/fuzzingclient-profile.json
@@ -0,0 +1,12 @@
+{
+    "options": {"failByDrop": false}
+  , "outdir": "reports/profile"
+
+  , "servers": [
+        {"agent": "Ratchet-libevent/0.2b", "url": "ws://localhost:8000", "options": {"version": 18}}
+    ]
+
+  , "cases": ["9.7.4"]
+  , "exclude-cases": ["1.2.*", "2.3", "2.4", "2.6", "9.2.*", "9.4.*", "9.6.*", "9.8.*"]
+  , "exclude-agent-cases": {}
+}