Changeset 28971 for trunk/tests/phpunit/tests/formatting/WPTexturize.php

Timestamp:

07/03/2014 04:21:18 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Fix texturization of quotes when enclosed by angle brackets.

props miqrogroove.
fixes #28718.

File:

• trunk/tests/phpunit/tests/formatting/WPTexturize.php (modified) (11 diffs)

trunk/tests/phpunit/tests/formatting/WPTexturize.php

@@ -118 +118 @@
         //$this->assertEquals('“Class of 99”', wptexturize("\"Class of 99\""));
         $this->assertEquals('“Class of ’99”', wptexturize("\"Class of '99\""));
+        $this->assertEquals('{“Class of ’99”}', wptexturize("{\"Class of '99\"}"));
+        $this->assertEquals(' “Class of ’99” ', wptexturize(" \"Class of '99\" "));
+        $this->assertEquals('}”Class of ’99″{', wptexturize("}\"Class of '99\"{")); // Not a quotation, may be between two other quotations.
     }
 
@@ -347 +350 @@
             ),
             array(
-                "word <'word word", // Invalid HTML input?
-                "word <&#8216;word word",
-            ),
-            array(
-                "word &lt;'word word", // Valid HTML input triggers the apos in a word pattern
-                "word &lt;&#8217;word word",
+                "word <'word word", // Invalid HTML input triggers the apos in a word pattern.
+                "word <&#8217;word word",
+            ),
+            array(
+                "word &lt;'word word", // Valid HTML input makes curly quotes.
+                "word &lt;&#8216;word word",
             ),
             array(
@@ -376 +379 @@
             array(
                 "word<'word word",
-                "word<&#8216;word word",
+                "word<&#8217;word word",
             ),
             array(
                 "word&lt;'word word",
-                "word&lt;&#8217;word word",
+                "word&lt;&#8216;word word",
             ),
             array(
@@ -403 +406 @@
             ),
             array(
-                "word <' word word", // Invalid HTML input?
-                "word <&#8216; word word",
-            ),
-            array(
-                "word &lt;' word word", // Valid HTML input triggers the closing single quote here
-                "word &lt;&#8217; word word",
+                "word <' word word",
+                "word <&#8217; word word",
+            ),
+            array(
+                "word &lt;' word word",
+                "word &lt;&#8216; word word",
             ),
             array(
@@ -432 +435 @@
             array(
                 "word<' word word",
-                "word<&#8216; word word",
+                "word<&#8217; word word",
             ),
             array(
                 "word&lt;' word word",
-                "word&lt;&#8217; word word",
+                "word&lt;&#8216; word word",
             ),
             array(
@@ -534 +537 @@
             ),
             array(
-                "word word'. word", // Quotes with outside punctuation could end with apostrophes instead of closing quotes (may affect i18n)
-                "word word&#8217;. word",
-            ),
-            array(
-                "word ]'. word",
-                "word ]&#8217;. word",
-            ),
-            array(
-                "word )'. word",
-                "word )&#8217;. word",
-            ),
-            array(
-                "word }'. word",
-                "word }&#8217;. word",
-            ),
-            array(
-                "word >'. word", // Not tested
-                "word >&#8217;. word",
-            ),
-            array(
-                "word &gt;'. word",
-                "word &gt;&#8217;. word",
-            ),
-        );
-    }
-
-    /**
-     * Double quote after a space or ([{< becomes &#8220; (opening_quote) if not followed by spaces
+                "word'[ word", // Apostrophes are never followed by opening punctuation.
+                "word'[ word",
+            ),
+            array(
+                "word'( word",
+                "word'( word",
+            ),
+            array(
+                "word'{ word",
+                "word'{ word",
+            ),
+            array(
+                "word'&lt; word",
+                "word'&lt; word",
+            ),
+            array(
+                "word'< word", // Invalid HTML input does trigger the apos pattern.
+                "word&#8217;< word",
+            ),
+        );
+    }
+
+    /**
+     * Double quote after a space or ([-{< becomes &#8220; (opening_quote) if not followed by spaces
      *
      * Checks all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
@@ -587 +586 @@
             ),
             array(
-                'word <"word word', // Invalid HTML input?
-                'word <&#8220;word word',
-            ),
-            array(
-                'word &lt;"word word', // Valid HTML input triggers the closing quote pattern
-                'word &lt;&#8221;word word',
+                'word <"word word', // Invalid HTML input triggers the closing quote pattern.
+                'word <&#8221;word word',
+            ),
+            array(
+                'word &lt;"word word',
+                'word &lt;&#8220;word word',
             ),
             array(
@@ -599 +598 @@
             ),
             array(
+                'word -"word word',
+                'word -&#8220;word word',
+            ),
+            array(
+                'word-"word word',
+                'word-&#8220;word word',
+            ),
+            array(
                 '"word word',
                 '&#8220;word word',
@@ -611 +618 @@
             ),
             array(
-                'word<"word word', // Invalid HTML input?
-                'word<&#8220;word word',
-            ),
-            array(
-                'word&lt;"word word', // Valid HTML input triggers the closing quote pattern
-                'word&lt;&#8221;word word',
+                'word<"word word',
+                'word<&#8221;word word',
+            ),
+            array(
+                'word&lt;"word word',
+                'word&lt;&#8220;word word',
             ),
             array(
@@ -699 +706 @@
 
     /**
-     * Test that single quotes followed by a space or a period become &#8217; (closing_single_quote)
+     * Test that single quotes followed by a space or .,-)}]> become &#8217; (closing_single_quote)
      *
      * Checks all baseline patterns. If anything ever changes in wptexturize(), these tests may fail.
@@ -727 +734 @@
                 "word word', she said",
                 "word word&#8217;, she said",
+            ),
+            array(
+                "word word'- word",
+                "word word&#8217;- word",
+            ),
+            array(
+                "word word') word",
+                "word word&#8217;) word",
+            ),
+            array(
+                "word word'} word",
+                "word word&#8217;} word",
+            ),
+            array(
+                "word word'] word",
+                "word word&#8217;] word",
+            ),
+            array(
+                "word word'&gt; word",
+                "word word&#8217;&gt; word",
             ),
             array(