Merge pull request repejota#81 from repejota/fixtests

Fixtests

Author: repejota

spec/Nats/ConnectionOptionsSpec.php

@@ -33,7 +33,7 @@ function it_has_default_lang_value_as_php() {
     }
 
     function it_has_default_version_value_as_null() {
-        $this->getVersion()->shouldEqual("0.0.5");
+        $this->getVersion()->shouldEqual("0.7.2");
     }
 
     function it_has_default_verbose_value_as_null() {

src/Nats/Connection.php

@@ -190,12 +190,16 @@ private function receive($len = null)
      * @return resource
      * @throws \Exception Exception raised if connection fails.
      */
-    private function getStream($address)
+    private function getStream($address, $timeout)
     {
         $errno = null;
         $errstr = null;
 
-        $fp = stream_socket_client($address, $errno, $errstr, null, STREAM_CLIENT_CONNECT);
+        $fp = stream_socket_client($address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT);
+        $timeout = number_format($timeout, 3);
+        $seconds = floor($timeout);
+        $microseconds = ($timeout - $seconds) * 1000;
+        stream_set_timeout($fp, $seconds, $microseconds);
 
         if (!$fp) {
             throw new \Exception($errstr, $errno);
@@ -229,7 +233,7 @@ public function connect($timeout = null)
         }
 
         $this->timeout = $timeout;
-        $this->streamSocket = $this->getStream($this->options->getAddress());
+        $this->streamSocket = $this->getStream($this->options->getAddress(), $timeout);
         $this->setStreamTimeout($timeout);
 
         $msg = 'CONNECT '.$this->options;

test/ConnectionOptionsTest.php

@@ -74,7 +74,7 @@ public function testSettersAndGettersWithoutCredentials()
     public function testStringRepresentation()
     {
         $options = new ConnectionOptions();
-        $this->assertEquals("{\"lang\":\"php\",\"version\":\"0.0.5\",\"verbose\":false,\"pedantic\":false}", $options->__toString());
+        $this->assertEquals("{\"lang\":\"php\",\"version\":\"0.7.2\",\"verbose\":false,\"pedantic\":false}", $options->__toString());
     }
 
     /**
@@ -87,6 +87,6 @@ public function testStringRepresentationWithCredentials()
         $options = new ConnectionOptions();
         $options->setUser("username");
         $options->setPass("password");
-        $this->assertEquals("{\"lang\":\"php\",\"version\":\"0.0.5\",\"verbose\":false,\"pedantic\":false,\"user\":\"username\",\"pass\":\"password\"}", $options->__toString());
+        $this->assertEquals("{\"lang\":\"php\",\"version\":\"0.7.2\",\"verbose\":false,\"pedantic\":false,\"user\":\"username\",\"pass\":\"password\"}", $options->__toString());
     }
 }

test/ConnectionTest.php

@@ -128,8 +128,8 @@ function ($message) {
     public function testLargeRequest()
     {
 
-        $content = file_get_contents(dirname(__FILE__).'/test.pdf');
-        
+        $content = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 51200);
+
         $contentLen = strlen($content);
 
         $contentSum = md5($content);