From 077acb1c8fc2075684cd068fb9f6e7adb63f07a7 Mon Sep 17 00:00:00 2001
From: Saran Tunyasuvunakool <stunya@google.com>
Date: Fri, 7 Oct 2022 01:42:13 -0700
Subject: [PATCH] Revert test fixture name in user_{model,objects}_test.cc.

These were inadvertently renamed to XMLReaderTest by an overzealous auto-renamer in 58fd72f53dde9eb876aad36ac641a331b9aecc30.

PiperOrigin-RevId: 479520906
Change-Id: Ia50ec659f21a92cbcd4b953cde54dd98f0adb67a
---
 test/user/user_model_test.cc   | 18 +++++++++---------
 test/user/user_objects_test.cc | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/user/user_model_test.cc b/test/user/user_model_test.cc
index 26bcee1e..59abbcb3 100644
--- a/test/user/user_model_test.cc
+++ b/test/user/user_model_test.cc
@@ -27,7 +27,7 @@ namespace mujoco {
 namespace {
 
 using ::testing::ElementsAre;
-using XMLReaderTest = MujocoTest;
+using UserDataTest = MujocoTest;
 
 static std::vector<mjtNum> GetRow(const mjtNum* array, int ncolumn, int row) {
   return std::vector<mjtNum>(array + ncolumn * row,
@@ -36,7 +36,7 @@ static std::vector<mjtNum> GetRow(const mjtNum* array, int ncolumn, int row) {
 
 // ------------- test automatic inference of nuser_xxx -------------------------
 
-TEST_F(XMLReaderTest, AutoNUserBody) {
+TEST_F(UserDataTest, AutoNUserBody) {
   static constexpr char xml[] = R"(
   <mujoco>
     <worldbody>
@@ -52,7 +52,7 @@ TEST_F(XMLReaderTest, AutoNUserBody) {
   mj_deleteModel(m);
 }
 
-TEST_F(XMLReaderTest, AutoNUserJoint) {
+TEST_F(UserDataTest, AutoNUserJoint) {
   static constexpr char xml[] = R"(
   <mujoco>
     <worldbody>
@@ -71,7 +71,7 @@ TEST_F(XMLReaderTest, AutoNUserJoint) {
   mj_deleteModel(m);
 }
 
-TEST_F(XMLReaderTest, AutoNUserGeom) {
+TEST_F(UserDataTest, AutoNUserGeom) {
   static constexpr char xml[] = R"(
   <mujoco>
     <worldbody>
@@ -87,7 +87,7 @@ TEST_F(XMLReaderTest, AutoNUserGeom) {
   mj_deleteModel(m);
 }
 
-TEST_F(XMLReaderTest, AutoNUserSite) {
+TEST_F(UserDataTest, AutoNUserSite) {
   static constexpr char xml[] = R"(
   <mujoco>
     <worldbody>
@@ -103,7 +103,7 @@ TEST_F(XMLReaderTest, AutoNUserSite) {
   mj_deleteModel(m);
 }
 
-TEST_F(XMLReaderTest, AutoNUserCamera) {
+TEST_F(UserDataTest, AutoNUserCamera) {
   static constexpr char xml[] = R"(
   <mujoco>
     <worldbody>
@@ -119,7 +119,7 @@ TEST_F(XMLReaderTest, AutoNUserCamera) {
   mj_deleteModel(m);
 }
 
-TEST_F(XMLReaderTest, AutoNUserTendon) {
+TEST_F(UserDataTest, AutoNUserTendon) {
   static constexpr char xml[] = R"(
   <mujoco>
     <worldbody>
@@ -145,7 +145,7 @@ TEST_F(XMLReaderTest, AutoNUserTendon) {
   mj_deleteModel(m);
 }
 
-TEST_F(XMLReaderTest, AutoNUserActuator) {
+TEST_F(UserDataTest, AutoNUserActuator) {
   static constexpr char xml[] = R"(
   <mujoco>
     <worldbody>
@@ -169,7 +169,7 @@ TEST_F(XMLReaderTest, AutoNUserActuator) {
   mj_deleteModel(m);
 }
 
-TEST_F(XMLReaderTest, AutoNUserSensor) {
+TEST_F(UserDataTest, AutoNUserSensor) {
   static constexpr char xml[] = R"(
   <mujoco>
     <worldbody>
diff --git a/test/user/user_objects_test.cc b/test/user/user_objects_test.cc
index 53d64359..5acbdfc5 100644
--- a/test/user/user_objects_test.cc
+++ b/test/user/user_objects_test.cc
@@ -459,9 +459,9 @@ TEST_F(ActRangeTest, ActRangeDefaultsPropagate) {
 
 // ------------- test nuser_xxx fields -----------------------------------------
 
-using XMLReaderTest = MujocoTest;
+using UserDataTest = MujocoTest;
 
-TEST_F(XMLReaderTest, NBodyTooSmall) {
+TEST_F(UserDataTest, NBodyTooSmall) {
   static constexpr char xml[] = R"(
   <mujoco>
     <size nuser_body="2"/>
@@ -476,7 +476,7 @@ TEST_F(XMLReaderTest, NBodyTooSmall) {
   EXPECT_THAT(error.data(), HasSubstr("nuser_body"));
 }
 
-TEST_F(XMLReaderTest, NJointTooSmall) {
+TEST_F(UserDataTest, NJointTooSmall) {
   static constexpr char xml[] = R"(
   <mujoco>
     <size nuser_jnt="2"/>
@@ -494,7 +494,7 @@ TEST_F(XMLReaderTest, NJointTooSmall) {
   EXPECT_THAT(error.data(), HasSubstr("nuser_jnt"));
 }
 
-TEST_F(XMLReaderTest, NGeomTooSmall) {
+TEST_F(UserDataTest, NGeomTooSmall) {
   static constexpr char xml[] = R"(
   <mujoco>
     <size nuser_geom="2"/>
@@ -509,7 +509,7 @@ TEST_F(XMLReaderTest, NGeomTooSmall) {
   EXPECT_THAT(error.data(), HasSubstr("nuser_geom"));
 }
 
-TEST_F(XMLReaderTest, NSiteTooSmall) {
+TEST_F(UserDataTest, NSiteTooSmall) {
   static constexpr char xml[] = R"(
   <mujoco>
     <size nuser_site="2"/>
@@ -524,7 +524,7 @@ TEST_F(XMLReaderTest, NSiteTooSmall) {
   EXPECT_THAT(error.data(), HasSubstr("nuser_site"));
 }
 
-TEST_F(XMLReaderTest, NCameraTooSmall) {
+TEST_F(UserDataTest, NCameraTooSmall) {
   static constexpr char xml[] = R"(
   <mujoco>
     <size nuser_cam="2"/>
@@ -539,7 +539,7 @@ TEST_F(XMLReaderTest, NCameraTooSmall) {
   EXPECT_THAT(error.data(), HasSubstr("nuser_cam"));
 }
 
-TEST_F(XMLReaderTest, NTendonTooSmall) {
+TEST_F(UserDataTest, NTendonTooSmall) {
   static constexpr char xml[] = R"(
   <mujoco>
     <size nuser_tendon="2"/>
@@ -561,7 +561,7 @@ TEST_F(XMLReaderTest, NTendonTooSmall) {
   EXPECT_THAT(error.data(), HasSubstr("nuser_tendon"));
 }
 
-TEST_F(XMLReaderTest, NActuatorTooSmall) {
+TEST_F(UserDataTest, NActuatorTooSmall) {
   static constexpr char xml[] = R"(
   <mujoco>
     <size nuser_actuator="2"/>
@@ -582,7 +582,7 @@ TEST_F(XMLReaderTest, NActuatorTooSmall) {
   EXPECT_THAT(error.data(), HasSubstr("nuser_actuator"));
 }
 
-TEST_F(XMLReaderTest, NSensorTooSmall) {
+TEST_F(UserDataTest, NSensorTooSmall) {
   static constexpr char xml[] = R"(
   <mujoco>
     <size nuser_sensor="2"/>