Index: va_stdafx.h =================================================================== diff -u -r078d08f91614ef157c27460989324ddd968c78cd -ra4635addad389b9e117679437a3e1b64a739ea96 --- va_stdafx.h (.../va_stdafx.h) (revision 078d08f91614ef157c27460989324ddd968c78cd) +++ va_stdafx.h (.../va_stdafx.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) @@ -1,19 +1,30 @@ -/////////////////////////////////////////////////////////////////////////// -// googletest macros replacement for visual assist - -#define TEST_F(fixture, test_name)\ -struct Test_##fixture##_##test_name## : public fixture\ -{\ - void Exec();\ -};\ -void Test_##fixture##_##test_name##::Exec() - - -#define TEST(test_case_name, test_name)\ -struct Test_##test_case_name##_##test_name##\ -{\ - void Exec();\ -};\ -void Test_##test_case_name##_##test_name##::Exec() - -#define EXPECT_EQ(a, b) (a) == (b) +/////////////////////////////////////////////////////////////////////////// +// googletest macros replacement for visual assist + +#define TEST_F(fixture, test_name)\ +struct Test_##fixture##_##test_name## : public fixture\ +{\ + void Exec();\ +};\ +void Test_##fixture##_##test_name##::Exec() + + +#define TEST(test_case_name, test_name)\ +struct Test_##test_case_name##_##test_name##\ +{\ + void Exec();\ +};\ +void Test_##test_case_name##_##test_name##::Exec() + +#define EXPECT_EQ(a, b) (a) == (b) +#define EXPECT_THROW(operation, exc)\ +do\ +{\ + try\ + {\ + operation;\ + }\ + catch(const exc&)\ + {\ + }\ +} while(false)