diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 992a1312..a35a0475 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/include/ignition/fuel_tools.hh b/include/ignition/fuel_tools.hh deleted file mode 100644 index ffffce19..00000000 --- a/include/ignition/fuel_tools.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/ClientConfig.hh b/include/ignition/fuel_tools/ClientConfig.hh deleted file mode 100644 index 61c4c834..00000000 --- a/include/ignition/fuel_tools/ClientConfig.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/CollectionIdentifier.hh b/include/ignition/fuel_tools/CollectionIdentifier.hh deleted file mode 100644 index d1190876..00000000 --- a/include/ignition/fuel_tools/CollectionIdentifier.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2020 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/Export.hh b/include/ignition/fuel_tools/Export.hh deleted file mode 100644 index 2d32dfcc..00000000 --- a/include/ignition/fuel_tools/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/FuelClient.hh b/include/ignition/fuel_tools/FuelClient.hh deleted file mode 100644 index d2bcb4e2..00000000 --- a/include/ignition/fuel_tools/FuelClient.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/Helpers.hh b/include/ignition/fuel_tools/Helpers.hh deleted file mode 100644 index 990c4a60..00000000 --- a/include/ignition/fuel_tools/Helpers.hh +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2017 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include - -#define ign_strcat gz_strcat -#define ign_strcpy gz_strcpy -#define ign_sprintf gz_sprintf -#define ign_strdup gz_strdup diff --git a/include/ignition/fuel_tools/Interface.hh b/include/ignition/fuel_tools/Interface.hh deleted file mode 100644 index e96f09a7..00000000 --- a/include/ignition/fuel_tools/Interface.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2018 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/JSONParser.hh b/include/ignition/fuel_tools/JSONParser.hh deleted file mode 100644 index 91b74a06..00000000 --- a/include/ignition/fuel_tools/JSONParser.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/Model.hh b/include/ignition/fuel_tools/Model.hh deleted file mode 100644 index 4027323f..00000000 --- a/include/ignition/fuel_tools/Model.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/ModelIdentifier.hh b/include/ignition/fuel_tools/ModelIdentifier.hh deleted file mode 100644 index 23845149..00000000 --- a/include/ignition/fuel_tools/ModelIdentifier.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/ModelIter.hh b/include/ignition/fuel_tools/ModelIter.hh deleted file mode 100644 index 05a757a2..00000000 --- a/include/ignition/fuel_tools/ModelIter.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/RestClient.hh b/include/ignition/fuel_tools/RestClient.hh deleted file mode 100644 index 4daf0e1a..00000000 --- a/include/ignition/fuel_tools/RestClient.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/Result.hh b/include/ignition/fuel_tools/Result.hh deleted file mode 100644 index e7c87e8c..00000000 --- a/include/ignition/fuel_tools/Result.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/WorldIdentifier.hh b/include/ignition/fuel_tools/WorldIdentifier.hh deleted file mode 100644 index 497775ee..00000000 --- a/include/ignition/fuel_tools/WorldIdentifier.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2018 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/WorldIter.hh b/include/ignition/fuel_tools/WorldIter.hh deleted file mode 100644 index d2862468..00000000 --- a/include/ignition/fuel_tools/WorldIter.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2018 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/Zip.hh b/include/ignition/fuel_tools/Zip.hh deleted file mode 100644 index 21168112..00000000 --- a/include/ignition/fuel_tools/Zip.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/fuel_tools/config.hh b/include/ignition/fuel_tools/config.hh deleted file mode 100644 index 9b866308..00000000 --- a/include/ignition/fuel_tools/config.hh +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef IGNITION_FUEL_TOOLS__CONFIG_HH_ -#define IGNITION_FUEL_TOOLS__CONFIG_HH_ - -#include - -#define IGNITION_FUEL_TOOLS_MAJOR_VERSION GZ_FUEL_TOOLS_MAJOR_VERSION -#define IGNITION_FUEL_TOOLS_MINOR_VERSION GZ_FUEL_TOOLS_MINOR_VERSION -#define IGNITION_FUEL_TOOLS_PATCH_VERSION GZ_FUEL_TOOLS_PATCH_VERSION - -#define IGNITION_FUEL_TOOLS_VERSION GZ_FUEL_TOOLS_VERSION -#define IGNITION_FUEL_TOOLS_VERSION_FULL GZ_FUEL_TOOLS_VERSION_FULL - -#define IGNITION_FUEL_TOOLS_VERSION_HEADER GZ_FUEL_TOOLS_VERSION_HEADER - -#define IGNITION_FUEL_INITIAL_CONFIG_PATH GZ_FUEL_INITIAL_CONFIG_PATH - -namespace gz -{ -} - -namespace ignition -{ - #ifndef SUPPRESS_IGNITION_HEADER_DEPRECATION - #pragma message("ignition namespace is deprecated! Use gz instead!") - #endif - using namespace gz; -} - -#endif diff --git a/src/ClientConfig.cc b/src/ClientConfig.cc index 1b11c76e..0a2764f1 100644 --- a/src/ClientConfig.cc +++ b/src/ClientConfig.cc @@ -44,13 +44,6 @@ class gz::fuel_tools::ClientConfigPrivate homePath, ".gz", "fuel"); this->servers.push_back(ServerConfig()); - // Add in fuel.ignitionrobotics.org as another default server - // config. - ServerConfig ignServerConfig; - ignServerConfig.SetUrl( - common::URI("https://fuel.ignitionrobotics.org")); - ignServerConfig.SetVersion("1.0"); - this->servers.push_back(ignServerConfig); } /// \brief Clear values. @@ -60,7 +53,7 @@ class gz::fuel_tools::ClientConfigPrivate this->cacheLocation = ""; this->configPath = ""; this->userAgent = - "IgnitionFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL; + "GazeboFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL; } /// \brief A list of servers. @@ -74,7 +67,7 @@ class gz::fuel_tools::ClientConfigPrivate /// \brief Name of the user agent. public: std::string userAgent = - "IgnitionFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL; + "GazeboFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL; }; ////////////////////////////////////////////////// diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc index efff93c0..facd548e 100644 --- a/src/ClientConfig_TEST.cc +++ b/src/ClientConfig_TEST.cc @@ -72,7 +72,7 @@ class ServerConfigTest: public ClientConfigTest {}; TEST_F(ClientConfigTest, InitiallyDefaultServers) { ClientConfig config; - EXPECT_EQ(2u, config.Servers().size()); + EXPECT_EQ(1u, config.Servers().size()); } ///////////////////////////////////////////////// @@ -84,7 +84,7 @@ TEST_F(ClientConfigTest, ServersCanBeAdded) srv.SetUrl(common::URI("http://asdf")); config.AddServer(srv); - ASSERT_EQ(3u, config.Servers().size()); + ASSERT_EQ(2u, config.Servers().size()); EXPECT_EQ(std::string("http://asdf"), config.Servers().back().Url().Str()); } @@ -93,12 +93,9 @@ TEST_F(ClientConfigTest, ServersCanBeAdded) TEST_F(ClientConfigTest, CustomDefaultConfiguration) { ClientConfig config; - ASSERT_EQ(2u, config.Servers().size()); + ASSERT_EQ(1u, config.Servers().size()); EXPECT_EQ("https://fuel.gazebosim.org", config.Servers().front().Url().Str()); - EXPECT_EQ("https://fuel.ignitionrobotics.org", - config.Servers()[1].Url().Str()); - std::string defaultCacheLocation = gz::common::joinPaths( homePath(), ".gz", "fuel"); EXPECT_EQ(defaultCacheLocation, config.CacheLocation()); @@ -132,13 +129,9 @@ TEST_F(ClientConfigTest, CustomConfiguration) EXPECT_TRUE(config.LoadConfig(testPath)); - ASSERT_EQ(4u, config.Servers().size()); + ASSERT_EQ(3u, config.Servers().size()); EXPECT_EQ("https://fuel.gazebosim.org", config.Servers().front().Url().Str()); - EXPECT_EQ("https://fuel.ignitionrobotics.org", - config.Servers()[1].Url().Str()); - EXPECT_EQ("https://api.gazebosim.org", - config.Servers()[2].Url().Str()); EXPECT_EQ("https://myserver", config.Servers().back().Url().Str()); @@ -261,7 +254,7 @@ TEST_F(ClientConfigTest, EmptyCachePathConfiguration) TEST_F(ClientConfigTest, UserAgent) { ClientConfig config; - EXPECT_EQ("IgnitionFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL, + EXPECT_EQ("GazeboFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL, config.UserAgent()); config.SetUserAgent("my_user_agent"); diff --git a/src/FuelClient.cc b/src/FuelClient.cc index ea2b2fb3..45902eec 100644 --- a/src/FuelClient.cc +++ b/src/FuelClient.cc @@ -200,12 +200,6 @@ class gz::fuel_tools::FuelClientPrivate /// license information. public: void PopulateLicenses(const ServerConfig &_server); - /// \brief Checks the provided URI for fuel.gazebosim.org, and - /// prints a deprecation warning message if found. - /// \param[in] _uri URI to check - /// DEPRECATED/DEPRECATION: remove this function in Gazebo H. - public: void CheckForDeprecatedUri(const common::URI &_uri); - /// \brief Get zip data from a REST response. This is used by world and /// model download. public: void ZipFromResponse(const RestResponse &_resp, @@ -529,7 +523,7 @@ Result FuelClient::UploadModel(const std::string &_pathToModelDir, << " 1. Is the Server URL correct? Try entering it on a browser.\n" << " 2. Do the categories exist? If you are using the Fuel server," << " then you can get the complete list at" - << " https://fuel.ignitionrobotics.org/1.0/categories.\n" + << " https://fuel.gazebosim.org/1.0/categories.\n" << " 3. If the owner is specified, make sure you have correct\n" << " permissions." << std::endl; return Result(ResultType::FETCH_ERROR); @@ -564,7 +558,6 @@ void FuelClient::AddServerConfigParametersToHeaders( Result FuelClient::DeleteUrl(const gz::common::URI &_uri, const std::vector &_headers) { - this->dataPtr->CheckForDeprecatedUri(_uri); gz::fuel_tools::Rest rest; RestResponse resp; @@ -668,7 +661,6 @@ Result FuelClient::DownloadModel(const ModelIdentifier &_id, << std::endl << _id.Server().AsString() << std::endl; return Result(ResultType::FETCH_ERROR); } - this->dataPtr->CheckForDeprecatedUri(_id.Server().Url()); // Route common::URIPath route; @@ -841,8 +833,6 @@ Result FuelClient::DownloadWorld(WorldIdentifier &_id, return Result(ResultType::FETCH_ERROR); } - this->dataPtr->CheckForDeprecatedUri(_id.Server().Url()); - // Route common::URIPath route; route = route / _id.Owner() / "worlds" / _id.Name() / _id.VersionStr() / @@ -1211,8 +1201,6 @@ bool FuelClient::ParseModelFileUrl(const common::URI &_modelFileUrl, if (!_modelFileUrl.Valid()) return false; - this->dataPtr->CheckForDeprecatedUri(_modelFileUrl); - auto urlStr = _modelFileUrl.Str(); std::smatch match; @@ -1940,19 +1928,6 @@ bool FuelClient::UpdateWorlds(const std::vector &_headers) } return true; } -////////////////////////////////////////////////// -void FuelClientPrivate::CheckForDeprecatedUri(const common::URI &_uri) -{ - static std::string oldServer = "fuel.ignitionrobotics.org"; - auto ignFuelPos = _uri.Str().find(oldServer); - if (ignFuelPos != std::string::npos) - { - std::string newUrl = _uri.Str(); - newUrl.replace(ignFuelPos, oldServer.size(), "fuel.gazebosim.org"); - gzwarn << "The " << oldServer << " URL is deprecrated. Pleasse change " - << _uri.Str() << " to " << newUrl << std::endl; - } -} ////////////////////////////////////////////////// void FuelClientPrivate::ZipFromResponse(const RestResponse &_resp, diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index ce4c462e..86350733 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -407,8 +407,7 @@ class FuelClientDownloadTest INSTANTIATE_TEST_SUITE_P( FuelClientTest, FuelClientDownloadTest, - ::testing::Values("fuel.gazebosim.org", - "fuel.ignitionrobotics.org")); + ::testing::Values("fuel.gazebosim.org")); ///////////////////////////////////////////////// // Protocol "https" not supported or disabled in libcurl for Windows diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc deleted file mode 100644 index c2e7408c..00000000 --- a/test/integration/deprecated_TEST.cc +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * -*/ - -#include - -#define SUPPRESS_IGNITION_HEADER_DEPRECATION - -#include -#include - -///////////////////////////////////////////////// -// Make sure the ignition namespace still works -TEST(Deprecated, IgnitionNamespace) -{ - ignition::fuel_tools::Model model; -} - -#undef SUPPRESS_IGNITION_HEADER_DEPRECATION