From 0f0dcd31eb996ff3fed008644a0e087cebad337f Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Mon, 9 Jan 2017 14:35:03 +0000
Subject: [PATCH] Excluded two more C++11 tests from Approval tests
---
.../Baselines/console.std.approved.txt | 4 +-
.../Baselines/console.sw.approved.txt | 48 +----------------
.../SelfTest/Baselines/junit.sw.approved.txt | 4 +-
.../SelfTest/Baselines/xml.sw.approved.txt | 52 +------------------
projects/SelfTest/ToStringVector.cpp | 4 +-
5 files changed, 9 insertions(+), 103 deletions(-)
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 34d7b6ae..0b8f1bd9 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -830,6 +830,6 @@ with expansion:
"first" == "second"
===============================================================================
-test cases: 159 | 115 passed | 42 failed | 2 failed as expected
-assertions: 906 | 810 passed | 78 failed | 18 failed as expected
+test cases: 157 | 113 passed | 42 failed | 2 failed as expected
+assertions: 901 | 805 passed | 78 failed | 18 failed as expected
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 79891bfe..4d7177dd 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -8678,50 +8678,6 @@ PASSED:
with expansion:
"1" == "1"
--------------------------------------------------------------------------------
-vec<vec<string,alloc>> -> toString
--------------------------------------------------------------------------------
-ToStringVector.cpp:<line number>
-...............................................................................
-
-ToStringVector.cpp:<line number>:
-PASSED:
- REQUIRE( Catch::toString(v) == "{ }" )
-with expansion:
- "{ }" == "{ }"
-
-ToStringVector.cpp:<line number>:
-PASSED:
- REQUIRE( Catch::toString(v) == "{ { \"hello\" }, { \"world\" } }" )
-with expansion:
- "{ { "hello" }, { "world" } }"
- ==
- "{ { "hello" }, { "world" } }"
-
--------------------------------------------------------------------------------
-vector<int,allocator> -> toString
--------------------------------------------------------------------------------
-ToStringVector.cpp:<line number>
-...............................................................................
-
-ToStringVector.cpp:<line number>:
-PASSED:
- REQUIRE( Catch::toString(vv) == "{ }" )
-with expansion:
- "{ }" == "{ }"
-
-ToStringVector.cpp:<line number>:
-PASSED:
- REQUIRE( Catch::toString(vv) == "{ 42 }" )
-with expansion:
- "{ 42 }" == "{ 42 }"
-
-ToStringVector.cpp:<line number>:
-PASSED:
- REQUIRE( Catch::toString(vv) == "{ 42, 250 }" )
-with expansion:
- "{ 42, 250 }" == "{ 42, 250 }"
-
-------------------------------------------------------------------------------
vector<int> -> toString
-------------------------------------------------------------------------------
@@ -8955,6 +8911,6 @@ MiscTests.cpp:<line number>:
PASSED:
===============================================================================
-test cases: 159 | 114 passed | 43 failed | 2 failed as expected
-assertions: 908 | 810 passed | 80 failed | 18 failed as expected
+test cases: 157 | 112 passed | 43 failed | 2 failed as expected
+assertions: 903 | 805 passed | 80 failed | 18 failed as expected
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 2e712a66..1b4cd69f 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,6 +1,6 @@
<?xml version="1.1" encoding="UTF-8"?>
<testsuites>
- <testsuite name="<exe-name>" errors="13" failures="68" tests="909" hostname="tbd" time="{duration}" timestamp="tbd">
+ <testsuite name="<exe-name>" errors="13" failures="68" tests="904" hostname="tbd" time="{duration}" timestamp="tbd">
<testcase classname="global" name="# A test name that starts with a #" time="{duration}"/>
<testcase classname="global" name="'Not' checks that should fail" time="{duration}">
<failure message="false != false" type="CHECK">
@@ -654,8 +654,6 @@ TrickyTests.cpp:<line number>
<testcase classname="global" name="toString( vectors<has_toString )" time="{duration}"/>
<testcase classname="global" name="toString(enum w/operator<<)" time="{duration}"/>
<testcase classname="global" name="toString(enum)" time="{duration}"/>
- <testcase classname="global" name="vec<vec<string,alloc>> -> toString" time="{duration}"/>
- <testcase classname="global" name="vector<int,allocator> -> toString" time="{duration}"/>
<testcase classname="global" name="vector<int> -> toString" time="{duration}"/>
<testcase classname="global" name="vector<string> -> toString" time="{duration}"/>
<testcase classname="vectors can be sized and resized" name="root" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 3e7af57a..1484d398 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -9143,54 +9143,6 @@ there"
</Expression>
<OverallResult success="true"/>
</TestCase>
- <TestCase name="vec<vec<string,alloc>> -> toString">
- <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
- <Original>
- Catch::toString(v) == "{ }"
- </Original>
- <Expanded>
- "{ }" == "{ }"
- </Expanded>
- </Expression>
- <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
- <Original>
- Catch::toString(v) == "{ { \"hello\" }, { \"world\" } }"
- </Original>
- <Expanded>
- "{ { "hello" }, { "world" } }"
-==
-"{ { "hello" }, { "world" } }"
- </Expanded>
- </Expression>
- <OverallResult success="true"/>
- </TestCase>
- <TestCase name="vector<int,allocator> -> toString">
- <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
- <Original>
- Catch::toString(vv) == "{ }"
- </Original>
- <Expanded>
- "{ }" == "{ }"
- </Expanded>
- </Expression>
- <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
- <Original>
- Catch::toString(vv) == "{ 42 }"
- </Original>
- <Expanded>
- "{ 42 }" == "{ 42 }"
- </Expanded>
- </Expression>
- <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
- <Original>
- Catch::toString(vv) == "{ 42, 250 }"
- </Original>
- <Expanded>
- "{ 42, 250 }" == "{ 42, 250 }"
- </Expanded>
- </Expression>
- <OverallResult success="true"/>
- </TestCase>
<TestCase name="vector<int> -> toString">
<Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
<Original>
@@ -9410,7 +9362,7 @@ there"
</Section>
<OverallResult success="true"/>
</TestCase>
- <OverallResults successes="810" failures="81" expectedFailures="18"/>
+ <OverallResults successes="805" failures="81" expectedFailures="18"/>
</Group>
- <OverallResults successes="810" failures="80" expectedFailures="18"/>
+ <OverallResults successes="805" failures="80" expectedFailures="18"/>
</Catch>
diff --git a/projects/SelfTest/ToStringVector.cpp b/projects/SelfTest/ToStringVector.cpp
index c3a8d4ed..cd071a9d 100644
--- a/projects/SelfTest/ToStringVector.cpp
+++ b/projects/SelfTest/ToStringVector.cpp
@@ -52,7 +52,7 @@ namespace {
};
}
-TEST_CASE( "vector<int,allocator> -> toString", "[toString][vector,allocator]" ) {
+TEST_CASE( "vector<int,allocator> -> toString", "[toString][vector,allocator][c++11][.]" ) {
std::vector<int,minimal_allocator<int> > vv;
REQUIRE( Catch::toString(vv) == "{ }" );
vv.push_back( 42 );
@@ -61,7 +61,7 @@ TEST_CASE( "vector<int,allocator> -> toString", "[toString][vector,allocator]" )
REQUIRE( Catch::toString(vv) == "{ 42, 250 }" );
}
-TEST_CASE( "vec<vec<string,alloc>> -> toString", "[toString][vector,allocator]" ) {
+TEST_CASE( "vec<vec<string,alloc>> -> toString", "[toString][vector,allocator][c++11][.]" ) {
typedef std::vector<std::string,minimal_allocator<std::string> > inner;
typedef std::vector<inner> vector;
vector v;