chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix linter issues in user_objects_test.

Browse Source 
PiperOrigin-RevId: 597204770
Change-Id: I0b396d4c64684d845dc9baf205800e22c8fac314
This commit is contained in:
Yuval Tassa
2024-01-10 03:58:57 -08:00
committed by Copybara-Service
parent 371da98d97
commit 42515033a7
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/user/user_objects_test.cc
+26 -16
View File
@@ -17,6 +17,8 @@
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <cstddef> #include <cstddef>
#include <cstring>
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
@@ -25,7 +27,6 @@
#include <mujoco/mjmodel.h> #include <mujoco/mjmodel.h>
#include <mujoco/mjtnum.h> #include <mujoco/mjtnum.h>
#include <mujoco/mujoco.h> #include <mujoco/mujoco.h>
#include "src/cc/array_safety.h"
#include "test/fixture.h" #include "test/fixture.h"
namespace mujoco { namespace mujoco {
@@ -67,7 +68,8 @@ TEST_F(VfsTest, HFieldPngWithVFS) {
// should fallback to OS filesystem // should fallback to OS filesystem
mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get()); mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get());
EXPECT_THAT(model, IsNull()); EXPECT_THAT(model, IsNull());
EXPECT_THAT(error, HasSubstr("resource not found via provider or OS filesystem")); EXPECT_THAT(error,
HasSubstr("resource not found via provider or OS filesystem"));
} }
TEST_F(VfsTest, HFieldCustomWithVFS) { TEST_F(VfsTest, HFieldCustomWithVFS) {
@@ -93,7 +95,8 @@ TEST_F(VfsTest, HFieldCustomWithVFS) {
// should fallback to OS filesystem // should fallback to OS filesystem
mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get()); mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get());
EXPECT_THAT(model, IsNull()); EXPECT_THAT(model, IsNull());
EXPECT_THAT(error, HasSubstr("resource not found via provider or OS filesystem")); EXPECT_THAT(error,
HasSubstr("resource not found via provider or OS filesystem"));
} }
TEST_F(VfsTest, TexturePngWithVFS) { TEST_F(VfsTest, TexturePngWithVFS) {
@@ -120,8 +123,9 @@ TEST_F(VfsTest, TexturePngWithVFS) {
// should fallback to OS filesystem // should fallback to OS filesystem
mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get()); mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get());
EXPECT_THAT(model, IsNull()); EXPECT_THAT(model, IsNull());
EXPECT_THAT(error, HasSubstr("resource not found via provider or OS filesystem")); EXPECT_THAT(error,
} HasSubstr("resource not found via provider or OS filesystem"));
}
TEST_F(VfsTest, TextureCustomWithVFS) { TEST_F(VfsTest, TextureCustomWithVFS) {
static constexpr char xml[] = R"( static constexpr char xml[] = R"(
@@ -147,8 +151,9 @@ TEST_F(VfsTest, TextureCustomWithVFS) {
// should fallback to OS filesystem // should fallback to OS filesystem
mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get()); mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get());
EXPECT_THAT(model, IsNull()); EXPECT_THAT(model, IsNull());
EXPECT_THAT(error, HasSubstr("resource not found via provider or OS filesystem")); EXPECT_THAT(error,
} HasSubstr("resource not found via provider or OS filesystem"));
}
// ------------------------ test content_type attribute ------------------------ // ------------------------ test content_type attribute ------------------------
@@ -178,7 +183,8 @@ TEST_F(ContentTypeTest, HFieldPngWithContentType) {
// should try loading the file // should try loading the file
mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get()); mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get());
EXPECT_THAT(model, IsNull()); EXPECT_THAT(model, IsNull());
EXPECT_THAT(error, HasSubstr("resource not found via provider or OS filesystem")); EXPECT_THAT(error,
HasSubstr("resource not found via provider or OS filesystem"));
} }
TEST_F(ContentTypeTest, HFieldCustomWithContentType) { TEST_F(ContentTypeTest, HFieldCustomWithContentType) {
@@ -205,7 +211,8 @@ TEST_F(ContentTypeTest, HFieldCustomWithContentType) {
// should try loading the file // should try loading the file
mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get()); mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get());
EXPECT_THAT(model, IsNull()); EXPECT_THAT(model, IsNull());
EXPECT_THAT(error, HasSubstr("resource not found via provider or OS filesystem")); EXPECT_THAT(error,
HasSubstr("resource not found via provider or OS filesystem"));
} }
TEST_F(ContentTypeTest, HFieldWithContentTypeError) { TEST_F(ContentTypeTest, HFieldWithContentTypeError) {
@@ -259,8 +266,9 @@ TEST_F(ContentTypeTest, TexturePngWithContentType) {
// should try loading the file // should try loading the file
mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get()); mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get());
EXPECT_THAT(model, IsNull()); EXPECT_THAT(model, IsNull());
EXPECT_THAT(error, HasSubstr("resource not found via provider or OS filesystem")); EXPECT_THAT(error,
} HasSubstr("resource not found via provider or OS filesystem"));
}
TEST_F(ContentTypeTest, TextureCustomWithContentType) { TEST_F(ContentTypeTest, TextureCustomWithContentType) {
static constexpr char xml[] = R"( static constexpr char xml[] = R"(
@@ -287,8 +295,9 @@ TEST_F(ContentTypeTest, TextureCustomWithContentType) {
// should try loading the file // should try loading the file
mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get()); mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get());
EXPECT_THAT(model, IsNull()); EXPECT_THAT(model, IsNull());
EXPECT_THAT(error, HasSubstr("resource not found via provider or OS filesystem")); EXPECT_THAT(error,
} HasSubstr("resource not found via provider or OS filesystem"));
}
TEST_F(ContentTypeTest, TextureWithContentTypeError) { TEST_F(ContentTypeTest, TextureWithContentTypeError) {
static constexpr char xml[] = R"( static constexpr char xml[] = R"(
@@ -316,7 +325,7 @@ TEST_F(ContentTypeTest, TextureWithContentTypeError) {
mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get()); mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get());
EXPECT_THAT(model, IsNull()); EXPECT_THAT(model, IsNull());
EXPECT_THAT(error, HasSubstr("unsupported content type: 'image/jpeg'")); EXPECT_THAT(error, HasSubstr("unsupported content type: 'image/jpeg'"));
} }
TEST_F(ContentTypeTest, TextureLoadPng) { TEST_F(ContentTypeTest, TextureLoadPng) {
static constexpr char filename[] = "tiny"; static constexpr char filename[] = "tiny";
@@ -366,7 +375,7 @@ TEST_F(ContentTypeTest, TextureLoadPng) {
mj_deleteModel(model); mj_deleteModel(model);
mj_deleteFileVFS(vfs.get(), filename); mj_deleteFileVFS(vfs.get(), filename);
} }
// ------------------------ test keyframes ------------------------------------- // ------------------------ test keyframes -------------------------------------
@@ -980,7 +989,8 @@ TEST_F(ActRangeTest, ActRangeNoDyntype) {
std::array<char, 1024> error; std::array<char, 1024> error;
mjModel* model = LoadModelFromString(xml, error.data(), error.size()); mjModel* model = LoadModelFromString(xml, error.data(), error.size());
ASSERT_THAT(model, IsNull()); ASSERT_THAT(model, IsNull());
EXPECT_THAT(error.data(), HasSubstr("actrange specified but dyntype is 'none'")); EXPECT_THAT(error.data(),
HasSubstr("actrange specified but dyntype is 'none'"));
} }
TEST_F(ActRangeTest, ActRangeDefaultsPropagate) { TEST_F(ActRangeTest, ActRangeDefaultsPropagate) {