1 files changed, 40 insertions, 18 deletions

diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
index 2ec85882b8..81409eb866 100644
--- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
@@ -74,7 +74,7 @@ private slots:
     void isSpaceSpecial();
     void category();
     void direction();
-    void joining();
+    void joiningType();
     void combiningClass();
     void digitValue();
     void mirroredChar();
@@ -450,6 +450,18 @@ void tst_QChar::category()
 
 void tst_QChar::direction()
 {
+    QVERIFY(QChar::direction(0x200E) == QChar::DirL);
+    QVERIFY(QChar::direction(0x200F) == QChar::DirR);
+    QVERIFY(QChar::direction(0x202A) == QChar::DirLRE);
+    QVERIFY(QChar::direction(0x202B) == QChar::DirRLE);
+    QVERIFY(QChar::direction(0x202C) == QChar::DirPDF);
+    QVERIFY(QChar::direction(0x202D) == QChar::DirLRO);
+    QVERIFY(QChar::direction(0x202E) == QChar::DirRLO);
+    QVERIFY(QChar::direction(0x2066) == QChar::DirLRI);
+    QVERIFY(QChar::direction(0x2067) == QChar::DirRLI);
+    QVERIFY(QChar::direction(0x2068) == QChar::DirFSI);
+    QVERIFY(QChar::direction(0x2069) == QChar::DirPDI);
+
     QVERIFY(QChar('a').direction() == QChar::DirL);
     QVERIFY(QChar('0').direction() == QChar::DirEN);
     QVERIFY(QChar((ushort)0x627).direction() == QChar::DirAL);
@@ -471,27 +483,32 @@ void tst_QChar::direction()
     QVERIFY(QChar::direction(0x2FA17u) == QChar::DirL);
 }
 
-void tst_QChar::joining()
+void tst_QChar::joiningType()
 {
-    QVERIFY(QChar('a').joining() == QChar::OtherJoining);
-    QVERIFY(QChar('0').joining() == QChar::OtherJoining);
-    QVERIFY(QChar((ushort)0x627).joining() == QChar::Right);
-    QVERIFY(QChar((ushort)0x5d0).joining() == QChar::OtherJoining);
+    QVERIFY(QChar('a').joiningType() == QChar::Joining_None);
+    QVERIFY(QChar('0').joiningType() == QChar::Joining_None);
+    QVERIFY(QChar((ushort)0x0627).joiningType() == QChar::Joining_Right);
+    QVERIFY(QChar((ushort)0x05d0).joiningType() == QChar::Joining_None);
+    QVERIFY(QChar((ushort)0x00ad).joiningType() == QChar::Joining_Transparent);
+
+    QVERIFY(QChar::joiningType((ushort)'a') == QChar::Joining_None);
+    QVERIFY(QChar::joiningType((ushort)'0') == QChar::Joining_None);
+    QVERIFY(QChar::joiningType((ushort)0x0627) == QChar::Joining_Right);
+    QVERIFY(QChar::joiningType((ushort)0x05d0) == QChar::Joining_None);
+    QVERIFY(QChar::joiningType((ushort)0x00ad) == QChar::Joining_Transparent);
 
-    QVERIFY(QChar::joining((ushort)'a') == QChar::OtherJoining);
-    QVERIFY(QChar::joining((ushort)'0') == QChar::OtherJoining);
-    QVERIFY(QChar::joining((ushort)0x627) == QChar::Right);
-    QVERIFY(QChar::joining((ushort)0x5d0) == QChar::OtherJoining);
+    QVERIFY(QChar::joiningType((uint)'a') == QChar::Joining_None);
+    QVERIFY(QChar::joiningType((uint)'0') == QChar::Joining_None);
+    QVERIFY(QChar::joiningType((uint)0x0627) == QChar::Joining_Right);
+    QVERIFY(QChar::joiningType((uint)0x05d0) == QChar::Joining_None);
+    QVERIFY(QChar::joiningType((uint)0x00ad) == QChar::Joining_Transparent);
 
-    QVERIFY(QChar::joining((uint)'a') == QChar::OtherJoining);
-    QVERIFY(QChar::joining((uint)'0') == QChar::OtherJoining);
-    QVERIFY(QChar::joining((uint)0x627) == QChar::Right);
-    QVERIFY(QChar::joining((uint)0x5d0) == QChar::OtherJoining);
+    QVERIFY(QChar::joiningType(0xE01DAu) == QChar::Joining_Transparent);
+    QVERIFY(QChar::joiningType(0xf0000u) == QChar::Joining_None);
+    QVERIFY(QChar::joiningType(0xE0030u) == QChar::Joining_Transparent);
+    QVERIFY(QChar::joiningType(0x2FA17u) == QChar::Joining_None);
 
-    QVERIFY(QChar::joining(0xE01DAu) == QChar::OtherJoining);
-    QVERIFY(QChar::joining(0xf0000u) == QChar::OtherJoining);
-    QVERIFY(QChar::joining(0xE0030u) == QChar::OtherJoining);
-    QVERIFY(QChar::joining(0x2FA17u) == QChar::OtherJoining);
+    QVERIFY(QChar::joiningType((uint)0xA872) == QChar::Joining_Left);
 }
 
 void tst_QChar::combiningClass()
@@ -605,6 +622,11 @@ void tst_QChar::unicodeVersion()
     QVERIFY(QChar::unicodeVersion((uint)0x20ba) == QChar::Unicode_6_2);
     QVERIFY(QChar::unicodeVersion((uint)0x20ba) == QChar::Unicode_6_2);
 
+    QVERIFY(QChar(0x061c).unicodeVersion() == QChar::Unicode_6_3);
+    QVERIFY(QChar::unicodeVersion((ushort)0x061c) == QChar::Unicode_6_3);
+    QVERIFY(QChar::unicodeVersion((uint)0x061c) == QChar::Unicode_6_3);
+    QVERIFY(QChar::unicodeVersion((uint)0x061c) == QChar::Unicode_6_3);
+
     QVERIFY(QChar(0x09ff).unicodeVersion() == QChar::Unicode_Unassigned);
     QVERIFY(QChar::unicodeVersion((ushort)0x09ff) == QChar::Unicode_Unassigned);
     QVERIFY(QChar::unicodeVersion((uint)0x09ff) == QChar::Unicode_Unassigned);