From 911eb82cf37f4017cb7f3260485e9d7351e18a4f Mon Sep 17 00:00:00 2001 From: Corentin Schreiber Date: Sat, 24 Sep 2022 12:34:34 +0100 Subject: [PATCH] Print type name in TEMPLATE_LIST_TEST_CASE --- .../internal/catch_template_test_registry.hpp | 3 +- .../Baselines/automake.sw.approved.txt | 14 +++++----- .../Baselines/automake.sw.multi.approved.txt | 14 +++++----- .../Baselines/console.sw.approved.txt | 18 +++++++----- .../Baselines/console.sw.multi.approved.txt | 18 +++++++----- .../SelfTest/Baselines/junit.sw.approved.txt | 14 +++++----- .../Baselines/junit.sw.multi.approved.txt | 14 +++++----- .../Baselines/sonarqube.sw.approved.txt | 14 +++++----- .../Baselines/sonarqube.sw.multi.approved.txt | 14 +++++----- tests/SelfTest/Baselines/tap.sw.approved.txt | 14 +++++----- .../Baselines/tap.sw.multi.approved.txt | 14 +++++----- .../Baselines/teamcity.sw.approved.txt | 28 +++++++++---------- .../Baselines/teamcity.sw.multi.approved.txt | 28 +++++++++---------- tests/SelfTest/Baselines/xml.sw.approved.txt | 14 +++++----- .../Baselines/xml.sw.multi.approved.txt | 14 +++++----- 15 files changed, 122 insertions(+), 113 deletions(-) diff --git a/src/catch2/internal/catch_template_test_registry.hpp b/src/catch2/internal/catch_template_test_registry.hpp index bfac3bc8..61b5e056 100644 --- a/src/catch2/internal/catch_template_test_registry.hpp +++ b/src/catch2/internal/catch_template_test_registry.hpp @@ -13,6 +13,7 @@ #include #include #include +#include // GCC 5 and older do not properly handle disabling unused-variable warning @@ -178,7 +179,7 @@ void reg_tests() { \ size_t index = 0; \ using expander = size_t[]; \ - (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\ + (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index) + " - " + Catch::type_to_string(), Tags } ), index++)... };/* NOLINT */\ } \ };\ static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \ diff --git a/tests/SelfTest/Baselines/automake.sw.approved.txt b/tests/SelfTest/Baselines/automake.sw.approved.txt index b8b59566..12513cc5 100644 --- a/tests/SelfTest/Baselines/automake.sw.approved.txt +++ b/tests/SelfTest/Baselines/automake.sw.approved.txt @@ -240,13 +240,13 @@ Message from section two :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 0 :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 1 :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 2 -:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 -:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 -:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 -:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 -:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 0 -:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 1 -:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 2 +:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType +:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float +:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType +:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float +:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 0 - int +:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 1 - char +:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 2 - float :test-result: PASS TemplateTest: vectors can be sized and resized - float :test-result: PASS TemplateTest: vectors can be sized and resized - int :test-result: PASS TemplateTest: vectors can be sized and resized - std::string diff --git a/tests/SelfTest/Baselines/automake.sw.multi.approved.txt b/tests/SelfTest/Baselines/automake.sw.multi.approved.txt index 2afd308b..a3c7f1d7 100644 --- a/tests/SelfTest/Baselines/automake.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/automake.sw.multi.approved.txt @@ -233,13 +233,13 @@ :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 0 :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 1 :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 2 -:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 -:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 -:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 -:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 -:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 0 -:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 1 -:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 2 +:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType +:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float +:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType +:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float +:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 0 - int +:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 1 - char +:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 2 - float :test-result: PASS TemplateTest: vectors can be sized and resized - float :test-result: PASS TemplateTest: vectors can be sized and resized - int :test-result: PASS TemplateTest: vectors can be sized and resized - std::string diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt index 63dd231e..9ae8346f 100644 --- a/tests/SelfTest/Baselines/console.sw.approved.txt +++ b/tests/SelfTest/Baselines/console.sw.approved.txt @@ -12056,7 +12056,8 @@ with expansion: ------------------------------------------------------------------------------- Template test case with test types specified inside non-copyable and non- -movable std::tuple - NonCopyableAndNonMovableTypes - 0 +movable std::tuple - NonCopyableAndNonMovableTypes - 0 - +NonCopyableAndNonMovableType ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12068,7 +12069,7 @@ with expansion: ------------------------------------------------------------------------------- Template test case with test types specified inside non-copyable and non- -movable std::tuple - NonCopyableAndNonMovableTypes - 1 +movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12080,7 +12081,7 @@ with expansion: ------------------------------------------------------------------------------- Template test case with test types specified inside non-default-constructible -std::tuple - MyNonDefaultConstructibleTypes - 0 +std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12092,7 +12093,7 @@ with expansion: ------------------------------------------------------------------------------- Template test case with test types specified inside non-default-constructible -std::tuple - MyNonDefaultConstructibleTypes - 1 +std::tuple - MyNonDefaultConstructibleTypes - 1 - float ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12103,7 +12104,8 @@ with expansion: 4 > 0 ------------------------------------------------------------------------------- -Template test case with test types specified inside std::tuple - MyTypes - 0 +Template test case with test types specified inside std::tuple - MyTypes - 0 - +int ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12114,7 +12116,8 @@ with expansion: 4 > 0 ------------------------------------------------------------------------------- -Template test case with test types specified inside std::tuple - MyTypes - 1 +Template test case with test types specified inside std::tuple - MyTypes - 1 - +char ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12125,7 +12128,8 @@ with expansion: 1 > 0 ------------------------------------------------------------------------------- -Template test case with test types specified inside std::tuple - MyTypes - 2 +Template test case with test types specified inside std::tuple - MyTypes - 2 - +float ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt index 9cba323d..38028160 100644 --- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt @@ -12049,7 +12049,8 @@ with expansion: ------------------------------------------------------------------------------- Template test case with test types specified inside non-copyable and non- -movable std::tuple - NonCopyableAndNonMovableTypes - 0 +movable std::tuple - NonCopyableAndNonMovableTypes - 0 - +NonCopyableAndNonMovableType ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12061,7 +12062,7 @@ with expansion: ------------------------------------------------------------------------------- Template test case with test types specified inside non-copyable and non- -movable std::tuple - NonCopyableAndNonMovableTypes - 1 +movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12073,7 +12074,7 @@ with expansion: ------------------------------------------------------------------------------- Template test case with test types specified inside non-default-constructible -std::tuple - MyNonDefaultConstructibleTypes - 0 +std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12085,7 +12086,7 @@ with expansion: ------------------------------------------------------------------------------- Template test case with test types specified inside non-default-constructible -std::tuple - MyNonDefaultConstructibleTypes - 1 +std::tuple - MyNonDefaultConstructibleTypes - 1 - float ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12096,7 +12097,8 @@ with expansion: 4 > 0 ------------------------------------------------------------------------------- -Template test case with test types specified inside std::tuple - MyTypes - 0 +Template test case with test types specified inside std::tuple - MyTypes - 0 - +int ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12107,7 +12109,8 @@ with expansion: 4 > 0 ------------------------------------------------------------------------------- -Template test case with test types specified inside std::tuple - MyTypes - 1 +Template test case with test types specified inside std::tuple - MyTypes - 1 - +char ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... @@ -12118,7 +12121,8 @@ with expansion: 1 > 0 ------------------------------------------------------------------------------- -Template test case with test types specified inside std::tuple - MyTypes - 2 +Template test case with test types specified inside std::tuple - MyTypes - 2 - +float ------------------------------------------------------------------------------- Misc.tests.cpp: ............................................................................... diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt index f7411501..e0a0d6b3 100644 --- a/tests/SelfTest/Baselines/junit.sw.approved.txt +++ b/tests/SelfTest/Baselines/junit.sw.approved.txt @@ -1301,13 +1301,13 @@ Misc.tests.cpp: - - - - - - - + + + + + + + diff --git a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt index aa0860a3..150f7841 100644 --- a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt @@ -1300,13 +1300,13 @@ Misc.tests.cpp: - - - - - - - + + + + + + + diff --git a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt index a9319a62..f4ff2c0b 100644 --- a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt +++ b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt @@ -1653,13 +1653,13 @@ with expansion: Misc.tests.cpp: - - - - - - - + + + + + + + diff --git a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt index 97b2d988..dfa10d57 100644 --- a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt @@ -1652,13 +1652,13 @@ with expansion: Misc.tests.cpp: - - - - - - - + + + + + + + diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt index 2c7adae5..b7b96fd8 100644 --- a/tests/SelfTest/Baselines/tap.sw.approved.txt +++ b/tests/SelfTest/Baselines/tap.sw.approved.txt @@ -3014,19 +3014,19 @@ ok {test-number} - Template_Fixture::m_a == 1 for: 1 == 1 ok {test-number} - Template_Fixture::m_a == 1 for: 1 == 1 # Template test case method with test types specified inside std::tuple - MyTypes - 2 ok {test-number} - Template_Fixture::m_a == 1 for: 1.0 == 1 -# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 +# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType ok {test-number} - sizeof(TestType) > 0 for: 1 > 0 -# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 +# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float ok {test-number} - sizeof(TestType) > 0 for: 4 > 0 -# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 +# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType ok {test-number} - sizeof(TestType) > 0 for: 1 > 0 -# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 +# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float ok {test-number} - sizeof(TestType) > 0 for: 4 > 0 -# Template test case with test types specified inside std::tuple - MyTypes - 0 +# Template test case with test types specified inside std::tuple - MyTypes - 0 - int ok {test-number} - sizeof(TestType) > 0 for: 4 > 0 -# Template test case with test types specified inside std::tuple - MyTypes - 1 +# Template test case with test types specified inside std::tuple - MyTypes - 1 - char ok {test-number} - sizeof(TestType) > 0 for: 1 > 0 -# Template test case with test types specified inside std::tuple - MyTypes - 2 +# Template test case with test types specified inside std::tuple - MyTypes - 2 - float ok {test-number} - sizeof(TestType) > 0 for: 4 > 0 # TemplateTest: vectors can be sized and resized - float ok {test-number} - v.size() == 5 for: 5 == 5 diff --git a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt index d13b493c..8e18b3f1 100644 --- a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt @@ -3007,19 +3007,19 @@ ok {test-number} - Template_Fixture::m_a == 1 for: 1 == 1 ok {test-number} - Template_Fixture::m_a == 1 for: 1 == 1 # Template test case method with test types specified inside std::tuple - MyTypes - 2 ok {test-number} - Template_Fixture::m_a == 1 for: 1.0 == 1 -# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 +# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType ok {test-number} - sizeof(TestType) > 0 for: 1 > 0 -# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 +# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float ok {test-number} - sizeof(TestType) > 0 for: 4 > 0 -# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 +# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType ok {test-number} - sizeof(TestType) > 0 for: 1 > 0 -# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 +# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float ok {test-number} - sizeof(TestType) > 0 for: 4 > 0 -# Template test case with test types specified inside std::tuple - MyTypes - 0 +# Template test case with test types specified inside std::tuple - MyTypes - 0 - int ok {test-number} - sizeof(TestType) > 0 for: 4 > 0 -# Template test case with test types specified inside std::tuple - MyTypes - 1 +# Template test case with test types specified inside std::tuple - MyTypes - 1 - char ok {test-number} - sizeof(TestType) > 0 for: 1 > 0 -# Template test case with test types specified inside std::tuple - MyTypes - 2 +# Template test case with test types specified inside std::tuple - MyTypes - 2 - float ok {test-number} - sizeof(TestType) > 0 for: 4 > 0 # TemplateTest: vectors can be sized and resized - float ok {test-number} - v.size() == 5 for: 5 == 5 diff --git a/tests/SelfTest/Baselines/teamcity.sw.approved.txt b/tests/SelfTest/Baselines/teamcity.sw.approved.txt index 526f00a9..3cdcbab6 100644 --- a/tests/SelfTest/Baselines/teamcity.sw.approved.txt +++ b/tests/SelfTest/Baselines/teamcity.sw.approved.txt @@ -585,20 +585,20 @@ Misc.tests.cpp:|nexpression failed|n CHECK( s1 == s2 )|nwith expan ##teamcity[testFinished name='Template test case method with test types specified inside std::tuple - MyTypes - 1' duration="{duration}"] ##teamcity[testStarted name='Template test case method with test types specified inside std::tuple - MyTypes - 2'] ##teamcity[testFinished name='Template test case method with test types specified inside std::tuple - MyTypes - 2' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0'] -##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1'] -##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0'] -##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1'] -##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 0'] -##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 0' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 1'] -##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 1' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 2'] -##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 2' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType'] +##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float'] +##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType'] +##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float'] +##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 0 - int'] +##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 0 - int' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 1 - char'] +##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 1 - char' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 2 - float'] +##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 2 - float' duration="{duration}"] ##teamcity[testStarted name='TemplateTest: vectors can be sized and resized - float'] ##teamcity[testFinished name='TemplateTest: vectors can be sized and resized - float' duration="{duration}"] ##teamcity[testStarted name='TemplateTest: vectors can be sized and resized - int'] diff --git a/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt b/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt index 2b791446..705e2f53 100644 --- a/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt @@ -585,20 +585,20 @@ Misc.tests.cpp:|nexpression failed|n CHECK( s1 == s2 )|nwith expan ##teamcity[testFinished name='Template test case method with test types specified inside std::tuple - MyTypes - 1' duration="{duration}"] ##teamcity[testStarted name='Template test case method with test types specified inside std::tuple - MyTypes - 2'] ##teamcity[testFinished name='Template test case method with test types specified inside std::tuple - MyTypes - 2' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0'] -##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1'] -##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0'] -##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1'] -##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 0'] -##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 0' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 1'] -##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 1' duration="{duration}"] -##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 2'] -##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 2' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType'] +##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float'] +##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType'] +##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float'] +##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 0 - int'] +##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 0 - int' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 1 - char'] +##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 1 - char' duration="{duration}"] +##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 2 - float'] +##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 2 - float' duration="{duration}"] ##teamcity[testStarted name='TemplateTest: vectors can be sized and resized - float'] ##teamcity[testFinished name='TemplateTest: vectors can be sized and resized - float' duration="{duration}"] ##teamcity[testStarted name='TemplateTest: vectors can be sized and resized - int'] diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt index 0167e59c..f8aa75f4 100644 --- a/tests/SelfTest/Baselines/xml.sw.approved.txt +++ b/tests/SelfTest/Baselines/xml.sw.approved.txt @@ -14293,7 +14293,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14304,7 +14304,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14315,7 +14315,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14326,7 +14326,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14337,7 +14337,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14348,7 +14348,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14359,7 +14359,7 @@ Message from section two - + sizeof(TestType) > 0 diff --git a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt index 7a88f7de..691853d5 100644 --- a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt @@ -14293,7 +14293,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14304,7 +14304,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14315,7 +14315,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14326,7 +14326,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14337,7 +14337,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14348,7 +14348,7 @@ Message from section two - + sizeof(TestType) > 0 @@ -14359,7 +14359,7 @@ Message from section two - + sizeof(TestType) > 0