distinct tests

Author: devnexen

ext/intl/tests/locale_get_display_language3.phpt

@@ -78,18 +78,6 @@ function ut_main()
         $res_str .= "-----------------\n";
     }
 
-    try {
-	    ut_loc_get_display_language("a-D\0E", "locale=a-DE");
-    } catch (\ValueError $e) {
-	    echo $e->getMessage(). PHP_EOL;
-    }
-
-    try {
-	    ut_loc_get_display_language("a-DE", "locale=a\0-DE");
-    } catch (\ValueError $e) {
-	    echo $e->getMessage(). PHP_EOL;
-    }
-
     return $res_str;
 }
 
@@ -98,10 +86,6 @@ ut_run();
 
 ?>
 --EXPECTREGEX--
-Locale::getDisplayLanguage(): Argument #1 ($locale) must not contain any null bytes
-Locale::getDisplayLanguage(): Argument #2 ($displayLocale) must not contain any null bytes
-locale_get_display_language(): Argument #1 ($locale) must not contain any null bytes
-locale_get_display_language(): Argument #2 ($displayLocale) must not contain any null bytes
 locale='art-lojban'
 disp_locale=en :  display_language=Lojban
 disp_locale=fr :  display_language=lojban

ext/intl/tests/locale_get_display_language4.phpt

@@ -0,0 +1,29 @@
+--TEST--
+locale_get_display_language() throwing null bytes exceptions.
+--EXTENSIONS--
+intl
+--FILE--
+<?php
+
+function ut_main()
+{
+    try {
+	    ut_loc_get_display_language("a-D\0E", "locale=a-DE");
+    } catch (\ValueError $e) {
+	    echo $e->getMessage(). PHP_EOL;
+    }
+
+    try {
+	    ut_loc_get_display_language("a-DE", "locale=a\0-DE");
+    } catch (\ValueError $e) {
+	    echo $e->getMessage(). PHP_EOL;
+    }
+}
+include_once 'ut_common.inc';
+ut_run();
+?>
+--EXPECT--
+Locale::getDisplayLanguage(): Argument #1 ($locale) must not contain any null bytes
+Locale::getDisplayLanguage(): Argument #2 ($displayLocale) must not contain any null bytes
+locale_get_display_language(): Argument #1 ($locale) must not contain any null bytes
+locale_get_display_language(): Argument #2 ($displayLocale) must not contain any null bytes