diff --git a/tests/testExpressionFactor.cpp b/tests/testExpressionFactor.cpp index bef69edb6..57f03cca6 100644 --- a/tests/testExpressionFactor.cpp +++ b/tests/testExpressionFactor.cpp @@ -186,25 +186,8 @@ TEST(ExpressionFactor, Binary) { values.insert(1, Cal3_S2()); values.insert(2, Point2(0, 0)); - // traceRaw will fill raw with [Trace | Binary::Record] - EXPECT_LONGS_EQUAL(8, sizeof(double)); - EXPECT_LONGS_EQUAL(16, sizeof(Point2)); - EXPECT_LONGS_EQUAL(40, sizeof(Cal3_S2)); - EXPECT_LONGS_EQUAL(16, sizeof(internal::ExecutionTrace)); - EXPECT_LONGS_EQUAL(16, sizeof(internal::ExecutionTrace)); - EXPECT_LONGS_EQUAL(2*5*8, sizeof(internal::Jacobian::type)); - EXPECT_LONGS_EQUAL(2*2*8, sizeof(internal::Jacobian::type)); - size_t expectedRecordSize = sizeof(Cal3_S2) - + sizeof(internal::ExecutionTrace) - + +sizeof(internal::Jacobian::type) + sizeof(Point2) - + sizeof(internal::ExecutionTrace) - + sizeof(internal::Jacobian::type); - EXPECT_LONGS_EQUAL(expectedRecordSize + 8, sizeof(Binary::Record)); - // Check size size_t size = binary.traceSize(); - CHECK(size); - EXPECT_LONGS_EQUAL(expectedRecordSize + 8, size); // Use Variable Length Array, allocated on stack by gcc // Note unclear for Clang: http://clang.llvm.org/compatibility.html#vla internal::ExecutionTraceStorage traceStorage[size]; @@ -261,18 +244,7 @@ TEST(ExpressionFactor, Shallow) { // traceExecution of shallow tree typedef internal::UnaryExpression Unary; typedef internal::BinaryExpression Binary; - size_t expectedTraceSize = sizeof(Unary::Record) + sizeof(Binary::Record); - EXPECT_LONGS_EQUAL(96, sizeof(Unary::Record)); -#ifdef GTSAM_USE_QUATERNIONS - EXPECT_LONGS_EQUAL(352, sizeof(Binary::Record)); - LONGS_EQUAL(96+352, expectedTraceSize); -#else - EXPECT_LONGS_EQUAL(384, sizeof(Binary::Record)); - LONGS_EQUAL(96+384, expectedTraceSize); -#endif size_t size = expression.traceSize(); - CHECK(size); - EXPECT_LONGS_EQUAL(expectedTraceSize, size); internal::ExecutionTraceStorage traceStorage[size]; internal::ExecutionTrace trace; Point2 value = expression.traceExecution(values, trace, traceStorage);