Move Mujoco USD test fixture out of MJCF plugin directory and rename to test_utils.
PiperOrigin-RevId: 753183581 Change-Id: Iedd6594ac679ca026f8af29c647d18ae93003a53
This commit is contained in:
committed by
Copybara-Service
parent
177fce9fa1
commit
bb07fa0c78
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
#include <gmock/gmock.h>
|
#include <gmock/gmock.h>
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include "test/experimental/usd/plugins/mjcf/fixture.h"
|
#include "test/experimental/usd/test_utils.h"
|
||||||
#include "test/fixture.h"
|
#include "test/fixture.h"
|
||||||
#include <pxr/base/gf/vec2f.h>
|
#include <pxr/base/gf/vec2f.h>
|
||||||
#include <pxr/base/gf/vec3f.h>
|
#include <pxr/base/gf/vec3f.h>
|
||||||
@@ -56,6 +56,7 @@ TF_DEFINE_PRIVATE_TOKENS(_tokens,
|
|||||||
PXR_NAMESPACE_CLOSE_SCOPE
|
PXR_NAMESPACE_CLOSE_SCOPE
|
||||||
|
|
||||||
namespace mujoco {
|
namespace mujoco {
|
||||||
|
namespace usd {
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
using pxr::SdfPath;
|
using pxr::SdfPath;
|
||||||
@@ -730,4 +731,5 @@ TEST_F(MjcfSdfFileFormatPluginTest, TestPhysicsColliders) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
} // namespace usd
|
||||||
} // namespace mujoco
|
} // namespace mujoco
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
#include "test/experimental/usd/plugins/mjcf/fixture.h"
|
#include "test/experimental/usd/test_utils.h"
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
@@ -28,6 +28,7 @@
|
|||||||
#include <pxr/usd/usdGeom/mesh.h>
|
#include <pxr/usd/usdGeom/mesh.h>
|
||||||
#include <pxr/usd/usdGeom/primvarsAPI.h>
|
#include <pxr/usd/usdGeom/primvarsAPI.h>
|
||||||
namespace mujoco {
|
namespace mujoco {
|
||||||
|
namespace usd {
|
||||||
|
|
||||||
using pxr::SdfPath;
|
using pxr::SdfPath;
|
||||||
|
|
||||||
@@ -61,4 +62,5 @@ 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 usd
|
||||||
} // namespace mujoco
|
} // namespace mujoco
|
||||||
@@ -67,6 +67,7 @@
|
|||||||
EXPECT_FALSE((stage)->GetAttributeAtPath(SdfPath(path)).HasValue());
|
EXPECT_FALSE((stage)->GetAttributeAtPath(SdfPath(path)).HasValue());
|
||||||
|
|
||||||
namespace mujoco {
|
namespace mujoco {
|
||||||
|
namespace usd {
|
||||||
|
|
||||||
pxr::SdfLayerRefPtr LoadLayer(
|
pxr::SdfLayerRefPtr LoadLayer(
|
||||||
const std::string& xml,
|
const std::string& xml,
|
||||||
@@ -94,5 +95,6 @@ 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);
|
||||||
|
} // namespace usd
|
||||||
} // namespace mujoco
|
} // namespace mujoco
|
||||||
#endif // MUJOCO_TEST_EXPERIMENTAL_USD_PLUGINS_MJCF_FIXTURE_H_
|
#endif // MUJOCO_TEST_EXPERIMENTAL_USD_PLUGINS_MJCF_FIXTURE_H_
|
||||||
Reference in New Issue
Block a user