Add more tests for UCS-4 text conversion

Author: alexdowad

ext/mbstring/tests/other_encodings.phpt

@@ -20,16 +20,6 @@ echo "7bit done\n";
 var_dump(mb_convert_encoding("\x01\x00", "8bit", "UTF-16BE")); // codepoints over 0xFF are illegal for '8-bit'
 echo "8bit done\n";
 
-// UCS-4
-echo bin2hex(mb_convert_encoding("\xFF\xFE\x00\x00\x00\x30\x00\x00", "UTF-16BE", "UCS-4")), "\n";
-echo bin2hex(mb_convert_encoding("\x00\x00\xFE\xFF\x00\x00\x30\x01", "UTF-16BE", "UCS-4")), "\n";
-echo bin2hex(mb_convert_encoding("\x02\x30\x00\x00", "UTF-16BE", "UCS-4LE")), "\n";
-echo bin2hex(mb_convert_encoding("\x00\x00\x30\x03", "UTF-16BE", "UCS-4BE")), "\n";
-
-mb_substitute_character("long");
-echo mb_convert_encoding("\x01\x02\x03", "UTF-8", "UCS-4"), "\n";
-echo "UCS-4 done\n";
-
 ?>
 --EXPECT--
 string(3) "ABC"
@@ -38,9 +28,3 @@ string(3) "ABC"
 7bit done
 string(1) "%"
 8bit done
-3000
-3001
-3002
-3003
-%
-UCS-4 done

ext/mbstring/tests/ucs4_encoding.phpt

@@ -7,6 +7,13 @@ mbstring
 include('encoding_tests.inc');
 mb_substitute_character(0x25);
 
+testValidString("\xFF\xFE\x00\x00\x00\x30\x00\x00", "\x30\x00", "UCS-4", "UTF-16BE", false);
+testValidString("\x00\x00\xFE\xFF\x00\x00\x30\x01", "\x30\x01", "UCS-4", "UTF-16BE", false);
+testValidString("\x02\x30\x00\x00", "\x30\x02", "UCS-4LE", "UTF-16BE");
+testValidString("\x00\x00\x30\x03", "\x30\x03", "UCS-4BE", "UTF-16BE");
+
+convertInvalidString("\x01\x02\x03", "%", "UCS-4", "UTF-8");
+
 // Test "long" illegal character markers
 mb_substitute_character("long");
 convertInvalidString("\x6F\x00\x00\x00", "U+6F000000", "UCS-4BE", "UTF-8");