minor #17069 improve BrowserKit test coverage p1 (eventhorizonpl)

Tobion · Tobion · commit 45a006046d3f · 2015-12-24T02:02:08.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- improve BrowserKit test coverage p1 Hi, This PR improves BrowserKit test coverage. | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT I rebased previous PR #16549 to 2.3 Commits ------- 0261b48 improve BrowserKit test coverage p1
diff --git a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
@@ -624,4 +624,24 @@ public function testSetServerParameterInRequest()
         $this->assertArrayHasKey('HTTPS', $server);
         $this->assertFalse($server['HTTPS']);
     }
+
+    public function testInternalRequest()
+    {
+        $client = new TestClient();
+
+        $client->request('GET', 'https://www.example.com/https/www.example.com', array(), array(), array(
+            'HTTP_HOST' => 'testhost',
+            'HTTP_USER_AGENT' => 'testua',
+            'HTTPS' => false,
+            'NEW_SERVER_KEY' => 'new-server-key-value',
+        ));
+
+        $this->assertInstanceOf('Symfony\Component\BrowserKit\Request', $client->getInternalRequest());
+    }
+
+    public function testInternalRequestNull()
+    {
+        $client = new TestClient();
+        $this->assertNull($client->getInternalRequest());
+    }
 }
diff --git a/src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php b/src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php
@@ -174,6 +174,16 @@ public function testCookieExpireWithNullPaths()
         $this->assertEquals(array(), array_keys($cookieJar->allValues('http://example.com/')));
     }
 
+    public function testCookieExpireWithDomain()
+    {
+        $cookieJar = new CookieJar();
+        $cookieJar->set($cookie1 = new Cookie('foo', 'bar1', null, '/foo', 'http://example2.com/'));
+        $cookieJar->expire('foo', '/foo', 'http://example2.com/');
+
+        $this->assertNull($cookieJar->get('foo'), '->get() returns null if the cookie is expired');
+        $this->assertEquals(array(), array_keys($cookieJar->allValues('http://example2.com/')));
+    }
+
     public function testCookieWithSameNameButDifferentPaths()
     {
         $cookieJar = new CookieJar();
@@ -207,6 +217,14 @@ public function testCookieGetWithSubdomain()
         $this->assertEquals($cookie2, $cookieJar->get('foo1', '/', 'test.example.com'));
     }
 
+    public function testCookieGetWithWrongSubdomain()
+    {
+        $cookieJar = new CookieJar();
+        $cookieJar->set($cookie1 = new Cookie('foo1', 'bar', null, '/', 'test.example.com'));
+
+        $this->assertNull($cookieJar->get('foo1', '/', 'foo.example.com'));
+    }
+
     public function testCookieGetWithSubdirectory()
     {
         $cookieJar = new CookieJar();
diff --git a/src/Symfony/Component/BrowserKit/Tests/CookieTest.php b/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
@@ -176,4 +176,13 @@ public function testIsExpired()
         $cookie = new Cookie('foo', 'bar', 0);
         $this->assertFalse($cookie->isExpired());
     }
+
+    /**
+     * @expectedException        UnexpectedValueException
+     * @expectedExceptionMessage The cookie expiration time "string" is not valid.
+     */
+    public function testConstructException()
+    {
+        $cookie = new Cookie('foo', 'bar', 'string');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -176,4 +176,13 @@ public function testIsExpired()`
`176`	`176`	`$cookie = new Cookie('foo', 'bar', 0);`
`177`	`177`	`$this->assertFalse($cookie->isExpired());`
`178`	`178`	`}`
	`179`	`+`
	`180`	`+ /**`
	`181`	`+ * @expectedException UnexpectedValueException`
	`182`	`+ * @expectedExceptionMessage The cookie expiration time "string" is not valid.`
	`183`	`+ */`
	`184`	`+ public function testConstructException()`
	`185`	`+ {`
	`186`	`+ $cookie = new Cookie('foo', 'bar', 'string');`
	`187`	`+ }`
`179`	`188`	`}`