Cleaned up some of the contributed tests

This commit is contained in:
Phil Nash 2011-04-11 08:32:55 +01:00
parent 0f478a5b10
commit 0f2e5d65b7
1 changed files with 18 additions and 11 deletions

View File

@ -179,12 +179,8 @@ namespace ObjectWithConversions
"Operators at different namespace levels not hijacked by Koenig lookup" "Operators at different namespace levels not hijacked by Koenig lookup"
) )
{ {
Object o; Object o;
REQUIRE(0xc0000000 == o );
bool ok = (0xc0000000 == o); // ok
REQUIRE(ok);
REQUIRE(0xc0000000 == o ); // doesn't compile (VC or GCC)
} }
} }
@ -210,10 +206,7 @@ namespace ObjectWithNonConstEqualityOperator
TEST_CASE("./succeeding/non-const==", "Demonstrate that a non-const == is not used") TEST_CASE("./succeeding/non-const==", "Demonstrate that a non-const == is not used")
{ {
Test t( 1 ); Test t( 1 );
REQUIRE( t == 1 );
bool ok = (t == 1); // ok
REQUIRE(ok);
REQUIRE( t == 1 ); // doesn't compile (VC or GCC)
} }
} }
@ -228,3 +221,17 @@ namespace EnumBitFieldTests
REQUIRE( 0xc0000000 == bit30and31 ); REQUIRE( 0xc0000000 == bit30and31 );
} }
} }
struct Obj
{
Obj():prop(&p){}
int p;
int* prop;
};
TEST_CASE("./succeeding/boolean member", "")
{
Obj obj;
REQUIRE( obj.prop );
}