From ae90993ebfe92af80818ab0e7e7d746444fe917e Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 11 Jan 2022 11:01:54 -0800 Subject: [PATCH] More checks when manipulating file system in tests (#227) Signed-off-by: Louise Poubel --- src/ClientConfig_TEST.cc | 2 + src/FuelClient_TEST.cc | 41 ++++++----- src/Interface_TEST.cc | 2 +- src/LocalCache_TEST.cc | 152 ++++++++++++++++++--------------------- src/ign_src_TEST.cc | 76 ++++++++++---------- 5 files changed, 134 insertions(+), 139 deletions(-) diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc index 24bb229e..8ce0ec9a 100644 --- a/src/ClientConfig_TEST.cc +++ b/src/ClientConfig_TEST.cc @@ -413,6 +413,8 @@ TEST(ServerConfig, Url) ServerConfig srv; srv.SetUrl(common::URI("http://banana:8080/")); EXPECT_EQ("http://banana:8080", srv.Url().Str()); + EXPECT_EQ("http", srv.Url().Scheme()); + EXPECT_EQ("banana:8080", srv.Url().Path().Str()); } // Set from URI diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index 9ed02443..111dd579 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -50,8 +50,10 @@ void createLocalModel(ClientConfig &_conf) auto modelPath = common::joinPaths( "test_cache", "localhost:8007", "alice", "models", "My Model"); - common::createDirectories(common::joinPaths(modelPath, "2", "meshes")); - common::createDirectories(common::joinPaths(modelPath, "3", "meshes")); + ASSERT_TRUE(common::createDirectories( + common::joinPaths(modelPath, "2", "meshes"))); + ASSERT_TRUE(common::createDirectories( + common::joinPaths(modelPath, "3", "meshes"))); { std::ofstream fout(common::joinPaths(modelPath, "2", "model.config"), @@ -60,8 +62,8 @@ void createLocalModel(ClientConfig &_conf) fout.flush(); fout.close(); - common::copyFile(common::joinPaths(modelPath, "2", "model.config"), - common::joinPaths(modelPath, "3", "model.config")); + ASSERT_TRUE(common::copyFile(common::joinPaths(modelPath, "2", + "model.config"), common::joinPaths(modelPath, "3", "model.config"))); } { @@ -71,8 +73,8 @@ void createLocalModel(ClientConfig &_conf) fout.flush(); fout.close(); - common::copyFile(common::joinPaths(modelPath, "2", "model.sdf"), - common::joinPaths(modelPath, "3", "model.sdf")); + ASSERT_TRUE(common::copyFile(common::joinPaths(modelPath, "2", "model.sdf"), + common::joinPaths(modelPath, "3", "model.sdf"))); } { @@ -82,8 +84,9 @@ void createLocalModel(ClientConfig &_conf) fout.flush(); fout.close(); - common::copyFile(common::joinPaths(modelPath, "2", "meshes", "model.dae"), - common::joinPaths(modelPath, "3", "meshes", "model.dae")); + ASSERT_TRUE(common::copyFile(common::joinPaths(modelPath, "2", "meshes", + "model.dae"), common::joinPaths(modelPath, "3", "meshes", + "model.dae"))); } ignition::fuel_tools::ServerConfig srv; @@ -102,8 +105,8 @@ void createLocalWorld(ClientConfig &_conf) auto worldPath = common::joinPaths( "test_cache", "localhost:8007", "banana", "worlds", "My World"); - common::createDirectories(common::joinPaths(worldPath, "2")); - common::createDirectories(common::joinPaths(worldPath, "3")); + ASSERT_TRUE(common::createDirectories(common::joinPaths(worldPath, "2"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(worldPath, "3"))); { std::ofstream fout(common::joinPaths(worldPath, "2", "strawberry.world"), @@ -112,8 +115,9 @@ void createLocalWorld(ClientConfig &_conf) fout.flush(); fout.close(); - common::copyFile(common::joinPaths(worldPath, "2", "strawberry.world"), - common::joinPaths(worldPath, "3", "strawberry.world")); + ASSERT_TRUE(common::copyFile(common::joinPaths(worldPath, "2", + "strawberry.world"), common::joinPaths(worldPath, "3", + "strawberry.world"))); } ignition::fuel_tools::ServerConfig srv; @@ -399,7 +403,7 @@ TEST_F(FuelClientTest, DownloadModel) // Configure to use binary path as cache ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig config; config.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); @@ -598,7 +602,7 @@ TEST_F(FuelClientTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(ModelDependencies)) // Configure to use binary path as cache ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig config; config.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); @@ -672,7 +676,7 @@ TEST_F(FuelClientTest, CachedModel) // Configure to use binary path as cache and populate it ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig config; config.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); createLocalModel(config); @@ -875,13 +879,14 @@ TEST_F(FuelClientTest, ParseWorldUrl) // * with client config // * without server API version // * with world version `tip` + // * with trailing / { ClientConfig config; FuelClient client(config); WorldIdentifier id; const common::URI url{ - "https://fuel.ignitionrobotics.org/german/worlds/Cardboard Box/tip"}; + "https://fuel.ignitionrobotics.org/german/worlds/Cardboard Box/tip/"}; EXPECT_TRUE(client.ParseWorldUrl(url, id)); EXPECT_EQ(id.Server().Url().Str(), "https://fuel.ignitionrobotics.org"); @@ -1062,7 +1067,7 @@ TEST_F(FuelClientTest, DownloadWorld) // Configure to use binary path as cache ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ServerConfig server; server.SetUrl(ignition::common::URI( @@ -1140,7 +1145,7 @@ TEST_F(FuelClientTest, CachedWorld) // Configure to use binary path as cache and populate it ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig config; config.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); createLocalWorld(config); diff --git a/src/Interface_TEST.cc b/src/Interface_TEST.cc index 9707a3a4..dba45ee6 100644 --- a/src/Interface_TEST.cc +++ b/src/Interface_TEST.cc @@ -46,7 +46,7 @@ TEST(Interface, FetchResources) // Configure to use binary path as cache ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig config; config.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); diff --git a/src/LocalCache_TEST.cc b/src/LocalCache_TEST.cc index d30fe045..011a9756 100644 --- a/src/LocalCache_TEST.cc +++ b/src/LocalCache_TEST.cc @@ -47,18 +47,18 @@ void createLocal6Models(ClientConfig &_conf) igndbg << "Creating 6 local models in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8001"); - common::createDirectories(common::joinPaths(serverPath, - "alice", "models", "am1", "2")); - common::createDirectories(common::joinPaths(serverPath, - "alice", "models", "am2", "1")); - common::createDirectories(common::joinPaths(serverPath, - "bob", "models", "bm1", "1")); - common::createDirectories(common::joinPaths(serverPath, - "bob", "models", "bm2", "2")); - common::createDirectories(common::joinPaths(serverPath, - "trudy", "models", "tm1", "3")); - common::createDirectories(common::joinPaths(serverPath, - "trudy", "models", "tm2", "2")); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "alice", "models", "am1", "2"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "alice", "models", "am2", "1"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "bob", "models", "bm1", "1"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "bob", "models", "bm2", "2"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "trudy", "models", "tm1", "3"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "trudy", "models", "tm2", "2"))); std::ofstream fout(common::joinPaths(serverPath, "alice", "models", "am1", "2", "model.config"), @@ -67,26 +67,26 @@ void createLocal6Models(ClientConfig &_conf) fout.flush(); fout.close(); - common::copyFile(common::joinPaths(serverPath, + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "models", "am1", "2", "model.config"), common::joinPaths(serverPath, - "alice", "models", "am2", "1", "model.config")); - common::copyFile(common::joinPaths(serverPath, + "alice", "models", "am2", "1", "model.config"))); + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "models", "am1", "2", "model.config"), common::joinPaths(serverPath, - "bob", "models", "bm1", "1", "model.config")); - common::copyFile(common::joinPaths(serverPath, + "bob", "models", "bm1", "1", "model.config"))); + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "models", "am1", "2", "model.config"), common::joinPaths(serverPath, - "bob", "models", "bm2", "2", "model.config")); - common::copyFile(common::joinPaths(serverPath, + "bob", "models", "bm2", "2", "model.config"))); + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "models", "am1", "2", "model.config"), common::joinPaths(serverPath, - "trudy", "models", "tm1", "3", "model.config")); - common::copyFile(common::joinPaths(serverPath, + "trudy", "models", "tm1", "3", "model.config"))); + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "models", "am1", "2", "model.config"), common::joinPaths(serverPath, - "trudy", "models", "tm2", "2", "model.config")); + "trudy", "models", "tm2", "2", "model.config"))); ignition::fuel_tools::ServerConfig srv; srv.SetUrl(common::URI("http://localhost:8001/")); @@ -99,12 +99,12 @@ void createLocal3Models(ClientConfig &_conf) igndbg << "Creating 3 local models in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8007"); - common::createDirectories(common::joinPaths(serverPath, - "alice", "models", "am1", "2")); - common::createDirectories(common::joinPaths(serverPath, - "bob", "models", "bm1", "1")); - common::createDirectories(common::joinPaths(serverPath, - "trudy", "models", "tm1", "3")); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "alice", "models", "am1", "2"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "bob", "models", "bm1", "1"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "trudy", "models", "tm1", "3"))); std::ofstream fout(common::joinPaths(serverPath, "alice", "models", "am1", "2", "model.config"), @@ -113,14 +113,14 @@ void createLocal3Models(ClientConfig &_conf) fout.flush(); fout.close(); - common::copyFile(common::joinPaths(serverPath, + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "models", "am1", "2", "model.config"), common::joinPaths(serverPath, - "bob", "models", "bm1", "1", "model.config")); - common::copyFile(common::joinPaths(serverPath, + "bob", "models", "bm1", "1", "model.config"))); + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "models", "am1", "2", "model.config"), common::joinPaths(serverPath, - "trudy", "models", "tm1", "3", "model.config")); + "trudy", "models", "tm1", "3", "model.config"))); ignition::fuel_tools::ServerConfig srv; srv.SetUrl(ignition::common::URI("http://localhost:8007/")); @@ -133,18 +133,18 @@ void createLocal6Worlds(ClientConfig &_conf) igndbg << "Creating 6 local worlds in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8001"); - common::createDirectories(common::joinPaths(serverPath, - "alice", "worlds", "am1", "2")); - common::createDirectories(common::joinPaths(serverPath, - "alice", "worlds", "am2", "1")); - common::createDirectories(common::joinPaths(serverPath, - "bob", "worlds", "bm1", "1")); - common::createDirectories(common::joinPaths(serverPath, - "bob", "worlds", "bm2", "2")); - common::createDirectories(common::joinPaths(serverPath, - "trudy", "worlds", "tm1", "3")); - common::createDirectories(common::joinPaths(serverPath, - "trudy", "worlds", "tm2", "2")); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "alice", "worlds", "am1", "2"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "alice", "worlds", "am2", "1"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "bob", "worlds", "bm1", "1"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "bob", "worlds", "bm2", "2"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "trudy", "worlds", "tm1", "3"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "trudy", "worlds", "tm2", "2"))); std::ofstream fout(common::joinPaths(serverPath, "alice", "worlds", "am1", "2", "world.world"), @@ -153,26 +153,26 @@ void createLocal6Worlds(ClientConfig &_conf) fout.flush(); fout.close(); - common::copyFile(common::joinPaths(serverPath, + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "worlds", "am1", "2", "world.world"), common::joinPaths(serverPath, - "alice", "worlds", "am2", "1", "world.world")); - common::copyFile(common::joinPaths(serverPath, + "alice", "worlds", "am2", "1", "world.world"))); + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "worlds", "am1", "2", "world.world"), common::joinPaths(serverPath, - "bob", "worlds", "bm1", "1", "world.world")); - common::copyFile(common::joinPaths(serverPath, + "bob", "worlds", "bm1", "1", "world.world"))); + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "worlds", "am1", "2", "world.world"), common::joinPaths(serverPath, - "bob", "worlds", "bm2", "2", "world.world")); - common::copyFile(common::joinPaths(serverPath, + "bob", "worlds", "bm2", "2", "world.world"))); + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "worlds", "am1", "2", "world.world"), common::joinPaths(serverPath, - "trudy", "worlds", "tm1", "3", "world.world")); - common::copyFile(common::joinPaths(serverPath, + "trudy", "worlds", "tm1", "3", "world.world"))); + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "worlds", "am1", "2", "world.world"), common::joinPaths(serverPath, - "trudy", "worlds", "tm2", "2", "world.world")); + "trudy", "worlds", "tm2", "2", "world.world"))); ignition::fuel_tools::ServerConfig srv; srv.SetUrl(ignition::common::URI("http://localhost:8001/")); @@ -185,12 +185,12 @@ void createLocal3Worlds(ClientConfig &_conf) igndbg << "Creating 3 local worlds in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8007"); - common::createDirectories(common::joinPaths(serverPath, - "alice", "worlds", "am1", "2")); - common::createDirectories(common::joinPaths(serverPath, - "bob", "worlds", "bm1", "1")); - common::createDirectories(common::joinPaths(serverPath, - "trudy", "worlds", "tm1", "3")); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "alice", "worlds", "am1", "2"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "bob", "worlds", "bm1", "1"))); + ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, + "trudy", "worlds", "tm1", "3"))); std::ofstream fout(common::joinPaths(serverPath, "alice", "worlds", "am1", "2", "world.world"), @@ -199,14 +199,14 @@ void createLocal3Worlds(ClientConfig &_conf) fout.flush(); fout.close(); - common::copyFile(common::joinPaths(serverPath, + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "worlds", "am1", "2", "world.world"), common::joinPaths(serverPath, - "bob", "worlds", "bm1", "1", "world.world")); - common::copyFile(common::joinPaths(serverPath, + "bob", "worlds", "bm1", "1", "world.world"))); + ASSERT_TRUE(common::copyFile(common::joinPaths(serverPath, "alice", "worlds", "am1", "2", "world.world"), common::joinPaths(serverPath, - "trudy", "worlds", "tm1", "3", "world.world")); + "trudy", "worlds", "tm1", "3", "world.world"))); ignition::fuel_tools::ServerConfig srv; srv.SetUrl(common::URI("http://localhost:8007/")); @@ -224,13 +224,11 @@ class LocalCacheTest : public ::testing::Test ///////////////////////////////////////////////// /// \brief Iterate through all models in cache -// Windows doesn't support colons in filenames -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/106 TEST_F(LocalCacheTest, AllModels) { ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig conf; conf.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); createLocal6Models(conf); @@ -254,13 +252,11 @@ TEST_F(LocalCacheTest, AllModels) ///////////////////////////////////////////////// /// \brief Get all models that match some fields /// \brief Iterate through all models in cache -// Windows doesn't support colons in filenames -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/106 TEST_F(LocalCacheTest, MatchingModels) { ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig conf; conf.Clear(); conf.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); @@ -302,13 +298,11 @@ TEST_F(LocalCacheTest, MatchingModels) ///////////////////////////////////////////////// /// \brief Get a specific model from cache /// \brief Iterate through all models in cache -// Windows doesn't support colons in filenames -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/106 TEST_F(LocalCacheTest, MatchingModel) { ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig conf; conf.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); createLocal6Models(conf); @@ -360,13 +354,11 @@ TEST_F(LocalCacheTest, MatchingModel) ///////////////////////////////////////////////// /// \brief Iterate through all worlds in cache /// \brief Iterate through all models in cache -// Windows doesn't support colons in filenames -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/106 TEST_F(LocalCacheTest, AllWorlds) { ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig conf; conf.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); createLocal6Worlds(conf); @@ -394,13 +386,11 @@ TEST_F(LocalCacheTest, AllWorlds) ///////////////////////////////////////////////// /// \brief Get all worlds that match some fields /// \brief Iterate through all models in cache -// Windows doesn't support colons in filenames -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/106 TEST_F(LocalCacheTest, MatchingWorlds) { ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig conf; conf.Clear(); conf.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); @@ -430,13 +420,11 @@ TEST_F(LocalCacheTest, MatchingWorlds) ///////////////////////////////////////////////// /// \brief Get a specific world from cache /// \brief Iterate through all models in cache -// Windows doesn't support colons in filenames -// https://github.com/ignitionrobotics/ign-fuel-tools/issues/106 TEST_F(LocalCacheTest, MatchingWorld) { ASSERT_EQ(0, ChangeDirectory(PROJECT_BINARY_PATH)); common::removeAll("test_cache"); - common::createDirectories("test_cache"); + ASSERT_TRUE(common::createDirectories("test_cache")); ClientConfig conf; conf.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); createLocal6Worlds(conf); diff --git a/src/ign_src_TEST.cc b/src/ign_src_TEST.cc index 75bf2c24..a5df1bcb 100644 --- a/src/ign_src_TEST.cc +++ b/src/ign_src_TEST.cc @@ -50,7 +50,7 @@ class CmdLine : public ::testing::Test // Clear and recreate the cache at the start of every test. Doing it here // instead of on teardown leaves the folder intact for debugging if needed common::removeAll(testCachePath); - common::createDirectories(testCachePath); + ASSERT_TRUE(common::createDirectories(testCachePath)); setenv("IGN_FUEL_CACHE_PATH", this->testCachePath.c_str(), true); } @@ -186,13 +186,13 @@ TEST_F(CmdLine, ModelDownloadUnversioned) EXPECT_TRUE(this->stdErrBuffer.str().empty()) << this->stdErrBuffer.str(); // Check files - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "chapulina", "models", "test box"))); - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2"))); - EXPECT_TRUE(ignition::common::isFile( + EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2", "model.sdf"))); } @@ -233,9 +233,9 @@ TEST_F(CmdLine, DownloadConfigCache) // Check files auto modelPath = common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "chapulina", "models", "test box"); - EXPECT_TRUE(ignition::common::isDirectory(modelPath)); - EXPECT_TRUE(ignition::common::isDirectory(common::joinPaths(modelPath, "2"))); - EXPECT_TRUE(ignition::common::isFile(common::joinPaths(modelPath, "2", + EXPECT_TRUE(common::isDirectory(modelPath)); + EXPECT_TRUE(common::isDirectory(common::joinPaths(modelPath, "2"))); + EXPECT_TRUE(common::isFile(common::joinPaths(modelPath, "2", "model.sdf"))); } @@ -347,13 +347,13 @@ TEST_F(CmdLine, WorldDownloadUnversioned) EXPECT_TRUE(this->stdErrBuffer.str().empty()) << this->stdErrBuffer.str(); // Check files - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world"))); - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2"))); - EXPECT_TRUE(ignition::common::isFile( + EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2", "test.world"))); } @@ -384,46 +384,46 @@ TEST_P(DownloadCollectionTest, AllItems) // Check files // Model: Backpack - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack"))); - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack", "2"))); - EXPECT_TRUE(ignition::common::isFile( + EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack", "2", "model.sdf"))); // Model: TEAMBASE - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase"))); - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase", "2"))); - EXPECT_TRUE(ignition::common::isFile( + EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase", "2", "model.sdf"))); // World: Test World - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world"))); - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2"))); - EXPECT_TRUE(ignition::common::isFile( + EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2", "test.world"))); // World: Test World 2 - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2"))); - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2", "2"))); - EXPECT_TRUE(ignition::common::isFile( + EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2", "2", "test.world"))); } @@ -447,34 +447,34 @@ TEST_P(DownloadCollectionTest, Models) // Check files // Model: Backpack - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack"))); - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack", "2"))); - EXPECT_TRUE(ignition::common::isFile( + EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack", "2", "model.sdf"))); // Model: TEAMBASE - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase"))); - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase", "2"))); - EXPECT_TRUE(ignition::common::isFile( + EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase", "2", "model.sdf"))); // World: Test World - EXPECT_FALSE(ignition::common::isDirectory( + EXPECT_FALSE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world"))); // World: Test World 2 - EXPECT_FALSE(ignition::common::isDirectory( + EXPECT_FALSE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world2"))); } @@ -498,34 +498,34 @@ TEST_P(DownloadCollectionTest, Worlds) // Check files // Model: Backpack - EXPECT_FALSE(ignition::common::isDirectory( + EXPECT_FALSE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "backpack"))); // Model: TEAMBASE - EXPECT_FALSE(ignition::common::isDirectory( + EXPECT_FALSE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "models", "teambase"))); // World: Test World - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world"))); - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2"))); - EXPECT_TRUE(ignition::common::isFile( + EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2", "test.world"))); // World: Test World 2 - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2"))); - EXPECT_TRUE(ignition::common::isDirectory( + EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2", "2"))); - EXPECT_TRUE(ignition::common::isFile( + EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world 2", "2", "test.world"))); }