Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/projects/SelfTest/IntrospectiveTests
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-11-04 21:35:57 +0100
committerMartin Hořeňovský2019-11-14 10:52:34 +0100
commit302e2c0b06f131199b97ad33bdebacc359782ff0 (patch)
tree26e80b38b48739573de4225e789096ec83c79357 /projects/SelfTest/IntrospectiveTests
parent019b0a0fe0398a5b73937b9a1901b3dfaecac386 (diff)
downloadcatch3-302e2c0b06f131199b97ad33bdebacc359782ff0.tar.gz
Do not copy around TestCaseInfo
Now a `TEST_CASE` macro should create a single TestCaseInfo and then it should never be copied around. This, together with latter changes, should significantly decrease the number of allocations made before `main` is even entered.
Diffstat (limited to 'projects/SelfTest/IntrospectiveTests')
-rw-r--r--projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp253
-rw-r--r--projects/SelfTest/IntrospectiveTests/Tag.tests.cpp4
2 files changed, 130 insertions, 127 deletions
diff --git a/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp b/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
index 8fccc0ab..d5ebeb18 100644
--- a/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
+++ b/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
@@ -8,6 +8,7 @@
#include "catch.hpp"
#include "internal/catch_test_spec_parser.h"
+#include "internal/catch_test_case_info.h"
#include "internal/catch_config.hpp"
#include "internal/catch_commandline.h"
@@ -15,269 +16,271 @@
# pragma clang diagnostic ignored "-Wc++98-compat"
#endif
-inline Catch::TestCase fakeTestCase(const char* name, const char* desc = "") { return Catch::makeTestCase(nullptr, "", { name, desc }, CATCH_INTERNAL_LINEINFO); }
+namespace {
+ auto fakeTestCase(const char* name, const char* desc = "") { return Catch::makeTestCaseInfo("", { name, desc }, CATCH_INTERNAL_LINEINFO); }
+}
TEST_CASE( "Parse test names and tags" ) {
using Catch::parseTestSpec;
using Catch::TestSpec;
- Catch::TestCase tcA = fakeTestCase( "a" );
- Catch::TestCase tcB = fakeTestCase( "b", "[one][x]" );
- Catch::TestCase tcC = fakeTestCase( "longer name with spaces", "[two][three][.][x]" );
- Catch::TestCase tcD = fakeTestCase( "zlonger name with spacesz" );
+ auto tcA = fakeTestCase( "a" );
+ auto tcB = fakeTestCase( "b", "[one][x]" );
+ auto tcC = fakeTestCase( "longer name with spaces", "[two][three][.][x]" );
+ auto tcD = fakeTestCase( "zlonger name with spacesz" );
SECTION( "Empty test spec should have no filters" ) {
TestSpec spec;
CHECK( spec.hasFilters() == false );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
}
SECTION( "Test spec from empty string should have no filters" ) {
TestSpec spec = parseTestSpec( "" );
CHECK( spec.hasFilters() == false );
- CHECK( spec.matches(tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
}
SECTION( "Test spec from just a comma should have no filters" ) {
TestSpec spec = parseTestSpec( "," );
CHECK( spec.hasFilters() == false );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
}
SECTION( "Test spec from name should have one filter" ) {
TestSpec spec = parseTestSpec( "b" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == true );
}
SECTION( "Test spec from quoted name should have one filter" ) {
TestSpec spec = parseTestSpec( "\"b\"" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == true );
}
SECTION( "Test spec from name should have one filter" ) {
TestSpec spec = parseTestSpec( "b" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == true );
- CHECK( spec.matches( tcC ) == false );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == true );
+ CHECK( spec.matches( *tcC ) == false );
}
SECTION( "Wildcard at the start" ) {
TestSpec spec = parseTestSpec( "*spaces" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == true );
- CHECK( spec.matches( tcD ) == false );
- CHECK( parseTestSpec( "*a" ).matches( tcA ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == true );
+ CHECK( spec.matches( *tcD ) == false );
+ CHECK( parseTestSpec( "*a" ).matches( *tcA ) == true );
}
SECTION( "Wildcard at the end" ) {
TestSpec spec = parseTestSpec( "long*" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == true );
- CHECK( spec.matches( tcD ) == false );
- CHECK( parseTestSpec( "a*" ).matches( tcA ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == true );
+ CHECK( spec.matches( *tcD ) == false );
+ CHECK( parseTestSpec( "a*" ).matches( *tcA ) == true );
}
SECTION( "Wildcard at both ends" ) {
TestSpec spec = parseTestSpec( "*name*" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == true );
- CHECK( spec.matches( tcD ) == true );
- CHECK( parseTestSpec( "*a*" ).matches( tcA ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == true );
+ CHECK( spec.matches( *tcD ) == true );
+ CHECK( parseTestSpec( "*a*" ).matches( *tcA ) == true );
}
SECTION( "Redundant wildcard at the start" ) {
TestSpec spec = parseTestSpec( "*a" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == true );
- CHECK( spec.matches( tcB ) == false );
+ CHECK( spec.matches( *tcA ) == true );
+ CHECK( spec.matches( *tcB ) == false );
}
SECTION( "Redundant wildcard at the end" ) {
TestSpec spec = parseTestSpec( "a*" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == true );
- CHECK( spec.matches( tcB ) == false );
+ CHECK( spec.matches( *tcA ) == true );
+ CHECK( spec.matches( *tcB ) == false );
}
SECTION( "Redundant wildcard at both ends" ) {
TestSpec spec = parseTestSpec( "*a*" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == true );
- CHECK( spec.matches( tcB ) == false );
+ CHECK( spec.matches( *tcA ) == true );
+ CHECK( spec.matches( *tcB ) == false );
}
SECTION( "Wildcard at both ends, redundant at start" ) {
TestSpec spec = parseTestSpec( "*longer*" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == true );
- CHECK( spec.matches( tcD ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == true );
+ CHECK( spec.matches( *tcD ) == true );
}
SECTION( "Just wildcard" ) {
TestSpec spec = parseTestSpec( "*" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == true );
- CHECK( spec.matches( tcB ) == true );
- CHECK( spec.matches( tcC ) == true );
- CHECK( spec.matches( tcD ) == true );
+ CHECK( spec.matches( *tcA ) == true );
+ CHECK( spec.matches( *tcB ) == true );
+ CHECK( spec.matches( *tcC ) == true );
+ CHECK( spec.matches( *tcD ) == true );
}
SECTION( "Single tag" ) {
TestSpec spec = parseTestSpec( "[one]" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == true );
- CHECK( spec.matches( tcC ) == false );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == true );
+ CHECK( spec.matches( *tcC ) == false );
}
SECTION( "Single tag, two matches" ) {
TestSpec spec = parseTestSpec( "[x]" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == true );
- CHECK( spec.matches( tcC ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == true );
+ CHECK( spec.matches( *tcC ) == true );
}
SECTION( "Two tags" ) {
TestSpec spec = parseTestSpec( "[two][x]" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == true );
}
SECTION( "Two tags, spare separated" ) {
TestSpec spec = parseTestSpec( "[two] [x]" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == true );
}
SECTION( "Wildcarded name and tag" ) {
TestSpec spec = parseTestSpec( "*name*[x]" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == true );
- CHECK( spec.matches( tcD ) == false );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == true );
+ CHECK( spec.matches( *tcD ) == false );
}
SECTION( "Single tag exclusion" ) {
TestSpec spec = parseTestSpec( "~[one]" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == true );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == false );
+ CHECK( spec.matches( *tcA ) == true );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == false );
}
SECTION( "One tag exclusion and one tag inclusion" ) {
TestSpec spec = parseTestSpec( "~[two][x]" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == true );
- CHECK( spec.matches( tcC ) == false );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == true );
+ CHECK( spec.matches( *tcC ) == false );
}
SECTION( "One tag exclusion and one wldcarded name inclusion" ) {
TestSpec spec = parseTestSpec( "~[two]*name*" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == false );
- CHECK( spec.matches( tcD ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == false );
+ CHECK( spec.matches( *tcD ) == true );
}
SECTION( "One tag exclusion, using exclude:, and one wldcarded name inclusion" ) {
TestSpec spec = parseTestSpec( "exclude:[two]*name*" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == false );
- CHECK( spec.matches( tcD ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == false );
+ CHECK( spec.matches( *tcD ) == true );
}
SECTION( "name exclusion" ) {
TestSpec spec = parseTestSpec( "~b" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == true );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == false );
- CHECK( spec.matches( tcD ) == true );
+ CHECK( spec.matches( *tcA ) == true );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == false );
+ CHECK( spec.matches( *tcD ) == true );
}
SECTION( "wildcarded name exclusion" ) {
TestSpec spec = parseTestSpec( "~*name*" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == true );
- CHECK( spec.matches( tcB ) == true );
- CHECK( spec.matches( tcC ) == false );
- CHECK( spec.matches( tcD ) == false );
+ CHECK( spec.matches( *tcA ) == true );
+ CHECK( spec.matches( *tcB ) == true );
+ CHECK( spec.matches( *tcC ) == false );
+ CHECK( spec.matches( *tcD ) == false );
}
SECTION( "wildcarded name exclusion with tag inclusion" ) {
TestSpec spec = parseTestSpec( "~*name*,[three]" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == true );
- CHECK( spec.matches( tcB ) == true );
- CHECK( spec.matches( tcC ) == true );
- CHECK( spec.matches( tcD ) == false );
+ CHECK( spec.matches( *tcA ) == true );
+ CHECK( spec.matches( *tcB ) == true );
+ CHECK( spec.matches( *tcC ) == true );
+ CHECK( spec.matches( *tcD ) == false );
}
SECTION( "wildcarded name exclusion, using exclude:, with tag inclusion" ) {
TestSpec spec = parseTestSpec( "exclude:*name*,[three]" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == true );
- CHECK( spec.matches( tcB ) == true );
- CHECK( spec.matches( tcC ) == true );
- CHECK( spec.matches( tcD ) == false );
+ CHECK( spec.matches( *tcA ) == true );
+ CHECK( spec.matches( *tcB ) == true );
+ CHECK( spec.matches( *tcC ) == true );
+ CHECK( spec.matches( *tcD ) == false );
}
SECTION( "two wildcarded names" ) {
TestSpec spec = parseTestSpec( "\"longer*\"\"*spaces\"" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == true );
- CHECK( spec.matches( tcD ) == false );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == true );
+ CHECK( spec.matches( *tcD ) == false );
}
SECTION( "empty tag" ) {
TestSpec spec = parseTestSpec( "[]" );
CHECK( spec.hasFilters() == false );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == false );
- CHECK( spec.matches( tcD ) == false );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == false );
+ CHECK( spec.matches( *tcD ) == false );
}
SECTION( "empty quoted name" ) {
TestSpec spec = parseTestSpec( "\"\"" );
CHECK( spec.hasFilters() == false );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == false );
- CHECK( spec.matches( tcD ) == false );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == false );
+ CHECK( spec.matches( *tcD ) == false );
}
SECTION( "quoted string followed by tag exclusion" ) {
TestSpec spec = parseTestSpec( "\"*name*\"~[.]" );
CHECK( spec.hasFilters() == true );
- CHECK( spec.matches( tcA ) == false );
- CHECK( spec.matches( tcB ) == false );
- CHECK( spec.matches( tcC ) == false );
- CHECK( spec.matches( tcD ) == true );
+ CHECK( spec.matches( *tcA ) == false );
+ CHECK( spec.matches( *tcB ) == false );
+ CHECK( spec.matches( *tcC ) == false );
+ CHECK( spec.matches( *tcD ) == true );
}
SECTION( "Leading and trailing spaces in test spec" ) {
TestSpec spec = parseTestSpec( "\" aardvark \"" );
- CHECK( spec.matches( fakeTestCase( " aardvark " ) ) );
- CHECK( spec.matches( fakeTestCase( " aardvark" ) ) );
- CHECK( spec.matches( fakeTestCase( " aardvark " ) ) );
- CHECK( spec.matches( fakeTestCase( "aardvark " ) ) );
- CHECK( spec.matches( fakeTestCase( "aardvark" ) ) );
+ CHECK( spec.matches( *fakeTestCase( " aardvark " ) ) );
+ CHECK( spec.matches( *fakeTestCase( " aardvark" ) ) );
+ CHECK( spec.matches( *fakeTestCase( " aardvark " ) ) );
+ CHECK( spec.matches( *fakeTestCase( "aardvark " ) ) );
+ CHECK( spec.matches( *fakeTestCase( "aardvark" ) ) );
}
SECTION( "Leading and trailing spaces in test name" ) {
TestSpec spec = parseTestSpec( "aardvark" );
- CHECK( spec.matches( fakeTestCase( " aardvark " ) ) );
- CHECK( spec.matches( fakeTestCase( " aardvark" ) ) );
- CHECK( spec.matches( fakeTestCase( " aardvark " ) ) );
- CHECK( spec.matches( fakeTestCase( "aardvark " ) ) );
- CHECK( spec.matches( fakeTestCase( "aardvark" ) ) );
+ CHECK( spec.matches( *fakeTestCase( " aardvark " ) ) );
+ CHECK( spec.matches( *fakeTestCase( " aardvark" ) ) );
+ CHECK( spec.matches( *fakeTestCase( " aardvark " ) ) );
+ CHECK( spec.matches( *fakeTestCase( "aardvark " ) ) );
+ CHECK( spec.matches( *fakeTestCase( "aardvark" ) ) );
}
}
@@ -317,8 +320,8 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
Catch::Config cfg(config);
REQUIRE(cfg.hasTestFilters());
- REQUIRE(cfg.testSpec().matches(fakeTestCase("notIncluded")) == false);
- REQUIRE(cfg.testSpec().matches(fakeTestCase("test1")));
+ REQUIRE(cfg.testSpec().matches(*fakeTestCase("notIncluded")) == false);
+ REQUIRE(cfg.testSpec().matches(*fakeTestCase("test1")));
}
SECTION("Specify one test case exclusion using exclude:") {
auto result = cli.parse({"test", "exclude:test1"});
@@ -326,8 +329,8 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
Catch::Config cfg(config);
REQUIRE(cfg.hasTestFilters());
- REQUIRE(cfg.testSpec().matches(fakeTestCase("test1")) == false);
- REQUIRE(cfg.testSpec().matches(fakeTestCase("alwaysIncluded")));
+ REQUIRE(cfg.testSpec().matches(*fakeTestCase("test1")) == false);
+ REQUIRE(cfg.testSpec().matches(*fakeTestCase("alwaysIncluded")));
}
SECTION("Specify one test case exclusion using ~") {
@@ -336,8 +339,8 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
Catch::Config cfg(config);
REQUIRE(cfg.hasTestFilters());
- REQUIRE(cfg.testSpec().matches(fakeTestCase("test1")) == false);
- REQUIRE(cfg.testSpec().matches(fakeTestCase("alwaysIncluded")));
+ REQUIRE(cfg.testSpec().matches(*fakeTestCase("test1")) == false);
+ REQUIRE(cfg.testSpec().matches(*fakeTestCase("alwaysIncluded")));
}
}
diff --git a/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp b/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp
index 27958223..79657226 100644
--- a/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp
+++ b/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp
@@ -42,6 +42,6 @@ TEST_CASE( "Tag alias can be registered against tag patterns" ) {
}
TEST_CASE("shortened hide tags are split apart") {
- auto testcase = Catch::makeTestCase(nullptr, "", {"fake test name", "[.magic-tag]"}, CATCH_INTERNAL_LINEINFO);
- REQUIRE_THAT(testcase.tags, Catch::VectorContains(std::string("magic-tag")) && Catch::VectorContains(std::string(".")));
+ auto testcase = Catch::makeTestCaseInfo("", {"fake test name", "[.magic-tag]"}, CATCH_INTERNAL_LINEINFO);
+ REQUIRE_THAT(testcase->tags, Catch::VectorContains(std::string("magic-tag")) && Catch::VectorContains(std::string(".")));
}