Merge remote-tracking branch 'origin/doc-tagcloud' into doc-overhaul

[github/shaarli/Shaarli.git] / tests / Url / UrlTest.php

diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php
index 5fdc86177bdf9677317719b6f8f516fa5e89f351..aa2f2234529b4878cdb3e926918a13d004f7d9bc 100644 (file)
--- a/tests/Url/UrlTest.php
+++ b/tests/Url/UrlTest.php
@@ -85,6 +85,7 @@ class UrlTest extends PHPUnit_Framework_TestCase
         $this->assertUrlIsCleaned('?utm_term=1n4l');
 
         $this->assertUrlIsCleaned('?xtor=some-url');
+        $this->assertUrlIsCleaned('?PHPSESSID=012345678910111213');
     }
 
     /**
@@ -156,7 +157,7 @@ class UrlTest extends PHPUnit_Framework_TestCase
     /**
      * Test add trailing slash.
      */
-    function testAddTrailingSlash()
+    public function testAddTrailingSlash()
     {
         $strOn = 'http://randomstr.com/test/';
         $strOff = 'http://randomstr.com/test';
@@ -167,7 +168,7 @@ class UrlTest extends PHPUnit_Framework_TestCase
     /**
      * Test valid HTTP url.
      */
-    function testUrlIsHttp()
+    public function testUrlIsHttp()
     {
         $url = new Url(self::$baseUrl);
         $this->assertTrue($url->isHttp());
@@ -176,24 +177,24 @@ class UrlTest extends PHPUnit_Framework_TestCase
     /**
      * Test non HTTP url.
      */
-    function testUrlIsNotHttp()
+    public function testUrlIsNotHttp()
     {
         $url = new Url('ftp://save.tld/mysave');
         $this->assertFalse($url->isHttp());
     }
 
     /**
-     * Test IndToAscii.
+     * Test International Domain Name to ASCII conversion
      */
-    function testIndToAscii()
+    public function testIdnToAscii()
     {
         $ind = 'http://www.académie-française.fr/';
         $expected = 'http://www.xn--acadmie-franaise-npb1a.fr/';
         $url = new Url($ind);
-        $this->assertEquals($expected, $url->indToAscii());
+        $this->assertEquals($expected, $url->idnToAscii());
 
         $notInd = 'http://www.academie-francaise.fr/';
         $url = new Url($notInd);
-        $this->assertEquals($notInd, $url->indToAscii());
+        $this->assertEquals($notInd, $url->idnToAscii());
     }
 }