From 57b1dbac65e1ec55b28715408c0694d96c925490 Mon Sep 17 00:00:00 2001 From: Alessio Quaglino Date: Wed, 1 May 2024 08:19:08 -0700 Subject: [PATCH] Fixed bug with error printing in user_api_test. PiperOrigin-RevId: 629728927 Change-Id: I9eeae8c6abf469776c59d1ea6b3cb01f923dcef9 --- test/user/user_api_test.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/test/user/user_api_test.cc b/test/user/user_api_test.cc index 1d5e9d2e..4c9af8ab 100644 --- a/test/user/user_api_test.cc +++ b/test/user/user_api_test.cc @@ -92,20 +92,25 @@ TEST_F(PluginTest, RecompileCompare) { std::array err; mjSpec* s = mjParseXML(xml.c_str(), nullptr, err.data(), err.size()); + ASSERT_THAT(s, NotNull()) + << "Failed to load " << xml << ": " << err.data(); + // copy spec mjSpec* s_copy = mjs_copySpec(s); // compile twice and compare mjModel* m_old = mjs_compile(s, nullptr); + + ASSERT_THAT(m_old, NotNull()) + << "Failed to compile " << xml << ": " << mjs_getError(s); + mjModel* m_new = mjs_compile(s, nullptr); mjModel* m_copy = mjs_compile(s_copy, nullptr); - ASSERT_THAT(m_old, NotNull()) - << "Failed to compile " << xml << ": " << err.data(); ASSERT_THAT(m_new, NotNull()) - << "Failed to recompile " << xml << ": " << err.data(); + << "Failed to recompile " << xml << ": " << mjs_getError(s); ASSERT_THAT(m_copy, NotNull()) - << "Failed to compile " << xml << ": " << err.data(); + << "Failed to compile " << xml << ": " << mjs_getError(s_copy); EXPECT_LE(CompareModel(m_old, m_new, field), tol) << "Compiled and recompiled models are different!\n" @@ -122,7 +127,7 @@ TEST_F(PluginTest, RecompileCompare) { mjModel* m_copy2 = mjs_compile(s_copy2, nullptr); ASSERT_THAT(m_copy2, NotNull()) - << "Failed to compile " << xml << ": " << err.data(); + << "Failed to compile " << xml << ": " << mjs_getError(s_copy2); EXPECT_LE(CompareModel(m_old, m_copy2, field), tol) << "Original and re-copied models are different!\n"