From 6088d5cee890749bdbbdfd3500842c5c915e5b82 Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Mon, 27 Feb 2012 03:48:16 +0000 Subject: [PATCH] Fixed Key test by adding EXPECT to otherwise naked assert_equal statements --- gtsam/nonlinear/tests/testKey.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gtsam/nonlinear/tests/testKey.cpp b/gtsam/nonlinear/tests/testKey.cpp index 397bf9958..54a2e504a 100644 --- a/gtsam/nonlinear/tests/testKey.cpp +++ b/gtsam/nonlinear/tests/testKey.cpp @@ -44,17 +44,17 @@ TEST(Key, KeySymbolEncoding) { Key key = 0x6100000000000005; string str = "a5"; - LONGS_EQUAL(key, (Key)symbol); - assert_equal(str, DefaultKeyFormatter(symbol)); - assert_equal(symbol, Symbol(key)); + EXPECT_LONGS_EQUAL(key, (Key)symbol); + EXPECT(assert_equal(str, DefaultKeyFormatter(symbol))); + EXPECT(assert_equal(symbol, Symbol(key))); } else if(sizeof(Key) == 4) { Symbol symbol(0x61, 5); Key key = 0x61000005; string str = "a5"; - LONGS_EQUAL(key, (Key)symbol); - assert_equal(str, DefaultKeyFormatter(symbol)); - assert_equal(symbol, Symbol(key)); + EXPECT_LONGS_EQUAL(key, (Key)symbol); + EXPECT(assert_equal(str, DefaultKeyFormatter(symbol))); + EXPECT(assert_equal(symbol, Symbol(key))); } }