Changeset 30515

Timestamp:

11/22/2014 07:53:37 PM (10 years ago)

Author:

boonebgorges

Message:

Improvements to encoded character formatting tests.

In sanitize_title_with_dashes() and sanitize_user() tests, we break large
test methods into smaller ones in order to isolate those that actually describe
the bug being reported in ticket #10823. The unit tests that are continuing to
fail have been attached as a patch to that ticket.

See #30284.

Location:

trunk/tests/phpunit/tests/formatting

Files:

• SanitizeTitleWithDashes.php (modified) (1 diff)
• SanitizeUser.php (modified) (1 diff)

trunk/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php

@@ -36 +36 @@
     }
 
-    /**
-     * @ticket 10823
-     */
-    function test_strips_entities() {
+    public function test_strips_nbsp_ndash_and_amp() {
         $this->assertEquals("no-entities-here", sanitize_title_with_dashes("No   Entities – Here &"));
+    }
+
+    public function test_strips_encoded_ampersand() {
         $this->assertEquals("one-two", sanitize_title_with_dashes("One & Two", '', 'save'));
+    }
+
+    public function test_strips_url_encoded_ampersand() {
         $this->assertEquals("one-two", sanitize_title_with_dashes("One { Two;", '', 'save'));
-        $this->assertEquals("one-two", sanitize_title_with_dashes("One & Two;", '', 'save'));
+    }
+
+    public function test_strips_trademark_symbol() {
         $this->assertEquals("one-two", sanitize_title_with_dashes("One Two™;", '', 'save'));
+    }
+
+    public function test_strips_unencoded_ampersand_followed_by_encoded_ampersand() {
         $this->assertEquals("one-two", sanitize_title_with_dashes("One && Two;", '', 'save'));
+    }
+
+    public function test_strips_unencoded_ampersand_when_not_surrounded_by_spaces() {
         $this->assertEquals("onetwo", sanitize_title_with_dashes("One&Two", '', 'save'));
-        $this->assertEquals("onetwo-test", sanitize_title_with_dashes("One&Two Test;", '', 'save'));
     }
 

trunk/tests/phpunit/tests/formatting/SanitizeUser.php

@@ -10 +10 @@
         $this->assertEquals($expected, sanitize_user($input));
     }
-    /**
-     * @ticket 10823
-     */
-    function test_strips_entities() {
+
+    public function test_strips_encoded_ampersand() {
         $this->assertEquals("ATT", sanitize_user("AT&T"));
+    }
+
+    public function test_strips_encoded_ampersand_when_followed_by_semicolon() {
         $this->assertEquals("ATT Test;", sanitize_user("AT&T Test;"));
-        $this->assertEquals("AT&T Test;", sanitize_user("AT&T Test;"));
     }
+
     function test_strips_percent_encoded_octets() {
         $expected = is_multisite() ? 'franois' : 'Franois';