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

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhil Nash2011-04-11 08:32:55 +0100
committerPhil Nash2011-04-11 08:32:55 +0100
commit0f2e5d65b77dbcab9909635d951f45f63bf272bc (patch)
tree56a89c36e7b02d641c3c6d24a7e322ba07695110
parent0f478a5b10b2045eee69c67aad18a576decce1e1 (diff)
downloadcatch3-0f2e5d65b77dbcab9909635d951f45f63bf272bc.tar.gz
Cleaned up some of the contributed tests
-rw-r--r--Test/TrickyTests.cpp29
1 files changed, 18 insertions, 11 deletions
diff --git a/Test/TrickyTests.cpp b/Test/TrickyTests.cpp
index 1fc50876..fb4c66e1 100644
--- a/Test/TrickyTests.cpp
+++ b/Test/TrickyTests.cpp
@@ -178,13 +178,9 @@ namespace ObjectWithConversions
"./succeeding/koenig",
"Operators at different namespace levels not hijacked by Koenig lookup"
)
- {
-
- Object o;
-
- bool ok = (0xc0000000 == o); // ok
- REQUIRE(ok);
- REQUIRE(0xc0000000 == o ); // doesn't compile (VC or GCC)
+ {
+ Object o;
+ REQUIRE(0xc0000000 == o );
}
}
@@ -210,10 +206,7 @@ namespace ObjectWithNonConstEqualityOperator
TEST_CASE("./succeeding/non-const==", "Demonstrate that a non-const == is not used")
{
Test t( 1 );
-
- bool ok = (t == 1); // ok
- REQUIRE(ok);
- REQUIRE( t == 1 ); // doesn't compile (VC or GCC)
+ REQUIRE( t == 1 );
}
}
@@ -228,3 +221,17 @@ namespace EnumBitFieldTests
REQUIRE( 0xc0000000 == bit30and31 );
}
}
+
+struct Obj
+{
+ Obj():prop(&p){}
+
+ int p;
+ int* prop;
+};
+
+TEST_CASE("./succeeding/boolean member", "")
+{
+ Obj obj;
+ REQUIRE( obj.prop );
+}