3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-19 11:25:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge build 30

Browse Source
This commit is contained in:
Malcolm Noyes
2014-03-10 12:02:14 +00:00
parent 3abcb2038c dd2810d60a
commit 7a6a230f74
36 changed files with 405 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/CMake/CMakeLists.txt
View File

@@ -12,7 +12,6 @@ set(SOURCES
${SELF_TEST_DIR}/ApproxTests.cpp
${SELF_TEST_DIR}/BDDTests.cpp
${SELF_TEST_DIR}/ClassTests.cpp
${SELF_TEST_DIR}/CmdLineTests.cpp
${SELF_TEST_DIR}/ConditionTests.cpp
${SELF_TEST_DIR}/ExceptionTests.cpp
${SELF_TEST_DIR}/GeneratorTests.cpp

2
projects/SelfTest/Baselines/console.std.approved.txt
View File

@@ -750,5 +750,5 @@ with expansion:
"first" == "second"
===============================================================================
123 test cases - 36 failed (676 assertions - 91 failed)
122 test cases - 36 failed (658 assertions - 91 failed)

201
projects/SelfTest/Baselines/console.sw.approved.txt
View File

@@ -6726,205 +6726,6 @@ PASSED:
with message:
boo!
-------------------------------------------------------------------------------
cmdline
process name
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
CHECK( config.processName == "test" )
with expansion:
"test" == "test"
-------------------------------------------------------------------------------
cmdline
arg separated by spaces
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
CHECK( config.fileName == "filename.ext" )
with expansion:
"filename.ext" == "filename.ext"
-------------------------------------------------------------------------------
cmdline
arg separated by colon
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
CHECK( config.fileName == "filename.ext" )
with expansion:
"filename.ext" == "filename.ext"
-------------------------------------------------------------------------------
cmdline
arg separated by =
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
CHECK( config.fileName == "filename.ext" )
with expansion:
"filename.ext" == "filename.ext"
-------------------------------------------------------------------------------
cmdline
long opt
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
CHECK( config.fileName == "%stdout" )
with expansion:
"%stdout" == "%stdout"
-------------------------------------------------------------------------------
cmdline
a number
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
CHECK( config.number == 42 )
with expansion:
42 == 42
-------------------------------------------------------------------------------
cmdline
not a number
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
CHECK_THROWS( parseInto( cli, argv, config ) )
CmdLineTests.cpp:<line number>:
PASSED:
CHECK( config.number == 0 )
with expansion:
0 == 0
-------------------------------------------------------------------------------
cmdline
two parsers
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
CHECK( config1.number == 42 )
with expansion:
42 == 42
CmdLineTests.cpp:<line number>:
PASSED:
REQUIRE_FALSE( unusedTokens.empty() )
with expansion:
!false
CmdLineTests.cpp:<line number>:
PASSED:
CHECK( config2.description == "some text" )
with expansion:
"some text" == "some text"
-------------------------------------------------------------------------------
cmdline
methods
in range
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
REQUIRE( config.index == 3 )
with expansion:
3 == 3
-------------------------------------------------------------------------------
cmdline
methods
out of range
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
REQUIRE_THROWS( parseInto( cli, argv, config ) )
-------------------------------------------------------------------------------
cmdline
flags
set
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
REQUIRE( config.flag )
with expansion:
true
-------------------------------------------------------------------------------
cmdline
flags
not set
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
REQUIRE( config.flag == false )
with expansion:
false == false
-------------------------------------------------------------------------------
cmdline
positional
-------------------------------------------------------------------------------
CmdLineTests.cpp:<line number>
...............................................................................
CmdLineTests.cpp:<line number>:
PASSED:
REQUIRE( config.firstPos == "1st" )
with expansion:
"1st" == "1st"
CmdLineTests.cpp:<line number>:
PASSED:
REQUIRE( config.secondPos == "2nd" )
with expansion:
"2nd" == "2nd"
CmdLineTests.cpp:<line number>:
PASSED:
REQUIRE( config.unpositional == "3rd" )
with expansion:
"3rd" == "3rd"
-------------------------------------------------------------------------------
section tracking
-------------------------------------------------------------------------------
@@ -7158,5 +6959,5 @@ with expansion:
true
===============================================================================
123 test cases - 51 failed (695 assertions - 110 failed)
122 test cases - 51 failed (677 assertions - 110 failed)

15
projects/SelfTest/Baselines/junit.sw.approved.txt
View File

@@ -1,5 +1,5 @@
<testsuites>
<testsuite name="~_" errors="10" failures="100" tests="695" hostname="tbd" time="{duration}" timestamp="tbd">
<testsuite name="~_" errors="10" failures="100" tests="677" hostname="tbd" time="{duration}" timestamp="tbd">
<testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/>
<testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/>
<testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/>
@@ -530,19 +530,6 @@ TrickyTests.cpp:<line number>
<testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector/When: it is made larger/Then: the size and capacity go up/And when: it is made smaller again/Then: the size goes down but the capacity stays the same" time="{duration}"/>
<testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector/When: we reserve more space/Then: The capacity is increased but the size remains the same" time="{duration}"/>
<testcase classname="Scenario: This is a really long scenario name to see how the list command deals with wrapping" name="Given: A section name that is so long that it cannot fit in a single console width/When: The test headers are printed as part of the normal running of the scenario/Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent" time="{duration}"/>
<testcase classname="cmdline" name="process name" time="{duration}"/>
<testcase classname="cmdline" name="arg separated by spaces" time="{duration}"/>
<testcase classname="cmdline" name="arg separated by colon" time="{duration}"/>
<testcase classname="cmdline" name="arg separated by =" time="{duration}"/>
<testcase classname="cmdline" name="long opt" time="{duration}"/>
<testcase classname="cmdline" name="a number" time="{duration}"/>
<testcase classname="cmdline" name="not a number" time="{duration}"/>
<testcase classname="cmdline" name="two parsers" time="{duration}"/>
<testcase classname="cmdline" name="methods/in range" time="{duration}"/>
<testcase classname="cmdline" name="methods/out of range" time="{duration}"/>
<testcase classname="cmdline" name="flags/set" time="{duration}"/>
<testcase classname="cmdline" name="flags/not set" time="{duration}"/>
<testcase classname="cmdline" name="positional" time="{duration}"/>
<testcase classname="section tracking" name="root" time="{duration}"/>
<testcase classname="section tracking" name="test case with no sections" time="{duration}"/>
<testcase classname="section tracking" name="test case with one section" time="{duration}"/>

208
projects/SelfTest/Baselines/xml.sw.approved.txt
View File

@@ -6967,210 +6967,6 @@ there&quot;
</Section>
<OverallResult success="true"/>
</TestCase>
<TestCase name="cmdline">
<Section name="process name">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.processName == &quot;test&quot;
</Original>
<Expanded>
&quot;test&quot; == &quot;test&quot;
</Expanded>
</Expression>
<OverallResults successes="1" failures="0"/>
</Section>
<Section name="arg separated by spaces">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.fileName == &quot;filename.ext&quot;
</Original>
<Expanded>
&quot;filename.ext&quot; == &quot;filename.ext&quot;
</Expanded>
</Expression>
<OverallResults successes="1" failures="0"/>
</Section>
<Section name="arg separated by colon">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.fileName == &quot;filename.ext&quot;
</Original>
<Expanded>
&quot;filename.ext&quot; == &quot;filename.ext&quot;
</Expanded>
</Expression>
<OverallResults successes="1" failures="0"/>
</Section>
<Section name="arg separated by =">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.fileName == &quot;filename.ext&quot;
</Original>
<Expanded>
&quot;filename.ext&quot; == &quot;filename.ext&quot;
</Expanded>
</Expression>
<OverallResults successes="1" failures="0"/>
</Section>
<Section name="long opt">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.fileName == &quot;%stdout&quot;
</Original>
<Expanded>
&quot;%stdout&quot; == &quot;%stdout&quot;
</Expanded>
</Expression>
<OverallResults successes="1" failures="0"/>
</Section>
<Section name="a number">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.number == 42
</Original>
<Expanded>
42 == 42
</Expanded>
</Expression>
<OverallResults successes="1" failures="0"/>
</Section>
<Section name="not a number">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
parseInto( cli, argv, config )
</Original>
<Expanded>
parseInto( cli, argv, config )
</Expanded>
</Expression>
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.number == 0
</Original>
<Expanded>
0 == 0
</Expanded>
</Expression>
<OverallResults successes="2" failures="0"/>
</Section>
<Section name="two parsers">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config1.number == 42
</Original>
<Expanded>
42 == 42
</Expanded>
</Expression>
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
!unusedTokens.empty()
</Original>
<Expanded>
!false
</Expanded>
</Expression>
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config2.description == &quot;some text&quot;
</Original>
<Expanded>
&quot;some text&quot; == &quot;some text&quot;
</Expanded>
</Expression>
<OverallResults successes="3" failures="0"/>
</Section>
<Section name="methods">
<OverallResults successes="0" failures="0"/>
</Section>
<Section name="methods">
<Section name="in range">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.index == 3
</Original>
<Expanded>
3 == 3
</Expanded>
</Expression>
<OverallResults successes="1" failures="0"/>
</Section>
<OverallResults successes="1" failures="0"/>
</Section>
<Section name="methods">
<Section name="out of range">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
parseInto( cli, argv, config )
</Original>
<Expanded>
parseInto( cli, argv, config )
</Expanded>
</Expression>
<OverallResults successes="1" failures="0"/>
</Section>
<OverallResults successes="1" failures="0"/>
</Section>
<Section name="flags">
<OverallResults successes="0" failures="0"/>
</Section>
<Section name="flags">
<Section name="set">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.flag
</Original>
<Expanded>
true
</Expanded>
</Expression>
<OverallResults successes="1" failures="0"/>
</Section>
<OverallResults successes="1" failures="0"/>
</Section>
<Section name="flags">
<Section name="not set">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.flag == false
</Original>
<Expanded>
false == false
</Expanded>
</Expression>
<OverallResults successes="1" failures="0"/>
</Section>
<OverallResults successes="1" failures="0"/>
</Section>
<Section name="positional">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.firstPos == &quot;1st&quot;
</Original>
<Expanded>
&quot;1st&quot; == &quot;1st&quot;
</Expanded>
</Expression>
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.secondPos == &quot;2nd&quot;
</Original>
<Expanded>
&quot;2nd&quot; == &quot;2nd&quot;
</Expanded>
</Expression>
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
<Original>
config.unpositional == &quot;3rd&quot;
</Original>
<Expanded>
&quot;3rd&quot; == &quot;3rd&quot;
</Expanded>
</Expression>
<OverallResults successes="3" failures="0"/>
</Section>
<OverallResult success="true"/>
</TestCase>
<TestCase name="section tracking">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
<Original>
@@ -7418,7 +7214,7 @@ there&quot;
</Section>
<OverallResult success="true"/>
</TestCase>
<OverallResults successes="585" failures="110"/>
<OverallResults successes="567" failures="110"/>
</Group>
<OverallResults successes="585" failures="110"/>
<OverallResults successes="567" failures="110"/>
</Catch>

192
projects/SelfTest/CmdLineTests.cpp
View File

@@ -1,192 +0,0 @@
/*
* Created by Phil on 22/10/2010.
* Copyright 2010 Two Blue Cubes Ltd
*
* Distributed under the Boost Software License, Version 1.0. (See accompanying
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/
#ifdef __clang__
#pragma clang diagnostic ignored "-Wpadded"
#endif
#include "internal/clara.h" // This will does not declare Clara within the Catch namespace
#include "catch.hpp"
// Helper to deduce size from array literals and pass on to parser
template<size_t size, typename ConfigT>
std::vector<Clara::Parser::Token> parseInto( Clara::CommandLine<ConfigT>& cli, char const * (&argv)[size], ConfigT& config ) {
return cli.parseInto( size, argv, config );
}
struct TestOpt {
TestOpt() : number( 0 ), index( 0 ), flag( false ) {}
std::string processName;
std::string fileName;
int number;
int index;
bool flag;
std::string firstPos;
std::string secondPos;
std::string unpositional;
void setValidIndex( int i ) {
if( i < 0 || i > 10 )
throw std::domain_error( "index must be between 0 and 10" );
index = i;
}
};
struct TestOpt2 {
std::string description;
};
#ifdef CATCH_CONFIG_VARIADIC_MACROS
TEST_CASE( "cmdline" ) {
TestOpt config;
Clara::CommandLine<TestOpt> cli;
cli.bindProcessName( &TestOpt::processName );
cli.bind( &TestOpt::fileName )
.describe( "specifies output file" )
.shortOpt( "o" )
.longOpt( "output" )
.hint( "filename" );
SECTION( "process name" ) {
char const * argv[] = { "test", "-o filename.ext" };
parseInto( cli, argv, config );
CHECK( config.processName == "test" );
}
SECTION( "arg separated by spaces" ) {
char const * argv[] = { "test", "-o filename.ext" };
parseInto( cli, argv, config );
CHECK( config.fileName == "filename.ext" );
}
SECTION( "arg separated by colon" ) {
const char* argv[] = { "test", "-o:filename.ext" };
parseInto( cli, argv, config );
CHECK( config.fileName == "filename.ext" );
}
SECTION( "arg separated by =" ) {
const char* argv[] = { "test", "-o=filename.ext" };
parseInto( cli, argv, config );
CHECK( config.fileName == "filename.ext" );
}
SECTION( "long opt" ) {
const char* argv[] = { "test", "--output %stdout" };
parseInto( cli, argv, config );
CHECK( config.fileName == "%stdout" );
}
cli.bind( &TestOpt::number )
.shortOpt( "n" )
.hint( "an integral value" );
SECTION( "a number" ) {
const char* argv[] = { "test", "-n 42" };
parseInto( cli, argv, config );
CHECK( config.number == 42 );
}
SECTION( "not a number" ) {
const char* argv[] = { "test", "-n forty-two" };
CHECK_THROWS( parseInto( cli, argv, config ) );
CHECK( config.number == 0 );
}
SECTION( "two parsers" ) {
TestOpt config1;
TestOpt2 config2;
Clara::CommandLine<TestOpt2> cli2;
cli2.bind( &TestOpt2::description )
.describe( "description" )
.shortOpt( "d" )
.longOpt( "description" )
.hint( "some text" );
const char* argv[] = { "test", "-n 42", "-d some text" };
std::vector<Clara::Parser::Token> unusedTokens = parseInto( cli, argv, config1 );
CHECK( config1.number == 42 );
REQUIRE_FALSE( unusedTokens.empty() );
cli2.populate( unusedTokens, config2 );
CHECK( config2.description == "some text" );
}
SECTION( "methods" ) {
cli.bind( &TestOpt::setValidIndex )
.describe( "An index, which is an integer between 0 and 10, inclusive" )
.shortOpt( "i" )
.hint( "index" );
SECTION( "in range" ) {
const char* argv[] = { "test", "-i 3" };
parseInto( cli, argv, config );
REQUIRE( config.index == 3 );
}
SECTION( "out of range" ) {
const char* argv[] = { "test", "-i 42" };
REQUIRE_THROWS( parseInto( cli, argv, config ) );
}
}
SECTION( "flags" ) {
cli.bind( &TestOpt::flag )
.describe( "A flag" )
.shortOpt( "f" );
SECTION( "set" ) {
const char* argv[] = { "test", "-f" };
parseInto( cli, argv, config );
REQUIRE( config.flag );
}
SECTION( "not set" ) {
const char* argv[] = { "test" };
parseInto( cli, argv, config );
REQUIRE( config.flag == false );
}
}
SECTION( "positional" ) {
cli.bind( &TestOpt::secondPos )
.describe( "Second position" )
.hint( "second arg" )
.position( 2 );
cli.bind( &TestOpt::unpositional )
.hint( "any arg" )
.describe( "Unpositional" );
cli.bind( &TestOpt::firstPos )
.describe( "First position" )
.hint( "first arg" )
.position( 1 );
// std::cout << cli.usage( "testApp" ) << std::endl;
const char* argv[] = { "test", "-f", "1st", "-o", "filename", "2nd", "3rd" };
parseInto( cli, argv, config );
REQUIRE( config.firstPos == "1st" );
REQUIRE( config.secondPos == "2nd" );
REQUIRE( config.unpositional == "3rd" );
}
}
#endif

1
projects/SelfTest/makefile
View File

@@ -1,7 +1,6 @@
SOURCES = ApproxTests.cpp \
BDDTests.cpp \
ClassTests.cpp \
CmdLineTests.cpp \
ConditionTests.cpp \
ExceptionTests.cpp \
GeneratorTests.cpp \

1
projects/VS2010/ManagedTestCatch/ManagedTestCatch.vcxproj
View File

@@ -138,7 +138,6 @@
<ClCompile Include="..\..\SelfTest\ApproxTests.cpp" />
<ClCompile Include="..\..\SelfTest\BDDTests.cpp" />
<ClCompile Include="..\..\SelfTest\ClassTests.cpp" />
<ClCompile Include="..\..\SelfTest\CmdLineTests.cpp" />
<ClCompile Include="..\..\SelfTest\ConditionTests.cpp" />
<ClCompile Include="..\..\SelfTest\ExceptionTests.cpp" />
<ClCompile Include="..\..\SelfTest\GeneratorTests.cpp" />

3
projects/VS2010/ManagedTestCatch/ManagedTestCatch.vcxproj.filters
View File

@@ -30,9 +30,6 @@
<ClCompile Include="..\..\SelfTest\BDDTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\SelfTest\CmdLineTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\SelfTest\ConditionTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>

1
projects/VS2010/TestCatch/TestCatch/TestCatch.vcxproj
View File

@@ -93,7 +93,6 @@
<ItemGroup>
<ClCompile Include="..\..\..\SelfTest\ApproxTests.cpp" />
<ClCompile Include="..\..\..\SelfTest\BDDTests.cpp" />
<ClCompile Include="..\..\..\SelfTest\CmdLineTests.cpp" />
<ClCompile Include="..\..\..\SelfTest\SectionTrackerTests.cpp" />
<ClCompile Include="..\..\..\SelfTest\TestMain.cpp" />
<ClCompile Include="..\..\..\SelfTest\ClassTests.cpp" />

1
projects/VS2012/ManagedTestCatch/ManagedTestCatch.vcxproj
View File

@@ -157,7 +157,6 @@
<ClCompile Include="..\..\SelfTest\ApproxTests.cpp" />
<ClCompile Include="..\..\SelfTest\BDDTests.cpp" />
<ClCompile Include="..\..\SelfTest\ClassTests.cpp" />
<ClCompile Include="..\..\SelfTest\CmdLineTests.cpp" />
<ClCompile Include="..\..\SelfTest\ConditionTests.cpp" />
<ClCompile Include="..\..\SelfTest\ExceptionTests.cpp" />
<ClCompile Include="..\..\SelfTest\GeneratorTests.cpp" />

3
projects/VS2012/ManagedTestCatch/ManagedTestCatch.vcxproj.filters
View File

@@ -33,9 +33,6 @@
<ClCompile Include="..\..\SelfTest\ClassTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\SelfTest\CmdLineTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\SelfTest\ConditionTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>

1
projects/VS2012/NativeTestCatch/NativeTestCatch.vcxproj
View File

@@ -153,7 +153,6 @@
<ClCompile Include="..\..\SelfTest\ApproxTests.cpp" />
<ClCompile Include="..\..\SelfTest\BDDTests.cpp" />
<ClCompile Include="..\..\SelfTest\ClassTests.cpp" />
<ClCompile Include="..\..\SelfTest\CmdLineTests.cpp" />
<ClCompile Include="..\..\SelfTest\ConditionTests.cpp" />
<ClCompile Include="..\..\SelfTest\ExceptionTests.cpp" />
<ClCompile Include="..\..\SelfTest\GeneratorTests.cpp" />

3
projects/VS2012/NativeTestCatch/NativeTestCatch.vcxproj.filters
View File

@@ -41,9 +41,6 @@
<ClCompile Include="..\..\SelfTest\ClassTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\SelfTest\CmdLineTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\SelfTest\ConditionTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>

1
projects/VS2012/NativeTestCatch/stdafx.h
View File

@@ -8,6 +8,7 @@
#include "targetver.h"
// Headers for CppUnitTest
#pragma warning( disable:4505 ) // required for including CppUnitTest.h at /W4
#include "CppUnitTest.h"
// TODO: reference additional headers your program requires here

4
projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
View File

@@ -8,7 +8,6 @@
/* Begin PBXBuildFile section */
266B06B816F3A60A004ED264 /* VariadicMacrosTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266B06B616F3A60A004ED264 /* VariadicMacrosTests.cpp */; };
266E9AD617290E8E0061DAB2 /* CmdLineTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266E9AD417290E8E0061DAB2 /* CmdLineTests.cpp */; };
266ECD74170F3C620030D735 /* BDDTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266ECD73170F3C620030D735 /* BDDTests.cpp */; };
26847E5F16BBADB40043B9C1 /* catch_message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26847E5D16BBADB40043B9C1 /* catch_message.cpp */; };
26948286179A9AB900ED166E /* SectionTrackerTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26948284179A9AB900ED166E /* SectionTrackerTests.cpp */; };
@@ -68,7 +67,6 @@
263FD06117AF8DF200988A20 /* catch_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = catch_timer.h; sourceTree = "<group>"; };
266B06B616F3A60A004ED264 /* VariadicMacrosTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VariadicMacrosTests.cpp; path = ../../../SelfTest/VariadicMacrosTests.cpp; sourceTree = "<group>"; };
266E9AD117230ACF0061DAB2 /* catch_text.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_text.hpp; sourceTree = "<group>"; };
266E9AD417290E8E0061DAB2 /* CmdLineTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CmdLineTests.cpp; path = ../../../SelfTest/CmdLineTests.cpp; sourceTree = "<group>"; };
266ECD73170F3C620030D735 /* BDDTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BDDTests.cpp; path = ../../../SelfTest/BDDTests.cpp; sourceTree = "<group>"; };
266ECD8C1713614B0030D735 /* catch_legacy_reporter_adapter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_legacy_reporter_adapter.hpp; sourceTree = "<group>"; };
266ECD8D1713614B0030D735 /* catch_legacy_reporter_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = catch_legacy_reporter_adapter.h; sourceTree = "<group>"; };
@@ -193,7 +191,6 @@
266E9AD317290E710061DAB2 /* Introspective Tests */ = {
isa = PBXGroup;
children = (
266E9AD417290E8E0061DAB2 /* CmdLineTests.cpp */,
26948284179A9AB900ED166E /* SectionTrackerTests.cpp */,
);
name = "Introspective Tests";
@@ -535,7 +532,6 @@
26847E5F16BBADB40043B9C1 /* catch_message.cpp in Sources */,
266B06B816F3A60A004ED264 /* VariadicMacrosTests.cpp in Sources */,
266ECD74170F3C620030D735 /* BDDTests.cpp in Sources */,
266E9AD617290E8E0061DAB2 /* CmdLineTests.cpp in Sources */,
26948286179A9AB900ED166E /* SectionTrackerTests.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;