From 4a9092eaad34ca4788247c1ecb216f7d3b3d1d08 Mon Sep 17 00:00:00 2001
From: Dmitry Ashkadov <dmitry.ashkadov@gmail.com>
Date: Fri, 11 Oct 2013 14:05:01 +0400
Subject: Add QVERIFY_EXCEPTION_THROWN macro for testing exceptions using
 QtTest

New macro QVERIFY_EXCEPTION_THROWN may be used to check that some code
really throws an exception of specified type.

Change-Id: I7cf499c7c37a35407862bc604c6eb862c5f329d3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
---
 .../selftests/expected_verifyexceptionthrown.xml   | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml

(limited to 'tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml')

diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
new file mode 100644
index 0000000000..df261b72c4
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestCase name="tst_VerifyExceptionThrown">
+<Environment>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+<TestFunction name="testCorrectStdTypes">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+<TestFunction name="testCorrectStdExceptions">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+<TestFunction name="testCorrectMyExceptions">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+<TestFunction name="testFailInt">
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="128">
+    <Description><![CDATA[Expected exception of type double to be thrown but unknown exception caught]]></Description>
+</Incident>
+</TestFunction>
+<TestFunction name="testFailStdString">
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="133">
+    <Description><![CDATA[Expected exception of type char* to be thrown but unknown exception caught]]></Description>
+</Incident>
+</TestFunction>
+<TestFunction name="testFailStdRuntimeError">
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="138">
+    <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error]]></Description>
+</Incident>
+</TestFunction>
+<TestFunction name="testFailMyException">
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="143">
+    <Description><![CDATA[Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error]]></Description>
+</Incident>
+</TestFunction>
+<TestFunction name="testFailMyDerivedException">
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="148">
+    <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException]]></Description>
+</Incident>
+</TestFunction>
+<TestFunction name="testFailNoException">
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="153">
+    <Description><![CDATA[Expected exception of type std::exception to be thrown but no exception caught]]></Description>
+</Incident>
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+</TestCase>
-- 
cgit v1.2.3


From 4d5906989a43621065cd489013fe6a0c205761fd Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Thu, 2 Jan 2014 14:58:22 +0100
Subject: Update tests to normalizes the paths by using script.

The newly added generate_expected_output.py was used to get the expected
output into a more reproducible state.

Change-Id: I1ca75c8e0c5778d25c1df531bd298007aac0ff4a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 .../testlib/selftests/expected_verifyexceptionthrown.xml     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml')

diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
index df261b72c4..a533934d4b 100644
--- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
+++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
@@ -17,32 +17,32 @@
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 <TestFunction name="testFailInt">
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="128">
+<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="128">
     <Description><![CDATA[Expected exception of type double to be thrown but unknown exception caught]]></Description>
 </Incident>
 </TestFunction>
 <TestFunction name="testFailStdString">
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="133">
+<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="133">
     <Description><![CDATA[Expected exception of type char* to be thrown but unknown exception caught]]></Description>
 </Incident>
 </TestFunction>
 <TestFunction name="testFailStdRuntimeError">
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="138">
+<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="138">
     <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error]]></Description>
 </Incident>
 </TestFunction>
 <TestFunction name="testFailMyException">
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="143">
+<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="143">
     <Description><![CDATA[Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error]]></Description>
 </Incident>
 </TestFunction>
 <TestFunction name="testFailMyDerivedException">
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="148">
+<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="148">
     <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException]]></Description>
 </Incident>
 </TestFunction>
 <TestFunction name="testFailNoException">
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="153">
+<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="153">
     <Description><![CDATA[Expected exception of type std::exception to be thrown but no exception caught]]></Description>
 </Incident>
 </TestFunction>
-- 
cgit v1.2.3


From 019588f30792132d9eca5dab11278547b287804e Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Thu, 24 Oct 2013 20:10:37 +0200
Subject: Testlib: Add test duration to xml output

[ChangeLog][QtTest] Added test duration to xml output.
When running tests with xml output a new tag of the form
<duration msecs="123"/> is added to each test function and the test as a
whole.

Change-Id: Ibc4db066b6acf5fac6c578f5e5ca5ce4b5d8ea8e
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
---
 .../testlib/selftests/expected_verifyexceptionthrown.xml     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml')

diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
index a533934d4b..a89528cfb8 100644
--- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
+++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
@@ -6,47 +6,59 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testCorrectStdTypes">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testCorrectStdExceptions">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testCorrectMyExceptions">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInt">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="128">
     <Description><![CDATA[Expected exception of type double to be thrown but unknown exception caught]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailStdString">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="133">
     <Description><![CDATA[Expected exception of type char* to be thrown but unknown exception caught]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailStdRuntimeError">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="138">
     <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailMyException">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="143">
     <Description><![CDATA[Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailMyDerivedException">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="148">
     <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailNoException">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="153">
     <Description><![CDATA[Expected exception of type std::exception to be thrown but no exception caught]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
-- 
cgit v1.2.3