Merge branch 'unittest-16' of https://github.com/mmz-srf/stomp-php in…

…to mmz-srf-unittest-16

Conflicts:
	src/test/bootstrap.php

phpunit.xml

@@ -13,8 +13,11 @@
     syntaxCheck                 = "false"
     bootstrap                   = "tests/bootstrap.php" >
     <testsuites>
-        <testsuite name="stomp-php Test Suite">
-            <directory>tests/</directory>
+        <testsuite name="stomp-php Functional Test Suite">
+            <directory>tests/functional/</directory>
+        </testsuite>
+        <testsuite name="stomp-php Stubbed Test Suite">
+            <file>tests/stubbed</file>
         </testsuite>
     </testsuites>
 </phpunit>

src/FuseSource/Stomp/Stomp.php

@@ -571,7 +571,7 @@ public function readFrame ()
             $data .= $read;
             if (strpos($data, "\x00") !== false) {
                 $end = true;
-                $data = rtrim($data, "\n");
+                $data = trim($data, "\n");
             }
             $len = strlen($data);
         } while ($len < 2 || $end == false);

tests/StompFailoverTest.php → tests/functional/StompFailoverTest.php

@@ -47,6 +47,7 @@ protected function setUp ()
      */
     protected function tearDown ()
     {
+		$this->Stomp->disconnect();
         $this->Stomp = null;
         parent::tearDown();
     }

tests/stubbed/StompUnitTest.php

@@ -0,0 +1,56 @@
+<?php
+namespace FuseSource\Stomp;
+
+use PHPUnit_Framework_TestCase;
+
+// Prepare mocking function calls
+require_once(__DIR__ . '/fusesource_stream_function_stubs.php');
+
+class StompUnitTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Stomp
+     */
+    private $sut;
+
+    protected function setUp()
+    {
+        $this->sut = new Stomp('tcp://localhost:61613');
+    }
+
+    public function testReadFrameWithTrailingLineFeed()
+    {
+        // Mock functions return values
+        global $fusesourceStreamFunctionStubsBuffer;
+        $fusesourceStreamFunctionStubsBuffer =array(
+                "MESSAGE\n\nbody\x00\n",
+                "MESSAGE\n\nbody\x00",
+        );
+
+        $this->sut->readFrame();
+        $frame = $this->sut->readFrame();
+        $this->assertSame(
+            'MESSAGE',
+            $frame->command
+        );
+    }
+
+    public function testReadFrameWithLeadingLineFeed()
+    {
+        $this->sut = new Stomp('tcp://localhost:61613');
+
+        // Mock functions return values
+        global $fusesourceStreamFunctionStubsBuffer;
+        $fusesourceStreamFunctionStubsBuffer =array(
+                "MESSAGE\n\nbody\x00",
+                "\nMESSAGE\n\nbody\x00",
+        );
+
+        $this->sut->readFrame();
+        $frame = $this->sut->readFrame();
+        $this->assertSame(
+            'MESSAGE',
+            $frame->command
+        );
+    }
+}

tests/stubbed/fusesource_stream_function_stubs.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace FuseSource\Stomp;
+
+function stream_select()
+{
+    global $fusesourceStreamFunctionStubsBuffer;
+    if (count($fusesourceStreamFunctionStubsBuffer) === 0) {
+        return false;
+    }
+    return strlen($fusesourceStreamFunctionStubsBuffer[0]);
+}
+
+function fread($socket, $count)
+{
+    global $fusesourceStreamFunctionStubsBuffer;
+    return array_shift($fusesourceStreamFunctionStubsBuffer);
+}
+
+function feof()
+{
+    global $fusesourceStreamFunctionStubsBuffer;
+    return count($fusesourceStreamFunctionStubsBuffer)===0;
+}