diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2019-05-24 07:17:50 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2019-05-24 06:24:44 +0000 |
| commit | 5c6eb0a2bac1cf644cbccf200fc547668e0079ca (patch) | |
| tree | 88545af84e66aa1700877022a5abca39d2add6ac /share/qtcreator/templates | |
| parent | d8ab335e51c7c2cff9747f8534628ebdafa99cd0 (diff) | |
AutoTest: Further adaption following official terms
GoogleTest started using the term Test Suite for grouping
related tests and Test Case for general tests.
This patch adapts the visual strings as well as some
internal API which used the same terms.
This completes 6189745a3b8d3a24627193f9ad8fb18fa84099ed.
Change-Id: I0307c10b8b5f8574f31a68ee4320732f3e829532
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'share/qtcreator/templates')
| -rw-r--r-- | share/qtcreator/templates/wizards/autotest/files/tst_src.h | 2 | ||||
| -rw-r--r-- | share/qtcreator/templates/wizards/autotest/wizard.json | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/share/qtcreator/templates/wizards/autotest/files/tst_src.h b/share/qtcreator/templates/wizards/autotest/files/tst_src.h index 9e6c619c5f..ef29240cd5 100644 --- a/share/qtcreator/templates/wizards/autotest/files/tst_src.h +++ b/share/qtcreator/templates/wizards/autotest/files/tst_src.h @@ -11,7 +11,7 @@ using namespace testing; -TEST(%{TestCaseName}, %{TestSetName}) +TEST(%{TestSuiteName}, %{TestCaseName}) { EXPECT_EQ(1, 1); ASSERT_THAT(0, Eq(0)); diff --git a/share/qtcreator/templates/wizards/autotest/wizard.json b/share/qtcreator/templates/wizards/autotest/wizard.json index efaa6b36a0..83a4be09a4 100644 --- a/share/qtcreator/templates/wizards/autotest/wizard.json +++ b/share/qtcreator/templates/wizards/autotest/wizard.json @@ -108,7 +108,7 @@ { "name": "TestSuiteName", "trDisplayName": "Test suite name:", - "visible": "%{JS: value('TestFrameWork') === 'BoostTest'}", + "visible": "%{JS: ['BoostTest', 'GTest'].indexOf(value('TestFrameWork')) >= 0}", "mandatory": true, "type": "LineEdit", "data": { "validator": "^[a-zA-Z_0-9]+$" } @@ -139,13 +139,6 @@ } }, { - "name": "TestSetName", - "trDisplayName": "Test set name:", - "visible": "%{JS: value('TestFrameWork') === 'GTest'}", - "type": "LineEdit", - "data": { "validator": "^[a-zA-Z0-9]+$" } - }, - { "name": "GTestCXX11", "trDisplayName": "Enable C++11", "visible": "%{JS: value('TestFrameWork') === 'GTest'}", |