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

Rename user_asset_cache to user_cache.

Browse Source 
PiperOrigin-RevId: 601097322
Change-Id: Iea3d6481cd214028ef63ed72868999ecb0b1eeb4
This commit is contained in:
Kyle Bayes
2024-01-24 06:04:42 -08:00
committed by Copybara-Service
parent 0a7be1732c
commit aede8cf5cf
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/user/user_asset_cache.cc → src/user/user_cache.cc
+1 -1
View File
@@ -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 "user/user_asset_cache.h" #include "user/user_cache.h"
#include <algorithm> #include <algorithm>
#include <cstdint> #include <cstdint>
src/user/user_asset_cache.h → src/user/user_cache.h
+3 -3
View File
@@ -12,8 +12,8 @@
// 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.
#ifndef MUJOCO_SRC_USER_ASSET_CACHE_H_ #ifndef MUJOCO_SRC_USER_CACHE_H_
#define MUJOCO_SRC_USER_ASSET_CACHE_H_ #define MUJOCO_SRC_USER_CACHE_H_
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
@@ -192,4 +192,4 @@ class mjCCache {
std::unordered_map<std::string, std::unordered_set<mjCAsset*>> models_; std::unordered_map<std::string, std::unordered_set<mjCAsset*>> models_;
}; };
#endif // MUJOCO_SRC_USER_ASSET_CACHE_H_ #endif // MUJOCO_SRC_USER_CACHE_H_
test/user/user_asset_cache_test.cc → test/user/user_cache_test.cc
+22 -22
View File
@@ -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.
// Tests for user/user_asset_cache.cc // Tests for user/user_cache.cc
#include <cstddef> #include <cstddef>
#include <string> #include <string>
@@ -22,7 +22,7 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "test/fixture.h" #include "test/fixture.h"
#include "src/user/user_asset_cache.h" #include "src/user/user_cache.h"
namespace mujoco { namespace mujoco {
@@ -31,18 +31,18 @@ using ::testing::IsNull;
using ::testing::NotNull; using ::testing::NotNull;
using ::testing::StrEq; using ::testing::StrEq;
using AssetCacheTest = MujocoTest; using CacheTest = MujocoTest;
namespace { namespace {
constexpr int kMaxSize = 100; // in bytes constexpr int kMaxSize = 100; // in bytes
TEST(AssetCacheTest, SizeTest) { TEST(CacheTest, SizeTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
EXPECT_EQ(cache.Size(), 0); EXPECT_EQ(cache.Size(), 0);
} }
TEST(AssetCacheTest, HasAssetSuccessTest) { TEST(CacheTest, HasAssetSuccessTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
mjCAsset asset("file.xml", "foo.obj", "now"); mjCAsset asset("file.xml", "foo.obj", "now");
@@ -51,7 +51,7 @@ TEST(AssetCacheTest, HasAssetSuccessTest) {
EXPECT_THAT(*(cache.HasAsset("foo.obj")), StrEq("now")); EXPECT_THAT(*(cache.HasAsset("foo.obj")), StrEq("now"));
} }
TEST(AssetCacheTest, HasAssetFailureTest) { TEST(CacheTest, HasAssetFailureTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
mjCAsset asset("file.xml", "foo.obj", "now"); mjCAsset asset("file.xml", "foo.obj", "now");
@@ -60,7 +60,7 @@ TEST(AssetCacheTest, HasAssetFailureTest) {
EXPECT_THAT(cache.HasAsset("file2.xml"), nullptr); EXPECT_THAT(cache.HasAsset("file2.xml"), nullptr);
} }
TEST(AssetCacheTest, AddSuccessTest) { TEST(CacheTest, AddSuccessTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
std::vector<int> v1 = {1, 2, 3}; std::vector<int> v1 = {1, 2, 3};
std::vector<double> v2 = {1.0, 2.0, 3.0}; std::vector<double> v2 = {1.0, 2.0, 3.0};
@@ -75,7 +75,7 @@ TEST(AssetCacheTest, AddSuccessTest) {
ASSERT_EQ(cache.Size(), 36); ASSERT_EQ(cache.Size(), 36);
} }
TEST(AssetCacheTest, AddFailureTest) { TEST(CacheTest, AddFailureTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
std::vector<int> v1 = {1, 2, 3}; std::vector<int> v1 = {1, 2, 3};
std::vector<double> v2 = {1.0, 2.0, 3.0}; std::vector<double> v2 = {1.0, 2.0, 3.0};
@@ -89,7 +89,7 @@ TEST(AssetCacheTest, AddFailureTest) {
ASSERT_EQ(cache.Size(), 12); ASSERT_EQ(cache.Size(), 12);
} }
TEST(AssetCacheTest, InsertReplaceTest) { TEST(CacheTest, InsertReplaceTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
std::vector<int> v1 = {1, 2, 3}; std::vector<int> v1 = {1, 2, 3};
std::vector<double> v2 = {1.0, 2.0, 3.0}; std::vector<double> v2 = {1.0, 2.0, 3.0};
@@ -112,7 +112,7 @@ TEST(AssetCacheTest, InsertReplaceTest) {
ASSERT_EQ(cache.Size(), 24); ASSERT_EQ(cache.Size(), 24);
} }
TEST(AssetCacheTest, MoveInsertNewTest) { TEST(CacheTest, MoveInsertNewTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
std::vector<int> v1 = {1, 2, 3}; std::vector<int> v1 = {1, 2, 3};
std::vector<double> v2 = {1.0, 2.0, 3.0}; std::vector<double> v2 = {1.0, 2.0, 3.0};
@@ -127,7 +127,7 @@ TEST(AssetCacheTest, MoveInsertNewTest) {
ASSERT_EQ(cache.Size(), 36); ASSERT_EQ(cache.Size(), 36);
} }
TEST(AssetCacheTest, MoveInsertReplaceTest) { TEST(CacheTest, MoveInsertReplaceTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
std::vector<int> v1 = {1, 2, 3}; std::vector<int> v1 = {1, 2, 3};
std::vector<double> v2 = {1.0, 2.0, 3.0}; std::vector<double> v2 = {1.0, 2.0, 3.0};
@@ -150,7 +150,7 @@ TEST(AssetCacheTest, MoveInsertReplaceTest) {
ASSERT_EQ(cache.Size(), 24); ASSERT_EQ(cache.Size(), 24);
} }
TEST(AssetCacheTest, GetSuccessTest) { TEST(CacheTest, GetSuccessTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
std::vector<int> v1 = {1, 2, 3}; std::vector<int> v1 = {1, 2, 3};
std::vector<double> v2 = {1.0, 2.0, 3.0}; std::vector<double> v2 = {1.0, 2.0, 3.0};
@@ -174,7 +174,7 @@ TEST(AssetCacheTest, GetSuccessTest) {
EXPECT_THAT(v4, ElementsAreArray(v3)); EXPECT_THAT(v4, ElementsAreArray(v3));
} }
TEST(AssetCacheTest, GetFailueTest) { TEST(CacheTest, GetFailueTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
std::vector<int> v = {1, 2, 3}; std::vector<int> v = {1, 2, 3};
mjCAsset asset("file.xml", "foo.obj", "now"); mjCAsset asset("file.xml", "foo.obj", "now");
@@ -190,7 +190,7 @@ TEST(AssetCacheTest, GetFailueTest) {
} }
// Trim cache based off of access count // Trim cache based off of access count
TEST(AssetCacheTest, LimitTest1) { TEST(CacheTest, LimitTest1) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
EXPECT_THAT(cache.MaxSize(), kMaxSize); EXPECT_THAT(cache.MaxSize(), kMaxSize);
std::vector<int> v = {1, 2, 3}; std::vector<int> v = {1, 2, 3};
@@ -218,7 +218,7 @@ TEST(AssetCacheTest, LimitTest1) {
} }
// Trim cache based off of insert order // Trim cache based off of insert order
TEST(AssetCacheTest, LimitTest2) { TEST(CacheTest, LimitTest2) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
std::vector<int> v = {1, 2, 3}; std::vector<int> v = {1, 2, 3};
mjCAsset asset1("file.xml", "foo.obj", "now"); mjCAsset asset1("file.xml", "foo.obj", "now");
@@ -243,7 +243,7 @@ TEST(AssetCacheTest, LimitTest2) {
EXPECT_THAT(cache.HasAsset("bar.obj"), NotNull()); EXPECT_THAT(cache.HasAsset("bar.obj"), NotNull());
} }
TEST(AssetCacheTest, ResetAllTest) { TEST(CacheTest, ResetAllTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
mjCAsset asset1("file1.xml", "foo.obj", "now"); mjCAsset asset1("file1.xml", "foo.obj", "now");
mjCAsset asset2("file2.xml", "bar.obj", "now"); mjCAsset asset2("file2.xml", "bar.obj", "now");
@@ -259,7 +259,7 @@ TEST(AssetCacheTest, ResetAllTest) {
EXPECT_THAT(cache.HasAsset("bar.obj"), IsNull()); EXPECT_THAT(cache.HasAsset("bar.obj"), IsNull());
} }
TEST(AssetCacheTest, ResetModelTest1) { TEST(CacheTest, ResetModelTest1) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
mjCAsset asset("file1.xml", "foo.obj", "now"); mjCAsset asset("file1.xml", "foo.obj", "now");
mjCAsset asset2("file1.xml", "bar.obj", "now"); mjCAsset asset2("file1.xml", "bar.obj", "now");
@@ -274,7 +274,7 @@ TEST(AssetCacheTest, ResetModelTest1) {
EXPECT_THAT(cache.HasAsset("bar.obj"), IsNull()); EXPECT_THAT(cache.HasAsset("bar.obj"), IsNull());
} }
TEST(AssetCacheTest, ResetModelTest2) { TEST(CacheTest, ResetModelTest2) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
mjCAsset asset("file1.xml", "foo.obj", "now"); mjCAsset asset("file1.xml", "foo.obj", "now");
mjCAsset asset2("file2.xml", "foo.obj", "now"); mjCAsset asset2("file2.xml", "foo.obj", "now");
@@ -289,7 +289,7 @@ TEST(AssetCacheTest, ResetModelTest2) {
EXPECT_THAT(cache.HasAsset("bar.obj"), IsNull()); EXPECT_THAT(cache.HasAsset("bar.obj"), IsNull());
} }
TEST(AssetCacheTest, RemoveModelTest1) { TEST(CacheTest, RemoveModelTest1) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
mjCAsset asset("file1.xml", "foo.obj", "now"); mjCAsset asset("file1.xml", "foo.obj", "now");
mjCAsset asset2("file1.xml", "bar.obj", "now"); mjCAsset asset2("file1.xml", "bar.obj", "now");
@@ -304,7 +304,7 @@ TEST(AssetCacheTest, RemoveModelTest1) {
EXPECT_THAT(cache.HasAsset("bar.obj"), NotNull()); EXPECT_THAT(cache.HasAsset("bar.obj"), NotNull());
} }
TEST(AssetCacheTest, RemoveModelTest2) { TEST(CacheTest, RemoveModelTest2) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
mjCAsset asset("file1.xml", "foo.obj", "now"); mjCAsset asset("file1.xml", "foo.obj", "now");
mjCAsset asset2("file2.xml", "bar.obj", "now"); mjCAsset asset2("file2.xml", "bar.obj", "now");
@@ -317,7 +317,7 @@ TEST(AssetCacheTest, RemoveModelTest2) {
EXPECT_THAT(cache.HasAsset("bar.obj"), IsNull()); EXPECT_THAT(cache.HasAsset("bar.obj"), IsNull());
} }
TEST(AssetCacheTest, DeleteAssetSuccessTest) { TEST(CacheTest, DeleteAssetSuccessTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
mjCAsset asset("file1.xml", "foo.obj", "now"); mjCAsset asset("file1.xml", "foo.obj", "now");
cache.Insert(asset); cache.Insert(asset);
@@ -327,7 +327,7 @@ TEST(AssetCacheTest, DeleteAssetSuccessTest) {
EXPECT_THAT(cache.HasAsset("foo.obj"), IsNull()); EXPECT_THAT(cache.HasAsset("foo.obj"), IsNull());
} }
TEST(AssetCacheTest, DeleteAssetFailureTest) { TEST(CacheTest, DeleteAssetFailureTest) {
mjCCache cache(kMaxSize); mjCCache cache(kMaxSize);
mjCAsset asset("file.xml", "foo.obj", "now"); mjCAsset asset("file.xml", "foo.obj", "now");
cache.Insert(asset); cache.Insert(asset);