faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

[WebSocket] Cleanup

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Ratchet/WebSocket/Version/RFC6455/Frame.php
View File

@ -3,11 +3,11 @@ namespace Ratchet\WebSocket\Version\RFC6455;
use Ratchet\WebSocket\Version\FrameInterface; use Ratchet\WebSocket\Version\FrameInterface;
class Frame implements FrameInterface { class Frame implements FrameInterface {
const OP_CONTINUE = 0; const OP_CONTINUE = 0;
const OP_TEXT = 1; const OP_TEXT = 1;
const OP_BINARY = 2; const OP_BINARY = 2;
const OP_CLOSE = 8; const OP_CLOSE = 8;
const OP_PING = 9; const OP_PING = 9;
const OP_PONG = 10; const OP_PONG = 10;
const CLOSE_NORMAL = 1000; const CLOSE_NORMAL = 1000;

7
src/Ratchet/WebSocket/WsServer.php
View File

@ -8,7 +8,6 @@ use Guzzle\Http\Message\Response;
/** /**
* The adapter to handle WebSocket requests/responses * 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 * 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://ca.php.net/manual/en/ref.http.php
* @link http://dev.w3.org/html5/websockets/ * @link http://dev.w3.org/html5/websockets/
*/ */
@ -73,12 +72,6 @@ class WsServer implements MessageComponentInterface {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function onOpen(ConnectionInterface $conn) { public function onOpen(ConnectionInterface $conn) {
//$wsConn = new WsConnection($conn);
//$this->connections->attach($conn, $wsConn);
//$this->reqParser->onOpen($wsConn);
$conn->WebSocket = new \StdClass; $conn->WebSocket = new \StdClass;
$conn->WebSocket->established = false; $conn->WebSocket->established = false;
} }

3
tests/Ratchet/Tests/WebSocket/HtpRequestParserTest.php
View File

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

16
tests/Ratchet/Tests/WebSocket/VersionManagerTest.php
View File

@ -44,8 +44,22 @@ class VersionManagerTest extends \PHPUnit_Framework_TestCase {
$this->setExpectedException('InvalidArgumentException'); $this->setExpectedException('InvalidArgumentException');
$this->vm->getVersion($req); $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() { public function testGetSupportedVersionString() {