From 36c193621c3098ad2804f07d2fb0225e71aeec7d Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Tue, 21 Nov 2023 16:14:08 +0000 Subject: [PATCH 1/3] Create directories and more output on fail Signed-off-by: Michael Carroll --- src/gz_src_TEST.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gz_src_TEST.cc b/src/gz_src_TEST.cc index 1ca4e8f9..201cecc4 100644 --- a/src/gz_src_TEST.cc +++ b/src/gz_src_TEST.cc @@ -51,6 +51,11 @@ class CmdLine : public ::testing::Test // instead of on teardown leaves the folder intact for debugging if needed common::removeAll(testCachePath); ASSERT_TRUE(common::createDirectories(testCachePath)); + ASSERT_TRUE(common::createDirectories( + common::joinPaths(testCachePath, "fuel.gazebosim.org"))); + ASSERT_TRUE(common::createDirectories( + common::joinPaths(testCachePath, "fuel.ignitionrobotics.org"))); + setenv("IGN_FUEL_CACHE_PATH", this->testCachePath.c_str(), true); } @@ -85,7 +90,7 @@ TEST_F(CmdLine, ModelListFail) EXPECT_NE(this->stdOutBuffer.str().find("Invalid URL"), std::string::npos) << this->stdOutBuffer.str(); - EXPECT_TRUE(this->stdErrBuffer.str().empty()); + EXPECT_TRUE(this->stdErrBuffer.str().empty()) << this->stdErrBuffer.str(); } ///////////////////////////////////////////////// From 1233a6f7ffaa99ad5cdfc0c307e1bc0062aa03a0 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 27 Nov 2023 20:40:33 +0000 Subject: [PATCH 2/3] Backpack and teambase version bumps Signed-off-by: Michael Carroll --- src/gz_src_TEST.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gz_src_TEST.cc b/src/gz_src_TEST.cc index 201cecc4..3108d705 100644 --- a/src/gz_src_TEST.cc +++ b/src/gz_src_TEST.cc @@ -465,10 +465,10 @@ TEST_P(DownloadCollectionTest, Models) "openrobotics", "models", "backpack"))); EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "backpack", "2"))); + "openrobotics", "models", "backpack", "3"))); EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "backpack", "2", "model.sdf"))); + "openrobotics", "models", "backpack", "3", "model.sdf"))); // Model: TEAMBASE EXPECT_TRUE(common::isDirectory( @@ -476,10 +476,10 @@ TEST_P(DownloadCollectionTest, Models) "openrobotics", "models", "teambase"))); EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "teambase", "2"))); + "openrobotics", "models", "teambase", "3"))); EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "teambase", "2", "model.sdf"))); + "openrobotics", "models", "teambase", "3", "model.sdf"))); // World: Test World EXPECT_FALSE(common::isDirectory( From db9f2f9b94124130ca77142f0614bbfd3eb2cee9 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 27 Nov 2023 21:06:04 +0000 Subject: [PATCH 3/3] More model updates Signed-off-by: Michael Carroll --- src/gz_src_TEST.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gz_src_TEST.cc b/src/gz_src_TEST.cc index 3108d705..8b41291c 100644 --- a/src/gz_src_TEST.cc +++ b/src/gz_src_TEST.cc @@ -402,10 +402,10 @@ TEST_P(DownloadCollectionTest, AllItems) "openrobotics", "models", "backpack"))); EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "backpack", "2"))); + "openrobotics", "models", "backpack", "3"))); EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "backpack", "2", "model.sdf"))); + "openrobotics", "models", "backpack", "3", "model.sdf"))); // Model: TEAMBASE EXPECT_TRUE(common::isDirectory( @@ -413,10 +413,10 @@ TEST_P(DownloadCollectionTest, AllItems) "openrobotics", "models", "teambase"))); EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "teambase", "2"))); + "openrobotics", "models", "teambase", "3"))); EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "teambase", "2", "model.sdf"))); + "openrobotics", "models", "teambase", "3", "model.sdf"))); // World: Test World EXPECT_TRUE(common::isDirectory(