Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More checks when manipulating file system in tests #227

Merged
merged 6 commits into from
Jan 11, 2022
Merged

More checks when manipulating file system in tests #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c1d854
More checks when manipulating file system in tests
chapulina Dec 29, 2021
5aafb2c
Tests
chapulina Jan 11, 2022
d80943b
Merge branch 'ign-fuel-tools4' into chapulina/4/more_checks
chapulina Jan 11, 2022
6c125fb
Revert removeAll
chapulina Jan 11, 2022
7b048ff
EXPECT -> ASSERT
chapulina Jan 11, 2022
a40d439
merged from ign-fuel-tools4
chapulina Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/ClientConfig_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
41 changes: 23 additions & 18 deletions src/FuelClient_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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")));
}

{
Expand All @@ -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")));
}

{
Expand All @@ -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;
Expand All @@ -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"),
Expand All @@ -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;
Expand Down Expand Up @@ -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"));

Expand Down Expand Up @@ -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"));

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/Interface_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));

Expand Down
Loading