From 662ffb41eedd744826d8b29607931ab9b00f23f1 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Mon, 24 Aug 2020 11:29:26 +0200 Subject: [PATCH] Fixed test - Download world 2 Signed-off-by: ahcorde --- src/FuelClient_TEST.cc | 8 ++++---- src/Interface_TEST.cc | 8 ++++---- src/ign_src_TEST.cc | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index 3bb52ebd..82c222be 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -962,13 +962,13 @@ TEST_F(FuelClientTest, DownloadWorld) // Check it was downloaded to `1` EXPECT_EQ(path, common::cwd() + "/test_cache/fuel.ignitionrobotics.org/OpenRobotics/worlds/" - "Test world/1"); + "Test world/2"); EXPECT_TRUE(common::exists( "test_cache/fuel.ignitionrobotics.org/OpenRobotics/worlds/" - "Test world/1")); + "Test world/2")); EXPECT_TRUE(common::exists( "test_cache/fuel.ignitionrobotics.org/OpenRobotics/worlds/" - "Test world/1/test.world")); + "Test world/2/test.world")); // Check it wasn't downloaded to world root directory EXPECT_FALSE(common::exists( @@ -980,7 +980,7 @@ TEST_F(FuelClientTest, DownloadWorld) EXPECT_TRUE(res3); EXPECT_EQ(Result(ResultType::FETCH_ALREADY_EXISTS), res3); EXPECT_EQ(common::cwd() + "/test_cache/fuel.ignitionrobotics.org" - "/OpenRobotics/worlds/Test world/1", cachedPath); + "/OpenRobotics/worlds/Test world/2", cachedPath); } // Try using nonexistent URL diff --git a/src/Interface_TEST.cc b/src/Interface_TEST.cc index c0623119..f5433ba7 100644 --- a/src/Interface_TEST.cc +++ b/src/Interface_TEST.cc @@ -178,11 +178,11 @@ TEST(Interface, FetchResources) // Check it was downloaded to `1` EXPECT_EQ(path, common::cwd() + "/test_cache/fuel.ignitionrobotics.org/" - "openrobotics/worlds/Test world/1"); + "openrobotics/worlds/Test world/2"); EXPECT_TRUE(common::exists("test_cache/fuel.ignitionrobotics.org/" - "openrobotics/worlds/Test world/1")); + "openrobotics/worlds/Test world/2")); EXPECT_TRUE(common::exists("test_cache/fuel.ignitionrobotics.org/" - "openrobotics/worlds/Test world/1/test.world")); + "openrobotics/worlds/Test world/2/test.world")); // Check it is cached { @@ -191,7 +191,7 @@ TEST(Interface, FetchResources) EXPECT_EQ(Result(ResultType::FETCH_ALREADY_EXISTS), res); EXPECT_EQ(common::cwd() + "/test_cache/fuel.ignitionrobotics.org/openrobotics/worlds/" - "Test world/1", cachedPath); + "Test world/2", cachedPath); } } diff --git a/src/ign_src_TEST.cc b/src/ign_src_TEST.cc index f02f84c8..7de96b8b 100644 --- a/src/ign_src_TEST.cc +++ b/src/ign_src_TEST.cc @@ -428,10 +428,10 @@ TEST(CmdLine, WorldDownloadUnversioned) EXPECT_TRUE(ignition::common::isDirectory( "test_cache/fuel.ignitionrobotics.org/OpenRobotics/worlds/Test world")); EXPECT_TRUE(ignition::common::isDirectory( - "test_cache/fuel.ignitionrobotics.org/OpenRobotics/worlds/Test world/1")); + "test_cache/fuel.ignitionrobotics.org/OpenRobotics/worlds/Test world/2")); EXPECT_TRUE(ignition::common::isFile( std::string("test_cache/fuel.ignitionrobotics.org/OpenRobotics/worlds/") - + "Test world/1/test.world")); + + "Test world/2/test.world")); clearIOStreams(stdOutBuffer, stdErrBuffer); restoreIO();