diff options
| author | nzolnierzmdb <nicholas.zolnierz@mongodb.com> | 2017-03-13 17:43:32 -0400 |
|---|---|---|
| committer | Nick Zolnierz <nicholas.zolnierz@mongodb.com> | 2017-03-31 13:24:40 -0400 |
| commit | 896687b8ae6b7f848da88c7186a44bf3163c2254 (patch) | |
| tree | 0913588b863c50c259a496345c6ad8cac3a42650 /src/mongo/unittest/unittest.h | |
| parent | 03945fa420fd22a690151593e8afc88bda3008bf (diff) | |
| download | mongo-896687b8ae6b7f848da88c7186a44bf3163c2254.tar.gz | |
SERVER-24879 Add $mergeObjects aggregation expression
Diffstat (limited to 'src/mongo/unittest/unittest.h')
| -rw-r--r-- | src/mongo/unittest/unittest.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/unittest/unittest.h b/src/mongo/unittest/unittest.h index 6bb7bffdff8..adef50b2369 100644 --- a/src/mongo/unittest/unittest.h +++ b/src/mongo/unittest/unittest.h @@ -135,9 +135,9 @@ * Behaves like ASSERT_THROWS, above, but also fails if calling getCode() on the thrown exception * does not return an error code equal to EXPECTED_CODE. */ -#define ASSERT_THROWS_CODE(STATEMENT, EXCEPTION_TYPE, EXPECTED_CODE) \ - ASSERT_THROWS_PRED(STATEMENT, EXCEPTION_TYPE, ([](const EXCEPTION_TYPE& ex) { \ - return (EXPECTED_CODE) == ex.getCode(); \ +#define ASSERT_THROWS_CODE(STATEMENT, EXCEPTION_TYPE, EXPECTED_CODE) \ + ASSERT_THROWS_PRED(STATEMENT, EXCEPTION_TYPE, ([&](const EXCEPTION_TYPE& ex) { \ + return (EXPECTED_CODE) == ex.getCode(); \ })) /** @@ -146,7 +146,7 @@ * does not return a string equal to EXPECTED_WHAT. */ #define ASSERT_THROWS_CODE_AND_WHAT(STATEMENT, EXCEPTION_TYPE, EXPECTED_CODE, EXPECTED_WHAT) \ - ASSERT_THROWS_PRED(STATEMENT, EXCEPTION_TYPE, ([](const EXCEPTION_TYPE& ex) { \ + ASSERT_THROWS_PRED(STATEMENT, EXCEPTION_TYPE, ([&](const EXCEPTION_TYPE& ex) { \ return (EXPECTED_CODE) == ex.getCode() && \ ::mongo::StringData(ex.what()) == \ ::mongo::StringData(EXPECTED_WHAT); \ |