From 623c753a7b6a582e352acc5a0abbb7eb402af3b7 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Fri, 27 May 2011 13:34:28 +0200
Subject: Add QUuid::toRfc4122() and fromRfc4122()

Following the RFC4122, provide the interfaces between QUuid
and QByteArray, they are simpler then toByteArray() and
relevant.

Thanks for the suggestion and brief code from Robin Burchell.

Task-number: QTBUG-19420
Reviewed-by: joao
(cherry picked from commit 06873e467d98ad60d827afae29500bf2ff783c03)

Change-Id: I4623ae3363f1d5affa45de73fac616bb67a9eaa1
Reviewed-on: http://codereview.qt.nokia.com/168
Reviewed-by: Liang Qi <liang.qi@nokia.com>
---
 tests/auto/quuid/tst_quuid.cpp                      | 16 ++++++++++++++++
 tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp | 18 ++++++++++++++++++
 2 files changed, 34 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/quuid/tst_quuid.cpp b/tests/auto/quuid/tst_quuid.cpp
index 3abc8af4c0..4948312fd4 100644
--- a/tests/auto/quuid/tst_quuid.cpp
+++ b/tests/auto/quuid/tst_quuid.cpp
@@ -65,6 +65,8 @@ private slots:
     void fromString();
     void toByteArray();
     void fromByteArray();
+    void toRfc4122();
+    void fromRfc4122();
     void check_QDataStream();
     void isNull();
     void equal();
@@ -147,6 +149,20 @@ void tst_QUuid::fromByteArray()
     QCOMPARE(uuidB, QUuid(QByteArray("{1ab6e93a-b1cb-4a87-ba47-ec7e99039a7b}")));
 }
 
+void tst_QUuid::toRfc4122()
+{
+    QCOMPARE(uuidA.toRfc4122(), QByteArray::fromHex("fc69b59ecc344436a43cee95d128b8c5"));
+
+    QCOMPARE(uuidB.toRfc4122(), QByteArray::fromHex("1ab6e93ab1cb4a87ba47ec7e99039a7b"));
+}
+
+void tst_QUuid::fromRfc4122()
+{
+    QCOMPARE(uuidA, QUuid::fromRfc4122(QByteArray::fromHex("fc69b59ecc344436a43cee95d128b8c5")));
+
+    QCOMPARE(uuidB, QUuid::fromRfc4122(QByteArray::fromHex("1ab6e93ab1cb4a87ba47ec7e99039a7b")));
+}
+
 void tst_QUuid::check_QDataStream()
 {
     QUuid tmp;
diff --git a/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp b/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp
index 24754ab370..a035cf3627 100644
--- a/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp
+++ b/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp
@@ -58,6 +58,8 @@ private slots:
     void fromString();
     void toByteArray();
     void fromByteArray();
+    void toRfc4122();
+    void fromRfc4122();
     void toDataStream();
     void fromDataStream();
     void isNull();
@@ -111,6 +113,22 @@ void tst_bench_QUuid::fromByteArray()
     }
 }
 
+void tst_bench_QUuid::toRfc4122()
+{
+    QUuid uuid = QUuid::createUuid();
+    QBENCHMARK {
+        uuid.toRfc4122();
+    }
+}
+
+void tst_bench_QUuid::fromRfc4122()
+{
+    QByteArray string = QByteArray::fromHex("67C8770B44F1410AAB9AF9B5446F13EE");
+    QBENCHMARK {
+        QUuid uuid = QUuid::fromRfc4122(string);
+    }
+}
+
 void tst_bench_QUuid::toDataStream()
 {
     QUuid uuid1, uuid2;
-- 
cgit v1.2.3