aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-03-04 13:39:48 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-03-04 13:39:48 +0000
commitdd26244a925bac6f21db19f0c8eaf506c5df2f0c (patch)
tree7c695e95ef74be1eac007f6319e396d77e037dbf
parentafd2673f498d8bc1a669bc77f7d2eaa91c1279d4 (diff)
downloadpaludis-dd26244a925bac6f21db19f0c8eaf506c5df2f0c.tar.gz
paludis-dd26244a925bac6f21db19f0c8eaf506c5df2f0c.tar.xz
Better variable names, less likely to shadow. I hate macros
-rw-r--r--test/test_framework.hh16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/test_framework.hh b/test/test_framework.hh
index 7f2ee10..0ef9e58 100644
--- a/test/test_framework.hh
+++ b/test/test_framework.hh
@@ -224,9 +224,9 @@ namespace test
"' but got '" + test_h.s_a + "'"); \
} catch (const TestFailedException &) { \
throw; \
- } catch (const std::exception & e) { \
+ } catch (const std::exception & test_e) { \
throw TestFailedException(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
- "Test threw unexpected exception " + test::get_exception_to_debug_string()(e) + \
+ "Test threw unexpected exception " + test::get_exception_to_debug_string()(test_e) + \
" inside a TEST_CHECK_EQUAL block"); \
} catch (...) { \
throw TestFailedException(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
@@ -247,9 +247,9 @@ namespace test
"' but got '" + s_a + "'"); \
} catch (const TestFailedException &) { \
throw; \
- } catch (const std::exception & e) { \
+ } catch (const std::exception & test_e) { \
throw TestFailedException(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
- "Test threw unexpected exception " + test::get_exception_to_debug_string()(e) + \
+ "Test threw unexpected exception " + test::get_exception_to_debug_string()(test_e) + \
" inside a TEST_CHECK_STRINGIFY_EQUAL block"); \
} catch (...) { \
throw TestFailedException(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
@@ -267,9 +267,9 @@ namespace test
"Check '" #a "' failed"); \
} catch (const TestFailedException &) { \
throw; \
- } catch (const std::exception & e) { \
+ } catch (const std::exception & test_e) { \
throw TestFailedException(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
- "Test threw unexpected exception " + test::get_exception_to_debug_string()(e) + \
+ "Test threw unexpected exception " + test::get_exception_to_debug_string()(test_e) + \
" inside a TEST_CHECK block"); \
} catch (...) { \
throw TestFailedException(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
@@ -292,9 +292,9 @@ namespace test
} \
} catch (const TestFailedException &) { \
throw; \
- } catch (const std::exception & e) { \
+ } catch (const std::exception & test_e) { \
throw TestFailedException(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
- "Test threw unexpected exception " + test::get_exception_to_debug_string()(e) + \
+ "Test threw unexpected exception " + test::get_exception_to_debug_string()(test_e) + \
" inside a TEST_CHECK_THROWS block"); \
} catch (...) { \
throw TestFailedException(__PRETTY_FUNCTION__, __FILE__, __LINE__, \