Enable configuration of Catch2 test naming

Catch2 produces tests names with spaces by default when using
type-parametric macros like `TEMPLATE_TEST_CASE` and
`TEMPLATE_PRODUCT_TEST_CASE`. For some test-runners that are
incompatible with spaces in test names, this presents a significant
problem: It's possible to define a test that's impossible to run.

This adds a `CATCH_CONFIG_NAME_SEPARATOR` configuration value that can
be used to override the separator string used during test naming.

BUILD.bazel

@@ -30,6 +30,7 @@ expand_template(
         "#cmakedefine CATCH_CONFIG_FAST_COMPILE": "",
         "#cmakedefine CATCH_CONFIG_GETENV": "",
         "#cmakedefine CATCH_CONFIG_GLOBAL_NEXTAFTER": "",
+        "#cmakedefine CATCH_CONFIG_NAME_SEPARATOR": "",
         "#cmakedefine CATCH_CONFIG_NO_ANDROID_LOGWRITE": "",
         "#cmakedefine CATCH_CONFIG_NO_COLOUR_WIN32": "",
         "#cmakedefine CATCH_CONFIG_NO_COUNTER": "",

src/catch2/catch_user_config.hpp.in

@@ -210,6 +210,7 @@
 
 #define CATCH_CONFIG_DEFAULT_REPORTER "@CATCH_CONFIG_DEFAULT_REPORTER@"
 #define CATCH_CONFIG_CONSOLE_WIDTH @CATCH_CONFIG_CONSOLE_WIDTH@
+#cmakedefine CATCH_CONFIG_NAME_SEPARATOR
 
 // Unlike the macros above, CATCH_CONFIG_FALLBACK_STRINGIFIER does not
 // have a good default value, so we cannot always define it, and cannot

src/catch2/internal/catch_template_test_registry.hpp

@@ -22,6 +22,12 @@
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
 
+#ifdef CATCH_CONFIG_NAME_SEPARATOR
+#define INTERNAL_CATCH_CONFIG_NAME_SEPARATOR CATCH_CONFIG_NAME_SEPARATOR
+#else
+#define INTERNAL_CATCH_CONFIG_NAME_SEPARATOR " - "
+#endif
+
 #if defined(CATCH_CONFIG_DISABLE)
     #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
         INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
@@ -87,7 +93,7 @@
                     size_t index = 0;                                    \
                     constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)}; /* NOLINT(cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays,hicpp-avoid-c-arrays) */\
                     using expander = size_t[]; /* NOLINT(cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays,hicpp-avoid-c-arrays) */\
-                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name INTERNAL_CATCH_CONFIG_NAME_SEPARATOR + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
                 }\
             };\
             static const int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
@@ -135,7 +141,7 @@
                     constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
                     constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
                     constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + '<' + std::string(types_list[index % num_types]) + '>', Tags } ), index++)... };/* NOLINT */\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name INTERNAL_CATCH_CONFIG_NAME_SEPARATOR + std::string(tmpl_types[index / num_types]) + '<' + std::string(types_list[index % num_types]) + '>', Tags } ), index++)... };/* NOLINT */\
                 }                                                     \
             };                                                        \
             static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
@@ -181,7 +187,7 @@
             void reg_tests() {                                          \
                 size_t index = 0;                                    \
                 using expander = size_t[];                           \
-                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " INTERNAL_CATCH_STRINGIZE(TmplList) " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
+                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name INTERNAL_CATCH_CONFIG_NAME_SEPARATOR INTERNAL_CATCH_STRINGIZE(TmplList) INTERNAL_CATCH_CONFIG_NAME_SEPARATOR + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
             }                                                     \
         };\
         static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
@@ -217,7 +223,7 @@
                     size_t index = 0;                                    \
                     constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
                     using expander = size_t[];\
-                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name INTERNAL_CATCH_CONFIG_NAME_SEPARATOR + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
                 }\
             };\
             static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
@@ -267,7 +273,7 @@
                     constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
                     constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
                     constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + '<' + std::string(types_list[index % num_types]) + '>', Tags } ), index++)... };/* NOLINT */ \
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name INTERNAL_CATCH_CONFIG_NAME_SEPARATOR + std::string(tmpl_types[index / num_types]) + '<' + std::string(types_list[index % num_types]) + '>', Tags } ), index++)... };/* NOLINT */ \
                 }\
             };\
             static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
@@ -316,7 +322,7 @@
                 void reg_tests(){\
                     size_t index = 0;\
                     using expander = size_t[];\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName##_catch_sr, Catch::NameAndTags{ Name " - " INTERNAL_CATCH_STRINGIZE(TmplList) " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName##_catch_sr, Catch::NameAndTags{ Name INTERNAL_CATCH_CONFIG_NAME_SEPARATOR INTERNAL_CATCH_STRINGIZE(TmplList) INTERNAL_CATCH_CONFIG_NAME_SEPARATOR + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
                 }\
             };\
             static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\

tests/CMakeLists.txt

@@ -114,6 +114,7 @@ set(TEST_SOURCES
         ${SELF_TEST_DIR}/UsageTests/Class.tests.cpp
         ${SELF_TEST_DIR}/UsageTests/Compilation.tests.cpp
         ${SELF_TEST_DIR}/UsageTests/Condition.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/CustomNaming.tests.cpp
         ${SELF_TEST_DIR}/UsageTests/Decomposition.tests.cpp
         ${SELF_TEST_DIR}/UsageTests/EnumToString.tests.cpp
         ${SELF_TEST_DIR}/UsageTests/Exception.tests.cpp

tests/SelfTest/Baselines/automake.sw.approved.txt

@@ -46,6 +46,10 @@ Nor would this
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo<int>
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<float>
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<float>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<int>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<float>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<int>
 :test-result: FAIL A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>
 :test-result: FAIL A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<int, 2>
 :test-result: FAIL A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<float, 6>
@@ -54,18 +58,28 @@ Nor would this
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2<int,2>
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<float,6>
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<float,6>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<int,2>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<float,6>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<int,2>
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD based test run that fails - double
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD based test run that fails - float
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD based test run that fails - int
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - float
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 3
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6
 :test-result: FAIL A TEST_CASE_METHOD based test run that fails
 :test-result: PASS A TEST_CASE_METHOD based test run that succeeds
 :test-result: PASS A Template product test case - Foo<float>
@@ -248,6 +262,9 @@ 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 method with test types specified inside std::tuple with a custom separator--MyTypes--0
+:test-result: PASS Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1
+:test-result: PASS Template test case method with test types specified inside std::tuple with a custom separator--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

tests/SelfTest/Baselines/automake.sw.multi.approved.txt

@@ -44,6 +44,10 @@
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo<int>
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<float>
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<float>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<int>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<float>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<int>
 :test-result: FAIL A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>
 :test-result: FAIL A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<int, 2>
 :test-result: FAIL A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<float, 6>
@@ -52,18 +56,28 @@
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2<int,2>
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<float,6>
 :test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<float,6>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<int,2>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<float,6>
+:test-result: PASS A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<int,2>
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD based test run that fails - double
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD based test run that fails - float
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD based test run that fails - int
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - float
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3
 :test-result: FAIL A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 3
 :test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3
+:test-result: PASS A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6
 :test-result: FAIL A TEST_CASE_METHOD based test run that fails
 :test-result: PASS A TEST_CASE_METHOD based test run that succeeds
 :test-result: PASS A Template product test case - Foo<float>
@@ -241,6 +255,9 @@
 :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 method with test types specified inside std::tuple with a custom separator--MyTypes--0
+:test-result: PASS Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1
+:test-result: PASS Template test case method with test types specified inside std::tuple with a custom separator--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

tests/SelfTest/Baselines/compact.sw.approved.txt

@@ -219,6 +219,10 @@ Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size()
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 Class.tests.cpp:<line number>: failed: Template_Fixture_2<TestType>{}.m_a.size() < 2 for: 6 < 2
 Class.tests.cpp:<line number>: failed: Template_Fixture_2<TestType>{}.m_a.size() < 2 for: 2 < 2
 Class.tests.cpp:<line number>: failed: Template_Fixture_2<TestType>{}.m_a.size() < 2 for: 6 < 2
@@ -227,18 +231,28 @@ Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size()
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
 Class.tests.cpp:<line number>: failed: Template_Fixture<TestType>::m_a == 2 for: 1.0 == 2
 Class.tests.cpp:<line number>: failed: Template_Fixture<TestType>::m_a == 2 for: 1.0f == 2
 Class.tests.cpp:<line number>: failed: Template_Fixture<TestType>::m_a == 2 for: 1 == 2
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0f == 1
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0f == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 Class.tests.cpp:<line number>: failed: Nttp_Fixture<V>::value == 0 for: 1 == 0
 Class.tests.cpp:<line number>: failed: Nttp_Fixture<V>::value == 0 for: 3 == 0
 Class.tests.cpp:<line number>: failed: Nttp_Fixture<V>::value == 0 for: 6 == 0
 Class.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 1 > 0
 Class.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 3 > 0
 Class.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 6 > 0
+CustomNaming.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 1 > 0
+CustomNaming.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 3 > 0
+CustomNaming.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 6 > 0
 Class.tests.cpp:<line number>: failed: m_a == 2 for: 1 == 2
 Class.tests.cpp:<line number>: passed: m_a == 1 for: 1 == 1
 Misc.tests.cpp:<line number>: passed: x.size() == 0 for: 0 == 0
@@ -1737,6 +1751,9 @@ Tag.tests.cpp:<line number>: passed: testCase.tags, VectorContains( Tag( "tag wi
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
 Misc.tests.cpp:<line number>: passed: sizeof(TestType) > 0 for: 1 > 0
 Misc.tests.cpp:<line number>: passed: sizeof(TestType) > 0 for: 4 > 0
 Misc.tests.cpp:<line number>: passed: sizeof(TestType) > 0 for: 1 > 0
@@ -2689,7 +2706,7 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
 InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
 Misc.tests.cpp:<line number>: passed:
 Misc.tests.cpp:<line number>: passed:
-test cases:  417 |  312 passed |  85 failed | 6 skipped | 14 failed as expected
+test cases:  434 |  329 passed |  85 failed | 6 skipped | 14 failed as expected
-assertions: 2260 | 2079 passed | 146 failed | 35 failed as expected
+assertions: 2277 | 2096 passed | 146 failed | 35 failed as expected
 
 

tests/SelfTest/Baselines/compact.sw.multi.approved.txt

@@ -217,6 +217,10 @@ Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size()
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 Class.tests.cpp:<line number>: failed: Template_Fixture_2<TestType>{}.m_a.size() < 2 for: 6 < 2
 Class.tests.cpp:<line number>: failed: Template_Fixture_2<TestType>{}.m_a.size() < 2 for: 2 < 2
 Class.tests.cpp:<line number>: failed: Template_Fixture_2<TestType>{}.m_a.size() < 2 for: 6 < 2
@@ -225,18 +229,28 @@ Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size()
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
 Class.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
 Class.tests.cpp:<line number>: failed: Template_Fixture<TestType>::m_a == 2 for: 1.0 == 2
 Class.tests.cpp:<line number>: failed: Template_Fixture<TestType>::m_a == 2 for: 1.0f == 2
 Class.tests.cpp:<line number>: failed: Template_Fixture<TestType>::m_a == 2 for: 1 == 2
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0f == 1
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0f == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 Class.tests.cpp:<line number>: failed: Nttp_Fixture<V>::value == 0 for: 1 == 0
 Class.tests.cpp:<line number>: failed: Nttp_Fixture<V>::value == 0 for: 3 == 0
 Class.tests.cpp:<line number>: failed: Nttp_Fixture<V>::value == 0 for: 6 == 0
 Class.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 1 > 0
 Class.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 3 > 0
 Class.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 6 > 0
+CustomNaming.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 1 > 0
+CustomNaming.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 3 > 0
+CustomNaming.tests.cpp:<line number>: passed: Nttp_Fixture<V>::value > 0 for: 6 > 0
 Class.tests.cpp:<line number>: failed: m_a == 2 for: 1 == 2
 Class.tests.cpp:<line number>: passed: m_a == 1 for: 1 == 1
 Misc.tests.cpp:<line number>: passed: x.size() == 0 for: 0 == 0
@@ -1730,6 +1744,9 @@ Tag.tests.cpp:<line number>: passed: testCase.tags, VectorContains( Tag( "tag wi
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 Class.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+CustomNaming.tests.cpp:<line number>: passed: Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
 Misc.tests.cpp:<line number>: passed: sizeof(TestType) > 0 for: 1 > 0
 Misc.tests.cpp:<line number>: passed: sizeof(TestType) > 0 for: 4 > 0
 Misc.tests.cpp:<line number>: passed: sizeof(TestType) > 0 for: 1 > 0
@@ -2678,7 +2695,7 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
 InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
 Misc.tests.cpp:<line number>: passed:
 Misc.tests.cpp:<line number>: passed:
-test cases:  417 |  312 passed |  85 failed | 6 skipped | 14 failed as expected
+test cases:  434 |  329 passed |  85 failed | 6 skipped | 14 failed as expected
-assertions: 2260 | 2079 passed | 146 failed | 35 failed as expected
+assertions: 2277 | 2096 passed | 146 failed | 35 failed as expected
 
 

tests/SelfTest/Baselines/console.std.approved.txt

@@ -1588,6 +1588,6 @@ due to unexpected exception with message:
   Why would you throw a std::string?
 
 ===============================================================================
-test cases:  417 |  326 passed |  70 failed | 7 skipped | 14 failed as expected
+test cases:  434 |  343 passed |  70 failed | 7 skipped | 14 failed as expected
-assertions: 2243 | 2079 passed | 129 failed | 35 failed as expected
+assertions: 2260 | 2096 passed | 129 failed | 35 failed as expected
 

tests/SelfTest/Baselines/console.sw.approved.txt

@@ -1778,6 +1778,54 @@ Class.tests.cpp:<line number>: PASSED:
 with expansion:
   0 == 0
 
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--
+Template_Foo<float>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--
+Template_Foo<int>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::
+vector<float>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::
+vector<int>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 0 )
+with expansion:
+  0 == 0
+
 -------------------------------------------------------------------------------
 A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails -
 Template_Foo_2<float, 6>
@@ -1874,6 +1922,54 @@ Class.tests.cpp:<line number>: PASSED:
 with expansion:
   2 >= 2
 
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--
+Template_Foo_2<float,6>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() >= 2 )
+with expansion:
+  6 >= 2
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--
+Template_Foo_2<int,2>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() >= 2 )
+with expansion:
+  2 >= 2
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--
+std::array<float,6>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() >= 2 )
+with expansion:
+  6 >= 2
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--
+std::array<int,2>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() >= 2 )
+with expansion:
+  2 >= 2
+
 -------------------------------------------------------------------------------
 A TEMPLATE_TEST_CASE_METHOD based test run that fails - double
 -------------------------------------------------------------------------------
@@ -1940,6 +2036,39 @@ Class.tests.cpp:<line number>: PASSED:
 with expansion:
   1 == 1
 
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1.0 == 1
+
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1.0f == 1
+
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1 == 1
+
 -------------------------------------------------------------------------------
 A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1
 -------------------------------------------------------------------------------
@@ -2006,6 +2135,39 @@ Class.tests.cpp:<line number>: PASSED:
 with expansion:
   6 > 0
 
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Nttp_Fixture<V>::value > 0 )
+with expansion:
+  1 > 0
+
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Nttp_Fixture<V>::value > 0 )
+with expansion:
+  3 > 0
+
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Nttp_Fixture<V>::value > 0 )
+with expansion:
+  6 > 0
+
 -------------------------------------------------------------------------------
 A TEST_CASE_METHOD based test run that fails
 -------------------------------------------------------------------------------
@@ -11667,6 +11829,42 @@ Class.tests.cpp:<line number>: PASSED:
 with expansion:
   1.0 == 1
 
+-------------------------------------------------------------------------------
+Template test case method with test types specified inside std::tuple with a
+custom separator--MyTypes--0
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+Template test case method with test types specified inside std::tuple with a
+custom separator--MyTypes--1
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+Template test case method with test types specified inside std::tuple with a
+custom separator--MyTypes--2
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1.0 == 1
+
 -------------------------------------------------------------------------------
 Template test case with test types specified inside non-copyable and non-
 movable std::tuple - NonCopyableAndNonMovableTypes - 0
@@ -18751,6 +18949,6 @@ Misc.tests.cpp:<line number>
 Misc.tests.cpp:<line number>: PASSED:
 
 ===============================================================================
-test cases:  417 |  312 passed |  85 failed | 6 skipped | 14 failed as expected
+test cases:  434 |  329 passed |  85 failed | 6 skipped | 14 failed as expected
-assertions: 2260 | 2079 passed | 146 failed | 35 failed as expected
+assertions: 2277 | 2096 passed | 146 failed | 35 failed as expected
 

tests/SelfTest/Baselines/console.sw.multi.approved.txt

@@ -1776,6 +1776,54 @@ Class.tests.cpp:<line number>: PASSED:
 with expansion:
   0 == 0
 
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--
+Template_Foo<float>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--
+Template_Foo<int>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::
+vector<float>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::
+vector<int>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 0 )
+with expansion:
+  0 == 0
+
 -------------------------------------------------------------------------------
 A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails -
 Template_Foo_2<float, 6>
@@ -1872,6 +1920,54 @@ Class.tests.cpp:<line number>: PASSED:
 with expansion:
   2 >= 2
 
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--
+Template_Foo_2<float,6>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() >= 2 )
+with expansion:
+  6 >= 2
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--
+Template_Foo_2<int,2>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() >= 2 )
+with expansion:
+  2 >= 2
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--
+std::array<float,6>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() >= 2 )
+with expansion:
+  6 >= 2
+
+-------------------------------------------------------------------------------
+A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--
+std::array<int,2>
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() >= 2 )
+with expansion:
+  2 >= 2
+
 -------------------------------------------------------------------------------
 A TEMPLATE_TEST_CASE_METHOD based test run that fails - double
 -------------------------------------------------------------------------------
@@ -1938,6 +2034,39 @@ Class.tests.cpp:<line number>: PASSED:
 with expansion:
   1 == 1
 
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1.0 == 1
+
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1.0f == 1
+
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1 == 1
+
 -------------------------------------------------------------------------------
 A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1
 -------------------------------------------------------------------------------
@@ -2004,6 +2133,39 @@ Class.tests.cpp:<line number>: PASSED:
 with expansion:
   6 > 0
 
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Nttp_Fixture<V>::value > 0 )
+with expansion:
+  1 > 0
+
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Nttp_Fixture<V>::value > 0 )
+with expansion:
+  3 > 0
+
+-------------------------------------------------------------------------------
+A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Nttp_Fixture<V>::value > 0 )
+with expansion:
+  6 > 0
+
 -------------------------------------------------------------------------------
 A TEST_CASE_METHOD based test run that fails
 -------------------------------------------------------------------------------
@@ -11660,6 +11822,42 @@ Class.tests.cpp:<line number>: PASSED:
 with expansion:
   1.0 == 1
 
+-------------------------------------------------------------------------------
+Template test case method with test types specified inside std::tuple with a
+custom separator--MyTypes--0
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+Template test case method with test types specified inside std::tuple with a
+custom separator--MyTypes--1
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+Template test case method with test types specified inside std::tuple with a
+custom separator--MyTypes--2
+-------------------------------------------------------------------------------
+CustomNaming.tests.cpp:<line number>
+...............................................................................
+
+CustomNaming.tests.cpp:<line number>: PASSED:
+  REQUIRE( Template_Fixture<TestType>::m_a == 1 )
+with expansion:
+  1.0 == 1
+
 -------------------------------------------------------------------------------
 Template test case with test types specified inside non-copyable and non-
 movable std::tuple - NonCopyableAndNonMovableTypes - 0
@@ -18740,6 +18938,6 @@ Misc.tests.cpp:<line number>
 Misc.tests.cpp:<line number>: PASSED:
 
 ===============================================================================
-test cases:  417 |  312 passed |  85 failed | 6 skipped | 14 failed as expected
+test cases:  434 |  329 passed |  85 failed | 6 skipped | 14 failed as expected
-assertions: 2260 | 2079 passed | 146 failed | 35 failed as expected
+assertions: 2277 | 2096 passed | 146 failed | 35 failed as expected
 

tests/SelfTest/Baselines/junit.sw.approved.txt

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuitesloose text artifact
 >
-  <testsuite name="<exe-name>" errors="17" failures="129" skipped="12" tests="2272" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="17" failures="129" skipped="12" tests="2289" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <properties>
       <property name="random-seed" value="1"/>
       <property name="filters" value="&quot;*&quot; ~[!nonportable] ~[!benchmark] ~[approvals]"/>
@@ -203,6 +203,10 @@ at Class.tests.cpp:<line number>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo&lt;int>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector&lt;float>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector&lt;int>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;float>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;int>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;float>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;int>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2&lt;float, 6>" time="{duration}" status="run">
       <failure message="Template_Fixture_2&lt;TestType>{}.m_a.size() &lt; 2" type="REQUIRE">
 FAILED:
@@ -243,6 +247,10 @@ at Class.tests.cpp:<line number>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2&lt;int,2>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array&lt;float,6>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array&lt;int,2>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;float,6>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;int,2>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;float,6>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;int,2>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that fails - double" time="{duration}" status="run">
       <failure message="Template_Fixture&lt;TestType>::m_a == 2" type="REQUIRE">
 FAILED:
@@ -273,6 +281,9 @@ at Class.tests.cpp:<line number>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - float" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1" time="{duration}" status="run">
       <failure message="Nttp_Fixture&lt;V>::value == 0" type="REQUIRE">
 FAILED:
@@ -303,6 +314,9 @@ at Class.tests.cpp:<line number>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 3" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Fixture" name="A TEST_CASE_METHOD based test run that fails" time="{duration}" status="run">
       <failure message="m_a == 2" type="REQUIRE">
 FAILED:
@@ -1326,6 +1340,9 @@ at Misc.tests.cpp:<line number>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 0" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 1" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 2" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--0" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--2" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0" time="{duration}" status="run"/>

tests/SelfTest/Baselines/junit.sw.multi.approved.txt

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-  <testsuite name="<exe-name>" errors="17" failures="129" skipped="12" tests="2272" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="17" failures="129" skipped="12" tests="2289" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <properties>
       <property name="random-seed" value="1"/>
       <property name="filters" value="&quot;*&quot; ~[!nonportable] ~[!benchmark] ~[approvals]"/>
@@ -202,6 +202,10 @@ at Class.tests.cpp:<line number>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo&lt;int>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector&lt;float>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector&lt;int>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;float>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;int>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;float>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;int>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2&lt;float, 6>" time="{duration}" status="run">
       <failure message="Template_Fixture_2&lt;TestType>{}.m_a.size() &lt; 2" type="REQUIRE">
 FAILED:
@@ -242,6 +246,10 @@ at Class.tests.cpp:<line number>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2&lt;int,2>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array&lt;float,6>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array&lt;int,2>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;float,6>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;int,2>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;float,6>" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;int,2>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that fails - double" time="{duration}" status="run">
       <failure message="Template_Fixture&lt;TestType>::m_a == 2" type="REQUIRE">
 FAILED:
@@ -272,6 +280,9 @@ at Class.tests.cpp:<line number>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - float" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1" time="{duration}" status="run">
       <failure message="Nttp_Fixture&lt;V>::value == 0" type="REQUIRE">
 FAILED:
@@ -302,6 +313,9 @@ at Class.tests.cpp:<line number>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 3" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Fixture" name="A TEST_CASE_METHOD based test run that fails" time="{duration}" status="run">
       <failure message="m_a == 2" type="REQUIRE">
 FAILED:
@@ -1325,6 +1339,9 @@ at Misc.tests.cpp:<line number>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 0" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 1" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 2" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--0" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--2" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0" time="{duration}" status="run"/>

tests/SelfTest/Baselines/sonarqube.sw.approved.txt

@@ -890,6 +890,25 @@ at Condition.tests.cpp:<line number>
     <testCase name="comparisons between const int variables" duration="{duration}"/>
     <testCase name="comparisons between int variables" duration="{duration}"/>
   </file>
+  <file path="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp">
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;float>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;int>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;float>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;int>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;float,6>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;int,2>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;float,6>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;int,2>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6" duration="{duration}"/>
+    <testCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--0" duration="{duration}"/>
+    <testCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1" duration="{duration}"/>
+    <testCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--2" duration="{duration}"/>
+  </file>
   <file path="tests/<exe-name>/UsageTests/Decomposition.tests.cpp">
     <testCase name="Reconstruction should be based on stringification: #914" duration="{duration}">
       <failure message="CHECK(truthy(false))">

tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt

@@ -889,6 +889,25 @@ at Condition.tests.cpp:<line number>
     <testCase name="comparisons between const int variables" duration="{duration}"/>
     <testCase name="comparisons between int variables" duration="{duration}"/>
   </file>
+  <file path="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp">
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;float>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;int>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;float>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;int>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;float,6>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;int,2>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;float,6>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;int,2>" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3" duration="{duration}"/>
+    <testCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6" duration="{duration}"/>
+    <testCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--0" duration="{duration}"/>
+    <testCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1" duration="{duration}"/>
+    <testCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--2" duration="{duration}"/>
+  </file>
   <file path="tests/<exe-name>/UsageTests/Decomposition.tests.cpp">
     <testCase name="Reconstruction should be based on stringification: #914" duration="{duration}">
       <failure message="CHECK(truthy(false))">

tests/SelfTest/Baselines/tap.sw.approved.txt

@@ -434,6 +434,14 @@ ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 # A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>
 ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<float>
+ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<int>
+ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<float>
+ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<int>
+ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 # A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>
 not ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() < 2 for: 6 < 2
 # A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<int, 2>
@@ -450,6 +458,14 @@ ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
 ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
 # A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>
 ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<float,6>
+ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<int,2>
+ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<float,6>
+ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<int,2>
+ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
 # A TEMPLATE_TEST_CASE_METHOD based test run that fails - double
 not ok {test-number} - Template_Fixture<TestType>::m_a == 2 for: 1.0 == 2
 # A TEMPLATE_TEST_CASE_METHOD based test run that fails - float
@@ -462,6 +478,12 @@ ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0f == 1
 # A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+# A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
+# A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0f == 1
+# A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 # A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1
 not ok {test-number} - Nttp_Fixture<V>::value == 0 for: 1 == 0
 # A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3
@@ -474,6 +496,12 @@ ok {test-number} - Nttp_Fixture<V>::value > 0 for: 1 > 0
 ok {test-number} - Nttp_Fixture<V>::value > 0 for: 3 > 0
 # A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6
 ok {test-number} - Nttp_Fixture<V>::value > 0 for: 6 > 0
+# A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1
+ok {test-number} - Nttp_Fixture<V>::value > 0 for: 1 > 0
+# A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3
+ok {test-number} - Nttp_Fixture<V>::value > 0 for: 3 > 0
+# A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6
+ok {test-number} - Nttp_Fixture<V>::value > 0 for: 6 > 0
 # A TEST_CASE_METHOD based test run that fails
 not ok {test-number} - m_a == 2 for: 1 == 2
 # A TEST_CASE_METHOD based test run that succeeds
@@ -2811,6 +2839,12 @@ ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 # Template test case method with test types specified inside std::tuple - MyTypes - 2
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
+# Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--0
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+# Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+# Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--2
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
 # Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0
 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
@@ -4549,5 +4583,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
 ok {test-number} -
 # xmlentitycheck
 ok {test-number} -
-1..2272
+1..2289
 

tests/SelfTest/Baselines/tap.sw.multi.approved.txt

@@ -432,6 +432,14 @@ ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 # A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>
 ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<float>
+ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<int>
+ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<float>
+ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<int>
+ok {test-number} - Template_Fixture_2<TestType>::m_a.size() == 0 for: 0 == 0
 # A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>
 not ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() < 2 for: 6 < 2
 # A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<int, 2>
@@ -448,6 +456,14 @@ ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
 ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
 # A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>
 ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<float,6>
+ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<int,2>
+ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<float,6>
+ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 6 >= 2
+# A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<int,2>
+ok {test-number} - Template_Fixture_2<TestType>{}.m_a.size() >= 2 for: 2 >= 2
 # A TEMPLATE_TEST_CASE_METHOD based test run that fails - double
 not ok {test-number} - Template_Fixture<TestType>::m_a == 2 for: 1.0 == 2
 # A TEMPLATE_TEST_CASE_METHOD based test run that fails - float
@@ -460,6 +476,12 @@ ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0f == 1
 # A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+# A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
+# A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0f == 1
+# A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 # A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1
 not ok {test-number} - Nttp_Fixture<V>::value == 0 for: 1 == 0
 # A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3
@@ -472,6 +494,12 @@ ok {test-number} - Nttp_Fixture<V>::value > 0 for: 1 > 0
 ok {test-number} - Nttp_Fixture<V>::value > 0 for: 3 > 0
 # A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6
 ok {test-number} - Nttp_Fixture<V>::value > 0 for: 6 > 0
+# A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1
+ok {test-number} - Nttp_Fixture<V>::value > 0 for: 1 > 0
+# A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3
+ok {test-number} - Nttp_Fixture<V>::value > 0 for: 3 > 0
+# A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6
+ok {test-number} - Nttp_Fixture<V>::value > 0 for: 6 > 0
 # A TEST_CASE_METHOD based test run that fails
 not ok {test-number} - m_a == 2 for: 1 == 2
 # A TEST_CASE_METHOD based test run that succeeds
@@ -2804,6 +2832,12 @@ ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 # Template test case method with test types specified inside std::tuple - MyTypes - 2
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
+# Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--0
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+# Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
+# Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--2
+ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
 # Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0
 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
@@ -4538,5 +4572,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
 ok {test-number} -
 # xmlentitycheck
 ok {test-number} -
-1..2272
+1..2289
 

tests/SelfTest/Baselines/teamcity.sw.approved.txt

@@ -111,6 +111,14 @@
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<float>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<float>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<float>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<int>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<int>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<float>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<float>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<int>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<int>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>']
 ##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  6 < 2|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>' duration="{duration}"]
@@ -131,6 +139,14 @@
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<float,6>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<float,6>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<float,6>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<int,2>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<int,2>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<float,6>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<float,6>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<int,2>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<int,2>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double']
 ##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1.0 == 2|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double' duration="{duration}"]
@@ -146,6 +162,12 @@
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - float' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1']
 ##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  1 == 0|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1' duration="{duration}"]
@@ -161,6 +183,12 @@
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 3' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6' duration="{duration}"]
 ##teamcity[testStarted name='A TEST_CASE_METHOD based test run that fails']
 ##teamcity[testFailed name='A TEST_CASE_METHOD based test run that fails' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( m_a == 2 )|nwith expansion:|n  1 == 2|n']
 ##teamcity[testFinished name='A TEST_CASE_METHOD based test run that fails' duration="{duration}"]
@@ -605,6 +633,12 @@
 ##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 method with test types specified inside std::tuple with a custom separator--MyTypes--0']
+##teamcity[testFinished name='Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--0' duration="{duration}"]
+##teamcity[testStarted name='Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1']
+##teamcity[testFinished name='Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1' duration="{duration}"]
+##teamcity[testStarted name='Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--2']
+##teamcity[testFinished name='Template test case method with test types specified inside std::tuple with a custom separator--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']

tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt

@@ -111,6 +111,14 @@
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<float>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<float>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<float>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<int>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo<int>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<float>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<float>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<int>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector<int>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>']
 ##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  6 < 2|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>' duration="{duration}"]
@@ -131,6 +139,14 @@
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<float,6>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<float,6>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<float,6>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<int,2>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2<int,2>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<float,6>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<float,6>' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<int,2>']
+##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array<int,2>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double']
 ##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1.0 == 2|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double' duration="{duration}"]
@@ -146,6 +162,12 @@
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - float' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1']
 ##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  1 == 0|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1' duration="{duration}"]
@@ -161,6 +183,12 @@
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 3' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3' duration="{duration}"]
+##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6']
+##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6' duration="{duration}"]
 ##teamcity[testStarted name='A TEST_CASE_METHOD based test run that fails']
 ##teamcity[testFailed name='A TEST_CASE_METHOD based test run that fails' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( m_a == 2 )|nwith expansion:|n  1 == 2|n']
 ##teamcity[testFinished name='A TEST_CASE_METHOD based test run that fails' duration="{duration}"]
@@ -605,6 +633,12 @@
 ##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 method with test types specified inside std::tuple with a custom separator--MyTypes--0']
+##teamcity[testFinished name='Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--0' duration="{duration}"]
+##teamcity[testStarted name='Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1']
+##teamcity[testFinished name='Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1' duration="{duration}"]
+##teamcity[testStarted name='Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--2']
+##teamcity[testFinished name='Template test case method with test types specified inside std::tuple with a custom separator--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']

tests/SelfTest/Baselines/xml.sw.approved.txt

@@ -1814,6 +1814,50 @@ Nor would this
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;float>" tags="[class][custom_separator][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>::m_a.size() == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;int>" tags="[class][custom_separator][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>::m_a.size() == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;float>" tags="[class][custom_separator][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>::m_a.size() == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;int>" tags="[class][custom_separator][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>::m_a.size() == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2&lt;float, 6>" tags="[.][class][failing][nttp][product][template]" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
       <Original>
@@ -1902,6 +1946,50 @@ Nor would this
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;float,6>" tags="[class][custom_separator][nttp][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>{}.m_a.size() >= 2
+      </Original>
+      <Expanded>
+        6 >= 2
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;int,2>" tags="[class][custom_separator][nttp][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>{}.m_a.size() >= 2
+      </Original>
+      <Expanded>
+        2 >= 2
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;float,6>" tags="[class][custom_separator][nttp][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>{}.m_a.size() >= 2
+      </Original>
+      <Expanded>
+        6 >= 2
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;int,2>" tags="[class][custom_separator][nttp][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>{}.m_a.size() >= 2
+      </Original>
+      <Expanded>
+        2 >= 2
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="A TEMPLATE_TEST_CASE_METHOD based test run that fails - double" tags="[.][class][failing][template]" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
       <Original>
@@ -1968,6 +2056,39 @@ Nor would this
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double" tags="[class][custom_separator][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1.0 == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float" tags="[class][custom_separator][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1.0f == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int" tags="[class][custom_separator][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1 == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1" tags="[.][class][failing][nttp][template]" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
       <Original>
@@ -2034,6 +2155,39 @@ Nor would this
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1" tags="[class][custom_separator][nttp][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Nttp_Fixture&lt;V>::value > 0
+      </Original>
+      <Expanded>
+        1 > 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3" tags="[class][custom_separator][nttp][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Nttp_Fixture&lt;V>::value > 0
+      </Original>
+      <Expanded>
+        3 > 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6" tags="[class][custom_separator][nttp][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Nttp_Fixture&lt;V>::value > 0
+      </Original>
+      <Expanded>
+        6 > 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="A TEST_CASE_METHOD based test run that fails" tags="[.][class][failing]" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
       <Original>
@@ -13589,6 +13743,39 @@ Message from section two
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--0" tags="[class][custom_separator][list][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1 == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1" tags="[class][custom_separator][list][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1 == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--2" tags="[class][custom_separator][list][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1.0 == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
@@ -21707,6 +21894,6 @@ b1!
     </Section>
     <OverallResult success="true" skips="0"/>
   </TestCase>
-  <OverallResults successes="2079" failures="146" expectedFailures="35" skips="12"/>
+  <OverallResults successes="2096" failures="146" expectedFailures="35" skips="12"/>
-  <OverallResultsCases successes="312" failures="85" expectedFailures="14" skips="6"/>
+  <OverallResultsCases successes="329" failures="85" expectedFailures="14" skips="6"/>
 </Catch2TestRun>

tests/SelfTest/Baselines/xml.sw.multi.approved.txt

@@ -1814,6 +1814,50 @@ Nor would this
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;float>" tags="[class][custom_separator][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>::m_a.size() == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--Template_Foo&lt;int>" tags="[class][custom_separator][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>::m_a.size() == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;float>" tags="[class][custom_separator][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>::m_a.size() == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator--std::vector&lt;int>" tags="[class][custom_separator][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>::m_a.size() == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2&lt;float, 6>" tags="[.][class][failing][nttp][product][template]" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
       <Original>
@@ -1902,6 +1946,50 @@ Nor would this
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;float,6>" tags="[class][custom_separator][nttp][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>{}.m_a.size() >= 2
+      </Original>
+      <Expanded>
+        6 >= 2
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--Template_Foo_2&lt;int,2>" tags="[class][custom_separator][nttp][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>{}.m_a.size() >= 2
+      </Original>
+      <Expanded>
+        2 >= 2
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;float,6>" tags="[class][custom_separator][nttp][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>{}.m_a.size() >= 2
+      </Original>
+      <Expanded>
+        6 >= 2
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator--std::array&lt;int,2>" tags="[class][custom_separator][nttp][product][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture_2&lt;TestType>{}.m_a.size() >= 2
+      </Original>
+      <Expanded>
+        2 >= 2
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="A TEMPLATE_TEST_CASE_METHOD based test run that fails - double" tags="[.][class][failing][template]" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
       <Original>
@@ -1968,6 +2056,39 @@ Nor would this
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--double" tags="[class][custom_separator][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1.0 == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--float" tags="[class][custom_separator][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1.0f == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD based test with a custom separator--int" tags="[class][custom_separator][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1 == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1" tags="[.][class][failing][nttp][template]" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
       <Original>
@@ -2034,6 +2155,39 @@ Nor would this
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--1" tags="[class][custom_separator][nttp][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Nttp_Fixture&lt;V>::value > 0
+      </Original>
+      <Expanded>
+        1 > 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--3" tags="[class][custom_separator][nttp][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Nttp_Fixture&lt;V>::value > 0
+      </Original>
+      <Expanded>
+        3 > 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator--6" tags="[class][custom_separator][nttp][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Nttp_Fixture&lt;V>::value > 0
+      </Original>
+      <Expanded>
+        6 > 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="A TEST_CASE_METHOD based test run that fails" tags="[.][class][failing]" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Class.tests.cpp" >
       <Original>
@@ -13589,6 +13743,39 @@ Message from section two
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--0" tags="[class][custom_separator][list][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1 == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--1" tags="[class][custom_separator][list][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1 == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="Template test case method with test types specified inside std::tuple with a custom separator--MyTypes--2" tags="[class][custom_separator][list][template]" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/CustomNaming.tests.cpp" >
+      <Original>
+        Template_Fixture&lt;TestType>::m_a == 1
+      </Original>
+      <Expanded>
+        1.0 == 1
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
@@ -21706,6 +21893,6 @@ b1!
     </Section>
     <OverallResult success="true" skips="0"/>
   </TestCase>
-  <OverallResults successes="2079" failures="146" expectedFailures="35" skips="12"/>
+  <OverallResults successes="2096" failures="146" expectedFailures="35" skips="12"/>
-  <OverallResultsCases successes="312" failures="85" expectedFailures="14" skips="6"/>
+  <OverallResultsCases successes="329" failures="85" expectedFailures="14" skips="6"/>
 </Catch2TestRun>

tests/SelfTest/UsageTests/CustomNaming.tests.cpp

@@ -0,0 +1,69 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+// `CATCH_CONFIG_NAME_SEPARATOR` should control how parameterized tests are named.
+// It must be defined before the macro header is included.
+#define CATCH_CONFIG_NAME_SEPARATOR "--"
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <array>
+
+namespace {
+
+    template <typename T> struct Template_Fixture {
+        Template_Fixture(): m_a( 1 ) {}
+
+        T m_a;
+    };
+
+    template <typename T> struct Template_Fixture_2 {
+        Template_Fixture_2() {}
+
+        T m_a;
+    };
+
+    template <typename T> struct Template_Foo {
+        size_t size() { return 0; }
+    };
+
+    template <typename T, size_t V> struct Template_Foo_2 {
+        size_t size() { return V; }
+    };
+
+    template <int V> struct Nttp_Fixture { int value = V; };
+
+} // end unnamed namespace
+
+TEMPLATE_TEST_CASE_METHOD(Template_Fixture, "A TEMPLATE_TEST_CASE_METHOD based test with a custom separator", "[class][template][custom_separator]", int, float, double) {
+    REQUIRE( Template_Fixture<TestType>::m_a == 1 );
+}
+
+TEMPLATE_TEST_CASE_METHOD_SIG(Nttp_Fixture, "A TEMPLATE_TEST_CASE_METHOD_SIG based test with a custom separator", "[class][template][nttp][custom_separator]",((int V), V), 1, 3, 6) {
+    REQUIRE(Nttp_Fixture<V>::value > 0);
+}
+
+TEMPLATE_PRODUCT_TEST_CASE_METHOD(Template_Fixture_2, "A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test with a custom separator","[class][template][product][custom_separator]",(std::vector,Template_Foo),(int,float))
+{
+    REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 0 );
+}
+
+TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG(Template_Fixture_2, "A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test with a custom separator", "[class][template][product][nttp][custom_separator]", ((typename T, size_t S), T, S),(std::array, Template_Foo_2), ((int,2), (float,6)))
+{
+    REQUIRE(Template_Fixture_2<TestType>{}.m_a.size() >= 2);
+}
+
+using MyTypes = std::tuple<int, char, double>;
+TEMPLATE_LIST_TEST_CASE_METHOD(Template_Fixture, "Template test case method with test types specified inside std::tuple with a custom separator", "[class][template][list][custom_separator]", MyTypes)
+{
+    REQUIRE( Template_Fixture<TestType>::m_a == 1 );
+}