[WebSocket] Cleanup

Added a couple coverage unit tests
CS
This commit is contained in:
Chris Boden 2012-06-13 22:51:42 -04:00
parent f1612a603f
commit 9d2939e1e8
4 changed files with 20 additions and 16 deletions

View File

@ -8,7 +8,6 @@ use Guzzle\Http\Message\Response;
/**
* The adapter to handle WebSocket requests/responses
* This is a mediator between the Server and your application to handle real-time messaging through a web browser
* @todo Separate this class into a two classes: Component and a protocol handler
* @link http://ca.php.net/manual/en/ref.http.php
* @link http://dev.w3.org/html5/websockets/
*/
@ -73,12 +72,6 @@ class WsServer implements MessageComponentInterface {
* {@inheritdoc}
*/
public function onOpen(ConnectionInterface $conn) {
//$wsConn = new WsConnection($conn);
//$this->connections->attach($conn, $wsConn);
//$this->reqParser->onOpen($wsConn);
$conn->WebSocket = new \StdClass;
$conn->WebSocket->established = false;
}

View File

@ -31,7 +31,6 @@ class HttpRequestParserTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals($expected, $this->parser->isEom($message));
}
public function testBufferOverflowResponse() {
$conn = new ConnectionStub;
@ -42,7 +41,5 @@ class HttpRequestParserTest extends \PHPUnit_Framework_TestCase {
$this->setExpectedException('OverflowException');
$this->parser->onMessage($conn, "Header-Is: Too Big");
//$this->assertGreaterThan(400, $this->parser->onMessage($conn, "Header-Is: Too Big")->getStatusCode());
}
}

View File

@ -44,8 +44,22 @@ class VersionManagerTest extends \PHPUnit_Framework_TestCase {
$this->setExpectedException('InvalidArgumentException');
$this->vm->getVersion($req);
}
//$this->assertFalse($this->vm->getVersion($req));
public function testYesIsVersionEnabled() {
$this->vm->enableVersion(new RFC6455);
$this->assertTrue($this->vm->isVersionEnabled(new EntityEnclosingRequest('get', '/', array(
'Host' => 'socketo.me'
, 'Sec-WebSocket-Version' => 13
))));
}
public function testNoIsVersionEnabled() {
$this->assertFalse($this->vm->isVersionEnabled(new EntityEnclosingRequest('get', '/', array(
'Host' => 'socketo.me'
, 'Sec-WebSocket-Version' => 9000
))));
}
public function testGetSupportedVersionString() {