X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2Fhttp%2FUrlTest.php;fp=tests%2FUrl%2FUrlTest.php;h=ae92f73a4d4a2a62a851b9d99d5b523bc9b303e7;hb=ff3b5dc5542ec150f0d9b447394364a15e9156d0;hp=db229ce0d87c544ff912fd5240cc6a15dccaa950;hpb=1826e383ecf501302974132fd443cf1ca06e10f6;p=github%2Fshaarli%2FShaarli.git diff --git a/tests/Url/UrlTest.php b/tests/http/UrlTest.php similarity index 87% rename from tests/Url/UrlTest.php rename to tests/http/UrlTest.php index db229ce0..ae92f73a 100644 --- a/tests/Url/UrlTest.php +++ b/tests/http/UrlTest.php @@ -1,14 +1,14 @@ cleanup(); $this->assertEquals(self::$baseUrl, $url->toString()); } @@ -38,7 +38,7 @@ class UrlTest extends PHPUnit_Framework_TestCase public function testConstruct() { $ref = 'http://username:password@hostname:9090/path' - .'?arg1=value1&arg2=value2#anchor'; + . '?arg1=value1&arg2=value2#anchor'; $url = new Url($ref); $this->assertEquals($ref, $url->toString()); } @@ -52,7 +52,7 @@ class UrlTest extends PHPUnit_Framework_TestCase $this->assertUrlIsCleaned(); // URL with no annoying elements - $ref = self::$baseUrl.'?p1=val1&p2=1234#edit'; + $ref = self::$baseUrl . '?p1=val1&p2=1234#edit'; $url = new Url($ref); $this->assertEquals($ref, $url->cleanup()); } @@ -115,26 +115,26 @@ class UrlTest extends PHPUnit_Framework_TestCase // ditch annoying query params and fragment, keep useful params $url = new Url( self::$baseUrl - .'?fb=zomg&my=stuff&utm_medium=numnum&is=kept#tk.rss_all' + . '?fb=zomg&my=stuff&utm_medium=numnum&is=kept#tk.rss_all' ); - $this->assertEquals(self::$baseUrl.'?my=stuff&is=kept', $url->cleanup()); + $this->assertEquals(self::$baseUrl . '?my=stuff&is=kept', $url->cleanup()); // ditch annoying query params, keep useful params and fragment $url = new Url( self::$baseUrl - .'?fb=zomg&my=stuff&utm_medium=numnum&is=kept#again' + . '?fb=zomg&my=stuff&utm_medium=numnum&is=kept#again' ); $this->assertEquals( - self::$baseUrl.'?my=stuff&is=kept#again', + self::$baseUrl . '?my=stuff&is=kept#again', $url->cleanup() ); // test firefox reader url $url = new Url( - 'about://reader?url=' . urlencode(self::$baseUrl .'?my=stuff&is=kept') + 'about://reader?url=' . urlencode(self::$baseUrl . '?my=stuff&is=kept') ); - $this->assertEquals(self::$baseUrl.'?my=stuff&is=kept', $url->cleanup()); + $this->assertEquals(self::$baseUrl . '?my=stuff&is=kept', $url->cleanup()); } /**