diff options
| author | Levon Sargsyan <levon.sargsyan@qt.io> | 2020-01-06 17:54:14 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2020-01-06 17:39:47 +0000 |
| commit | 3a9b6fc440b6c1ca290ac1140d3f726cf6b11765 (patch) | |
| tree | 6a92a67a9c83b704ddc61e309196ad46c0dcc021 | |
| parent | f2df879cbd3e09f25d3c23f05fb76549a5a45296 (diff) | |
| download | qttools-3a9b6fc440b6c1ca290ac1140d3f726cf6b11765.tar.gz | |
Change test function positions to match their declaration order
Change-Id: I82bd549f93ce19b029c0e3c7220652e569ee07dc
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index a705575a8..a56e0fd7d 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -171,13 +171,6 @@ void tst_generatedOutput::htmlFromQDocFile() "qdoctests-qdocfileoutput-linking.html"); } -void tst_generatedOutput::webXmlFromQDocFile() -{ - testAndCompare("webxml_test.qdocconf", - "html/qdoctests-qdocfileoutput.webxml " - "html/qdoctests-qdocfileoutput-linking.webxml"); -} - void tst_generatedOutput::htmlFromCpp() { testAndCompare("testcpp.qdocconf", @@ -187,16 +180,6 @@ void tst_generatedOutput::htmlFromCpp() "testqdoc.html"); } - -void tst_generatedOutput::webXmlFromCpp() -{ - testAndCompare("webxml_testcpp.qdocconf", - "html/testcpp-module.webxml " - "html/testqdoc-test.webxml " - "html/testqdoc-testderived.webxml"); -} - - void tst_generatedOutput::htmlFromQml() { testAndCompare("testqml.qdocconf", @@ -214,13 +197,6 @@ void tst_generatedOutput::htmlFromQml() "qml-int.html"); } -void tst_generatedOutput::webXmlFromQml() -{ - testAndCompare("webxml_testqml.qdocconf", - "html/test-componentset-example.webxml " - "html/uicomponents-qmlmodule.webxml"); -} - void tst_generatedOutput::htmlFromCppBug80259() { testAndCompare("bug80259/testmodule.qdocconf", @@ -230,6 +206,29 @@ void tst_generatedOutput::htmlFromCppBug80259() "index.html"); } +void tst_generatedOutput::webXmlFromQDocFile() +{ + testAndCompare("webxml_test.qdocconf", + "html/qdoctests-qdocfileoutput.webxml " + "html/qdoctests-qdocfileoutput-linking.webxml"); +} + +void tst_generatedOutput::webXmlFromCpp() +{ + testAndCompare("webxml_testcpp.qdocconf", + "html/testcpp-module.webxml " + "html/testqdoc-test.webxml " + "html/testqdoc-testderived.webxml"); +} + + +void tst_generatedOutput::webXmlFromQml() +{ + testAndCompare("webxml_testqml.qdocconf", + "html/test-componentset-example.webxml " + "html/uicomponents-qmlmodule.webxml"); +} + void tst_generatedOutput::webXmlFromCppBug80259() { testAndCompare("bug80259/webxml_testmodule.qdocconf", |