From 69afb3de1f26b1f80443387f12845b12fcb98cbb Mon Sep 17 00:00:00 2001
From: Chris Boden <cboden@gmail.com>
Date: Sun, 14 Apr 2013 18:42:30 -0400
Subject: [PATCH] [Http] Fixed broken unit tests

---
 .../Guzzle/Http/Message/RequestFactoryTest.php             | 4 ++--
 .../Tests/{WebSocket => Http}/HtpRequestParserTest.php     | 7 +++----
 tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php      | 5 +++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename tests/Ratchet/Tests/{WebSocket => Http}/Guzzle/Http/Message/RequestFactoryTest.php (94%)
 rename tests/Ratchet/Tests/{WebSocket => Http}/HtpRequestParserTest.php (88%)

diff --git a/tests/Ratchet/Tests/WebSocket/Guzzle/Http/Message/RequestFactoryTest.php b/tests/Ratchet/Tests/Http/Guzzle/Http/Message/RequestFactoryTest.php
similarity index 94%
rename from tests/Ratchet/Tests/WebSocket/Guzzle/Http/Message/RequestFactoryTest.php
rename to tests/Ratchet/Tests/Http/Guzzle/Http/Message/RequestFactoryTest.php
index 01d5df0..cb67bf5 100644
--- a/tests/Ratchet/Tests/WebSocket/Guzzle/Http/Message/RequestFactoryTest.php
+++ b/tests/Ratchet/Tests/Http/Guzzle/Http/Message/RequestFactoryTest.php
@@ -1,6 +1,6 @@
 <?php
-namespace Ratchet\Tests\WebSocket\Guzzle\Http\Message;
-use Ratchet\WebSocket\Guzzle\Http\Message\RequestFactory;
+namespace Ratchet\Tests\Http\Guzzle\Http\Message;
+use Ratchet\Http\Guzzle\Http\Message\RequestFactory;
 
 /**
  * @covers Ratchet\WebSocket\Guzzle\Http\Message\RequestFactory
diff --git a/tests/Ratchet/Tests/WebSocket/HtpRequestParserTest.php b/tests/Ratchet/Tests/Http/HtpRequestParserTest.php
similarity index 88%
rename from tests/Ratchet/Tests/WebSocket/HtpRequestParserTest.php
rename to tests/Ratchet/Tests/Http/HtpRequestParserTest.php
index b3f1600..a32a6da 100644
--- a/tests/Ratchet/Tests/WebSocket/HtpRequestParserTest.php
+++ b/tests/Ratchet/Tests/Http/HtpRequestParserTest.php
@@ -1,7 +1,6 @@
 <?php
-namespace Ratchet\Tests\WebSocket;
-use Ratchet\WebSocket\HttpRequestParser;
-use Ratchet\Tests\Mock\Connection as ConnectionStub;
+namespace Ratchet\Tests\Http;
+use Ratchet\Http\HttpRequestParser;
 
 /**
  * @covers Ratchet\WebSocket\HttpRequestParser
@@ -32,7 +31,7 @@ class HttpRequestParserTest extends \PHPUnit_Framework_TestCase {
     }
 
     public function testBufferOverflowResponse() {
-        $conn = new ConnectionStub;
+        $conn = $this->getMock('\\Ratchet\\ConnectionInterface');
 
         $this->parser->maxSize = 20;
 
diff --git a/tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php b/tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php
index d31ce64..02d959d 100644
--- a/tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php
+++ b/tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php
@@ -1,6 +1,7 @@
 <?php
 namespace Ratchet\Tests\WebSocket\Version;
 use Ratchet\WebSocket\Version\Hixie76;
+use Ratchet\Http\HttpServer;
 use Ratchet\WebSocket\WsServer;
 
 /**
@@ -60,7 +61,7 @@ class Hixie76Test extends \PHPUnit_Framework_TestCase {
         $mockConn = $this->getMock('\\Ratchet\\ConnectionInterface');
         $mockApp = $this->getMock('\\Ratchet\\MessageComponentInterface');
 
-        $server = new WsServer($mockApp);
+        $server = new HttpServer(new WsServer($mockApp));
         $server->onOpen($mockConn);
         $mockApp->expects($this->exactly(0))->method('onOpen');
         $server->onMessage($mockConn, $headers);
@@ -73,7 +74,7 @@ class Hixie76Test extends \PHPUnit_Framework_TestCase {
         $mockConn = $this->getMock('\\Ratchet\\ConnectionInterface');
         $mockApp = $this->getMock('\\Ratchet\\MessageComponentInterface');
 
-        $server = new WsServer($mockApp);
+        $server = new HttpServer(new WsServer($mockApp));
         $server->onOpen($mockConn);
         $server->onMessage($mockConn, $headers);