issue #19 - review tests as connexion has been initialized properly and has modified headers

Author: mikaelcom

tests/SoapClientTest.php

@@ -219,11 +219,8 @@ public function testSetHeaders()
 
         $this->assertTrue(is_resource(SoapClient::getSoapClient()->_stream_context));
 
-        $this->assertSame(array(
-            'http' => array(
-                'header' => 'X-Header-Name: X-Header-Value',
-            ),
-        ), stream_context_get_options(SoapClient::getSoapClient()->_stream_context));
+        $o = stream_context_get_options(SoapClient::getSoapClient()->_stream_context);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') > 0);
     }
     /**
      *
@@ -240,12 +237,8 @@ public function testSetHeadersOnExistingHeaders()
 
         $this->assertTrue(is_resource(SoapClient::getSoapClient()->_stream_context));
 
-        $this->assertSame(array(
-            'http' => array(
-                'header' => 'X-Header-Name: X-Header-Value' . "\r\n" .
-                            'X-Header-ID: X-Header-ID-Value',
-            ),
-        ), stream_context_get_options(SoapClient::getSoapClient()->_stream_context));
+        $o = stream_context_get_options(SoapClient::getSoapClient()->_stream_context);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);
     }
     /**
      *
@@ -270,17 +263,13 @@ public function testSetHeadersOnExistingHttpsHeaders()
 
         $this->assertTrue(is_resource(SoapClient::getSoapClient()->_stream_context));
 
+        $o = stream_context_get_options(SoapClient::getSoapClient()->_stream_context);
         $this->assertSame(array(
-            'https' => array(
-                'header' => array(
-                    'X-HEADER' => 'X-VALUE',
-                ),
+            'header' => array(
+                'X-HEADER' => 'X-VALUE',
             ),
-            'http' => array(
-                'header' => 'X-Header-Name: X-Header-Value' . "\r\n" .
-                            'X-Header-ID: X-Header-ID-Value',
-            ),
-        ), stream_context_get_options(SoapClient::getSoapClient()->_stream_context));
+        ), $o['https']);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);
     }
     /**
      *
@@ -305,15 +294,11 @@ public function testSetHeadersOnExistingHttpHeaders()
 
         $this->assertTrue(is_resource(SoapClient::getSoapClient()->_stream_context));
 
+        $o = stream_context_get_options(SoapClient::getSoapClient()->_stream_context);
         $this->assertSame(array(
-            'http' => array(
-                'Auth' => array(
-                    'X-HEADER' => 'X-VALUE',
-                ),
-                'header' => 'X-Header-Name: X-Header-Value' . "\r\n" .
-                            'X-Header-ID: X-Header-ID-Value',
-            ),
-        ), stream_context_get_options(SoapClient::getSoapClient()->_stream_context));
+            'X-HEADER' => 'X-VALUE',
+        ), $o['http']['Auth']);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);
     }
     /**
      *
@@ -329,11 +314,8 @@ public function testGetStreamContext()
 
         $this->assertTrue(is_resource($soapClient->getStreamContext()));
 
-        $this->assertSame(array(
-            'http' => array(
-                'header' => 'X-Header-Name: X-Header-Value',
-            ),
-        ), stream_context_get_options($soapClient->getStreamContext()));
+        $o = stream_context_get_options($soapClient->getStreamContext());
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') > 0);
     }
     /**
      *
@@ -374,15 +356,11 @@ public function testSetHeadersOnExistingHttpHeadersWithGetStreamContextOptions()
 
         $this->assertTrue(is_resource($soapClient->getStreamContext()));
 
+        $o = $soapClient->getStreamContextOptions();
         $this->assertSame(array(
-            'http' => array(
-                'Auth' => array(
-                    'X-HEADER' => 'X-VALUE',
-                ),
-                'header' => 'X-Header-Name: X-Header-Value' . "\r\n" .
-                            'X-Header-ID: X-Header-ID-Value',
-            ),
-        ), $soapClient->getStreamContextOptions());
+            'X-HEADER' => 'X-VALUE',
+        ), $o['http']['Auth']);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);
     }
     /**
      *