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

summaryrefslogtreecommitdiffhomepage
path: root/projects
diff options
context:
space:
mode:
authorPhil Nash2012-11-22 19:17:20 +0000
committerPhil Nash2012-11-22 19:17:20 +0000
commit06a671a34909c19a1a4849a9d9c55ef141b654d2 (patch)
tree40f3556d67d6ed9a42727446bfd9342912a66e8f /projects
parent37f3820747eb7fd4e1d937e100de6f5fafcdb83c (diff)
downloadcatch3-06a671a34909c19a1a4849a9d9c55ef141b654d2.tar.gz
Renamed TestCaseInfo -> TestCase
Diffstat (limited to 'projects')
-rw-r--r--projects/SelfTest/TestMain.cpp12
-rw-r--r--projects/SelfTest/catch_self_test.hpp6
2 files changed, 9 insertions, 9 deletions
diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp
index 90116c61..229e7405 100644
--- a/projects/SelfTest/TestMain.cpp
+++ b/projects/SelfTest/TestMain.cpp
@@ -86,7 +86,7 @@ std::string parseIntoConfigAndReturnError( const char * (&argv)[size], Catch::Co
return "";
}
-inline Catch::TestCaseInfo makeTestCase( const char* name ){ return Catch::TestCaseInfo( NULL, "", name, "", CATCH_INTERNAL_LINEINFO ); }
+inline Catch::TestCase makeTestCase( const char* name ){ return Catch::TestCase( NULL, "", name, "", CATCH_INTERNAL_LINEINFO ); }
TEST_CASE( "selftest/parser/2", "ConfigData" ) {
@@ -364,7 +364,7 @@ TEST_CASE( "selftest/tags", "" ) {
std::string p5 = "[one][two]~[hide],[three]";
SECTION( "one tag", "" ) {
- Catch::TestCaseInfo oneTag( NULL, "", "test", "[one]", CATCH_INTERNAL_LINEINFO );
+ Catch::TestCase oneTag( NULL, "", "test", "[one]", CATCH_INTERNAL_LINEINFO );
CHECK( oneTag.getDescription() == "" );
CHECK( oneTag.hasTag( "one" ) );
@@ -378,7 +378,7 @@ TEST_CASE( "selftest/tags", "" ) {
}
SECTION( "two tags", "" ) {
- Catch::TestCaseInfo twoTags( NULL, "", "test", "[one][two]", CATCH_INTERNAL_LINEINFO );
+ Catch::TestCase twoTags( NULL, "", "test", "[one][two]", CATCH_INTERNAL_LINEINFO );
CHECK( twoTags.getDescription() == "" );
CHECK( twoTags.hasTag( "one" ) );
@@ -395,7 +395,7 @@ TEST_CASE( "selftest/tags", "" ) {
SECTION( "one tag with characters either side", "" ) {
- Catch::TestCaseInfo oneTagWithExtras( NULL, "", "test", "12[one]34", CATCH_INTERNAL_LINEINFO );
+ Catch::TestCase oneTagWithExtras( NULL, "", "test", "12[one]34", CATCH_INTERNAL_LINEINFO );
CHECK( oneTagWithExtras.getDescription() == "1234" );
CHECK( oneTagWithExtras.hasTag( "one" ) );
CHECK( oneTagWithExtras.hasTag( "two" ) == false );
@@ -404,7 +404,7 @@ TEST_CASE( "selftest/tags", "" ) {
SECTION( "start of a tag, but not closed", "" ) {
- Catch::TestCaseInfo oneTagOpen( NULL, "", "test", "[one", CATCH_INTERNAL_LINEINFO );
+ Catch::TestCase oneTagOpen( NULL, "", "test", "[one", CATCH_INTERNAL_LINEINFO );
CHECK( oneTagOpen.getDescription() == "[one" );
CHECK( oneTagOpen.hasTag( "one" ) == false );
@@ -412,7 +412,7 @@ TEST_CASE( "selftest/tags", "" ) {
}
SECTION( "hidden", "" ) {
- Catch::TestCaseInfo oneTag( NULL, "", "test", "[hide]", CATCH_INTERNAL_LINEINFO );
+ Catch::TestCase oneTag( NULL, "", "test", "[hide]", CATCH_INTERNAL_LINEINFO );
CHECK( oneTag.getDescription() == "" );
CHECK( oneTag.hasTag( "hide" ) );
diff --git a/projects/SelfTest/catch_self_test.hpp b/projects/SelfTest/catch_self_test.hpp
index 12ad282e..5c30dd63 100644
--- a/projects/SelfTest/catch_self_test.hpp
+++ b/projects/SelfTest/catch_self_test.hpp
@@ -82,13 +82,13 @@ namespace Catch {
closeLabel( recordSections, sectionName );
}
- virtual void StartTestCase( const TestCaseInfo& testInfo ) {
+ virtual void StartTestCase( const TestCase& testInfo ) {
openLabel( recordTestCases, testInfo.getName() );
}
virtual void Aborted(){}
- virtual void EndTestCase( const TestCaseInfo& testInfo,
+ virtual void EndTestCase( const TestCase& testInfo,
const Totals&,
const std::string&,
const std::string& ) {
@@ -153,7 +153,7 @@ namespace Catch {
MetaTestRunner( expectedResult ) );
}
- void operator()( const TestCaseInfo& testCase ) {
+ void operator()( const TestCase& testCase ) {
EmbeddedRunner runner;
Totals totals = runner.runMatching( testCase.getName() );
switch( m_expectedResult ) {