diff --git a/python/test/pyModel_TEST.py b/python/test/pyModel_TEST.py index 126c1b579..111f2d5b1 100644 --- a/python/test/pyModel_TEST.py +++ b/python/test/pyModel_TEST.py @@ -255,7 +255,7 @@ def test_add_modify_frame(self): def test_uri(self): model = Model() - uri = "https:#fuel.ignitionrobotics.org/1.0/openrobotics/models/my-model" + uri = "https:#fuel.gazebosim.org/1.0/openrobotics/models/my-model" model.set_uri(uri) self.assertEqual(uri, model.uri()) diff --git a/src/Model_TEST.cc b/src/Model_TEST.cc index 14e26bf5c..cb4325d76 100644 --- a/src/Model_TEST.cc +++ b/src/Model_TEST.cc @@ -445,7 +445,7 @@ TEST(DOMModel, Uri) std::string name = "my-model"; gz::math::Pose3d pose(1, 2, 3, 0.1, 0.2, 0.3); std::string uri = - "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/my-model"; + "https://fuel.gazebosim.org/1.0/openrobotics/models/my-model"; model.SetName(name); model.SetRawPose(pose); diff --git a/test/integration/geometry_dom.cc b/test/integration/geometry_dom.cc index b3079b1da..07d50d570 100644 --- a/test/integration/geometry_dom.cc +++ b/test/integration/geometry_dom.cc @@ -179,7 +179,7 @@ TEST(DOMGeometry, Shapes) EXPECT_EQ(sdf::GeometryType::MESH, meshCol->Geom()->Type()); const sdf::Mesh *meshColGeom = meshCol->Geom()->MeshShape(); ASSERT_NE(nullptr, meshColGeom); - EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/mesh/" + EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/mesh/" "mesh.dae", meshColGeom->Uri()); EXPECT_TRUE(gz::math::Vector3d(0.1, 0.2, 0.3) == meshColGeom->Scale()); @@ -193,7 +193,7 @@ TEST(DOMGeometry, Shapes) EXPECT_EQ(sdf::GeometryType::MESH, meshVis->Geom()->Type()); const sdf::Mesh *meshVisGeom = meshVis->Geom()->MeshShape(); ASSERT_NE(nullptr, meshVisGeom); - EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/mesh" + EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/mesh" "/mesh.dae", meshVisGeom->Uri()); EXPECT_TRUE(gz::math::Vector3d(1.2, 2.3, 3.4) == meshVisGeom->Scale()); @@ -207,7 +207,7 @@ TEST(DOMGeometry, Shapes) EXPECT_EQ(sdf::GeometryType::HEIGHTMAP, heightmapCol->Geom()->Type()); auto heightmapColGeom = heightmapCol->Geom()->HeightmapShape(); ASSERT_NE(nullptr, heightmapColGeom); - EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/" + EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/" "materials/textures/heightmap.png", heightmapColGeom->Uri()); EXPECT_EQ(gz::math::Vector3d(500, 500, 100), heightmapColGeom->Size()); EXPECT_EQ(gz::math::Vector3d(1, 2, 3), heightmapColGeom->Position()); @@ -221,7 +221,7 @@ TEST(DOMGeometry, Shapes) EXPECT_EQ(sdf::GeometryType::HEIGHTMAP, heightmapVis->Geom()->Type()); auto heightmapVisGeom = heightmapVis->Geom()->HeightmapShape(); ASSERT_NE(nullptr, heightmapVisGeom); - EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/" + EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/" "materials/textures/heightmap.png", heightmapVisGeom->Uri()); EXPECT_EQ(gz::math::Vector3d(500, 500, 100), heightmapVisGeom->Size()); EXPECT_EQ(gz::math::Vector3d(1, 2, 3), heightmapVisGeom->Position()); @@ -229,23 +229,23 @@ TEST(DOMGeometry, Shapes) EXPECT_EQ(2u, heightmapVisGeom->BlendCount()); auto texture0 = heightmapVisGeom->TextureByIndex(0u); - EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/" + EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/" "materials/textures/diffuse0.png", texture0->Diffuse()); - EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/" + EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/" "materials/textures/normal0.png", texture0->Normal()); EXPECT_DOUBLE_EQ(5.0, texture0->Size()); auto texture1 = heightmapVisGeom->TextureByIndex(1u); - EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/" + EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/" "materials/textures/diffuse1.png", texture1->Diffuse()); - EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/" + EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/" "materials/textures/normal1.png", texture1->Normal()); EXPECT_DOUBLE_EQ(10.0, texture1->Size()); auto texture2 = heightmapVisGeom->TextureByIndex(2u); - EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/" + EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/" "materials/textures/diffuse2.png", texture2->Diffuse()); - EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/" + EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/" "materials/textures/normal2.png", texture2->Normal()); EXPECT_DOUBLE_EQ(20.0, texture2->Size()); diff --git a/test/integration/resolve_uris.cc b/test/integration/resolve_uris.cc index c3498beb9..e7d2a67d2 100644 --- a/test/integration/resolve_uris.cc +++ b/test/integration/resolve_uris.cc @@ -33,10 +33,10 @@ constexpr const int kNumCallbacks = 13; constexpr const char* kMeshUri = - "https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/mesh/mesh.dae"; + "https://fuel.gazebosim.org/1.0/an_org/models/a_model/mesh/mesh.dae"; constexpr const char* kHeightmapUri = - "https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/heightmap.png"; // NOLINT + "https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/heightmap.png"; // NOLINT constexpr const char* kCubemapUri = "dummyUri"; @@ -44,10 +44,10 @@ constexpr const char* kMaterialScriptUri = "file://media/materials/scripts/gazebo.material"; constexpr const char* kDiffuseUri = - "https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/diffuse0.png"; // NOLINT + "https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/diffuse0.png"; // NOLINT constexpr const char* kNormalUri = - "https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/normal0.png"; // NOLINT + "https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/normal0.png"; // NOLINT ///////////////////////////////////////////////// TEST(ResolveURIs, StoreResolvedDisabled) diff --git a/test/sdf/shapes.sdf b/test/sdf/shapes.sdf index 49d393314..1f5f4fa27 100644 --- a/test/sdf/shapes.sdf +++ b/test/sdf/shapes.sdf @@ -121,7 +121,7 @@ - https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/mesh/mesh.dae + https://fuel.gazebosim.org/1.0/an_org/models/a_model/mesh/mesh.dae my_submesh
true
@@ -134,7 +134,7 @@ - https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/mesh/mesh.dae + https://fuel.gazebosim.org/1.0/an_org/models/a_model/mesh/mesh.dae another_submesh
false
@@ -147,7 +147,7 @@ - https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/heightmap.png + https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/heightmap.png 500 500 100 1 2 3 @@ -157,12 +157,12 @@ - https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/heightmap.png + https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/heightmap.png 500 500 100 1 2 3 - https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/diffuse0.png - https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/normal0.png + https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/diffuse0.png + https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/normal0.png 5 @@ -170,8 +170,8 @@ 5 - https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/diffuse1.png - https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/normal1.png + https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/diffuse1.png + https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/normal1.png 10 @@ -179,8 +179,8 @@ 10 - https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/diffuse2.png - https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/normal2.png + https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/diffuse2.png + https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/normal2.png 20 diff --git a/test/sdf/shapes_world.sdf b/test/sdf/shapes_world.sdf index bfbcfcd18..5eb324490 100644 --- a/test/sdf/shapes_world.sdf +++ b/test/sdf/shapes_world.sdf @@ -123,7 +123,7 @@ - https://ignitionfuel.org/an_org/models/a_model/mesh/mesh.dae + https://fuel.gazebosim.org/an_org/models/a_model/mesh/mesh.dae my_submesh
true
@@ -136,7 +136,7 @@ - https://ignitionfuel.org/an_org/models/a_model/mesh/mesh.dae + https://fuel.gazebosim.org/an_org/models/a_model/mesh/mesh.dae another_submesh
false