1 files changed, 51 insertions, 0 deletions
diff --git a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
index cdbc242640..c4cad91006 100644
--- a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
+++ b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
@@ -54,6 +54,9 @@ private slots:
     void normalize_data();
     void normalize();
 
+    void inverted_data();
+    void inverted();
+
     void compare();
 
     void add_data();
@@ -80,6 +83,9 @@ private slots:
     void fromAxisAndAngle_data();
     void fromAxisAndAngle();
 
+    void fromRotationMatrix_data();
+    void fromRotationMatrix();
+
     void slerp_data();
     void slerp();
 
@@ -291,6 +297,32 @@ void tst_QQuaternion::normalize()
         QCOMPARE(v.length(), 1.0f);
 }
 
+void tst_QQuaternion::inverted_data()
+{
+    // Use the same test data as the length test.
+    length_data();
+}
+void tst_QQuaternion::inverted()
+{
+    QFETCH(float, x);
+    QFETCH(float, y);
+    QFETCH(float, z);
+    QFETCH(float, w);
+    QFETCH(float, len);
+
+    QQuaternion v(w, x, y, z);
+    QQuaternion u = v.inverted();
+    if (v.isNull()) {
+        QVERIFY(u.isNull());
+    } else {
+        len *= len;
+        QCOMPARE(-u.x() * len, v.x());
+        QCOMPARE(-u.y() * len, v.y());
+        QCOMPARE(-u.z() * len, v.z());
+        QCOMPARE(u.scalar() * len, v.scalar());
+    }
+}
+
 // Test the comparison operators for quaternions.
 void tst_QQuaternion::compare()
 {
@@ -696,6 +728,25 @@ void tst_QQuaternion::fromAxisAndAngle()
     QVERIFY(qFuzzyCompare(answer.scalar(), result.scalar()));
 }
 
+// Test quaternion convertion to and from rotation matrix.
+void tst_QQuaternion::fromRotationMatrix_data()
+{
+    fromAxisAndAngle_data();
+}
+void tst_QQuaternion::fromRotationMatrix()
+{
+    QFETCH(float, x1);
+    QFETCH(float, y1);
+    QFETCH(float, z1);
+    QFETCH(float, angle);
+
+    QQuaternion result = QQuaternion::fromAxisAndAngle(QVector3D(x1, y1, z1), angle);
+    QMatrix3x3 rot3x3 = result.toRotationMatrix();
+    QQuaternion answer = QQuaternion::fromRotationMatrix(rot3x3);
+
+    QVERIFY(qFuzzyCompare(answer, result) || qFuzzyCompare(-answer, result));
+}
+
 // Test spherical interpolation of quaternions.
 void tst_QQuaternion::slerp_data()
 {