Remove absl dep and custom MujocoTest from usd plugin tests.
PiperOrigin-RevId: 753144576 Change-Id: I3d4fd470c698967a50b189b99c1bb808a9a80306
This commit is contained in:
committed by
Copybara-Service
parent
45d3fef2fc
commit
177fce9fa1
@@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
#include <gmock/gmock.h>
|
#include <gmock/gmock.h>
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <absl/log/check.h>
|
|
||||||
#include <pxr/usd/sdf/assetPath.h>
|
#include <pxr/usd/sdf/assetPath.h>
|
||||||
#include <pxr/usd/sdf/declareHandles.h>
|
#include <pxr/usd/sdf/declareHandles.h>
|
||||||
#include <pxr/usd/sdf/fileFormat.h>
|
#include <pxr/usd/sdf/fileFormat.h>
|
||||||
@@ -62,5 +61,4 @@ void ExpectAttributeHasConnection(pxr::UsdStageRefPtr stage, const char* path,
|
|||||||
EXPECT_EQ(sources.size(), 1);
|
EXPECT_EQ(sources.size(), 1);
|
||||||
EXPECT_EQ(sources[0], SdfPath(connection_path));
|
EXPECT_EQ(sources[0], SdfPath(connection_path));
|
||||||
}
|
}
|
||||||
//
|
|
||||||
} // namespace mujoco
|
} // namespace mujoco
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include "test/fixture.h"
|
|
||||||
#include <pxr/usd/sdf/assetPath.h>
|
#include <pxr/usd/sdf/assetPath.h>
|
||||||
#include <pxr/usd/sdf/declareHandles.h>
|
#include <pxr/usd/sdf/declareHandles.h>
|
||||||
#include <pxr/usd/sdf/fileFormat.h>
|
#include <pxr/usd/sdf/fileFormat.h>
|
||||||
@@ -95,8 +94,5 @@ void ExpectAttributeEqual<pxr::SdfAssetPath>(pxr::UsdStageRefPtr stage,
|
|||||||
|
|
||||||
void ExpectAttributeHasConnection(pxr::UsdStageRefPtr stage, const char* path,
|
void ExpectAttributeHasConnection(pxr::UsdStageRefPtr stage, const char* path,
|
||||||
const char* connection_path);
|
const char* connection_path);
|
||||||
|
|
||||||
using MjcfSdfFileFormatPluginTest = MujocoTest;
|
|
||||||
|
|
||||||
} // namespace mujoco
|
} // namespace mujoco
|
||||||
#endif // MUJOCO_TEST_EXPERIMENTAL_USD_PLUGINS_MJCF_FIXTURE_H_
|
#endif // MUJOCO_TEST_EXPERIMENTAL_USD_PLUGINS_MJCF_FIXTURE_H_
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
|
|
||||||
#include <gmock/gmock.h>
|
#include <gmock/gmock.h>
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <absl/strings/string_view.h>
|
|
||||||
#include "test/experimental/usd/plugins/mjcf/fixture.h"
|
#include "test/experimental/usd/plugins/mjcf/fixture.h"
|
||||||
#include "test/fixture.h"
|
#include "test/fixture.h"
|
||||||
#include <pxr/base/gf/vec2f.h>
|
#include <pxr/base/gf/vec2f.h>
|
||||||
@@ -60,6 +59,7 @@ namespace mujoco {
|
|||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
using pxr::SdfPath;
|
using pxr::SdfPath;
|
||||||
|
using MjcfSdfFileFormatPluginTest = MujocoTest;
|
||||||
|
|
||||||
static const char* kMaterialsPath =
|
static const char* kMaterialsPath =
|
||||||
"experimental/usd/plugins/mjcf/testdata/materials.xml";
|
"experimental/usd/plugins/mjcf/testdata/materials.xml";
|
||||||
|
|||||||
Reference in New Issue
Block a user