Skip to content

Commit

Permalink
Migrate ->
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed May 25, 2022
1 parent 60dae6a commit 9825bea
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions src/ClientConfig_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ TEST(ClientConfig, AsString)
ClientConfig client;

std::string str = client.AsString();
igndbg << str << std::endl;
gzdbg << str << std::endl;

#ifndef _WIN32
EXPECT_NE(str.find(".ignition/fuel"), std::string::npos);
Expand Down Expand Up @@ -337,7 +337,7 @@ TEST(ClientConfig, AsString)
srv.SetApiKey("ABCD");

auto str = srv.AsString();
igndbg << str << std::endl;
gzdbg << str << std::endl;

EXPECT_NE(str.find("http://serverurl.com"), std::string::npos);
EXPECT_EQ(str.find("local_name"), std::string::npos);
Expand All @@ -354,7 +354,7 @@ TEST(ClientConfig, AsString)
client.AddServer(srv);

auto str = client.AsString();
igndbg << str << std::endl;
gzdbg << str << std::endl;

EXPECT_NE(str.find("cache/location"), std::string::npos);
EXPECT_NE(str.find("http://serverurl.com"), std::string::npos);
Expand All @@ -380,7 +380,7 @@ TEST(ClientConfig, AsPrettyString)
srv.SetApiKey("ABCD");

auto str = srv.AsPrettyString();
igndbg << str << std::endl;
gzdbg << str << std::endl;

EXPECT_NE(str.find("http://serverurl.com"), std::string::npos);
EXPECT_EQ(str.find("local_name"), std::string::npos);
Expand Down
6 changes: 3 additions & 3 deletions src/FuelClient.cc
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ std::vector<FuelClient::ModelResult> FuelClient::DownloadModels(
if (!dependencies.empty())
{
std::lock_guard<std::mutex> lock(idsMutex);
igndbg << "Adding " << dependencies.size()
gzdbg << "Adding " << dependencies.size()
<< " model dependencies to queue from " << id.Name() << "\n";
for (auto dep : dependencies)
{
Expand Down Expand Up @@ -1653,7 +1653,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir,
{
std::string filePath = common::joinPaths(_pathToModelDir, "metadata.pbtxt");

igndbg << "Parsing " << filePath << std::endl;
gzdbg << "Parsing " << filePath << std::endl;

// Read the pbtxt file.
std::ifstream inputFile(filePath);
Expand All @@ -1667,7 +1667,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir,
{
std::string filePath = common::joinPaths(_pathToModelDir, "model.config");

igndbg << "Parsing " << filePath << std::endl;
gzdbg << "Parsing " << filePath << std::endl;

std::ifstream inputFile(filePath);
std::string inputStr((std::istreambuf_iterator<char>(inputFile)),
Expand Down
4 changes: 2 additions & 2 deletions src/FuelClient_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ using namespace gz::fuel_tools;
/// Taken from LocalCache_TEST
void createLocalModel(ClientConfig &_conf)
{
igndbg << "Creating local model in [" << common::cwd() << "]" << std::endl;
gzdbg << "Creating local model in [" << common::cwd() << "]" << std::endl;

auto modelPath = common::joinPaths(
"test_cache", "localhost:8007", "alice", "models", "My Model");
Expand Down Expand Up @@ -100,7 +100,7 @@ void createLocalModel(ClientConfig &_conf)
/// Taken from LocalCache_TEST
void createLocalWorld(ClientConfig &_conf)
{
igndbg << "Creating local world in [" << common::cwd() << "]" << std::endl;
gzdbg << "Creating local world in [" << common::cwd() << "]" << std::endl;

auto worldPath = common::joinPaths(
"test_cache", "localhost:8007", "banana", "worlds", "My World");
Expand Down
2 changes: 1 addition & 1 deletion src/LocalCache.cc
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ void LocalCachePrivate::FixPathsInUri(tinyxml2::XMLElement *_elem,
// On Blueprint and Citadel, just warn the user
// From Dome, use the name on the URI (resourceName) and assume the same
// owner
igndbg << "Model [" << _id.Name()
gzdbg << "Model [" << _id.Name()
<< "] loading resource from another model, named [" << resourceName
<< "]. On Blueprint (ign-fuel-tools 3) and Citadel "
<< "(ign-fuel-tools 4), [" << resourceName << "] is ignored. "
Expand Down
8 changes: 4 additions & 4 deletions src/LocalCache_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ using namespace fuel_tools;
/// \brief Creates a directory structure in the build directory with 6 models
void createLocal6Models(ClientConfig &_conf)
{
igndbg << "Creating 6 local models in [" << common::cwd() << "]" << std::endl;
gzdbg << "Creating 6 local models in [" << common::cwd() << "]" << std::endl;

auto serverPath = common::joinPaths("test_cache", "localhost:8001");
ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath,
Expand Down Expand Up @@ -96,7 +96,7 @@ void createLocal6Models(ClientConfig &_conf)
/// \brief Creates a directory structure in the build directory with 3 models
void createLocal3Models(ClientConfig &_conf)
{
igndbg << "Creating 3 local models in [" << common::cwd() << "]" << std::endl;
gzdbg << "Creating 3 local models in [" << common::cwd() << "]" << std::endl;

auto serverPath = common::joinPaths("test_cache", "localhost:8007");
ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath,
Expand Down Expand Up @@ -130,7 +130,7 @@ void createLocal3Models(ClientConfig &_conf)
/// \brief Creates a directory structure in the build directory with 6 worlds
void createLocal6Worlds(ClientConfig &_conf)
{
igndbg << "Creating 6 local worlds in [" << common::cwd() << "]" << std::endl;
gzdbg << "Creating 6 local worlds in [" << common::cwd() << "]" << std::endl;

auto serverPath = common::joinPaths("test_cache", "localhost:8001");
ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath,
Expand Down Expand Up @@ -182,7 +182,7 @@ void createLocal6Worlds(ClientConfig &_conf)
/// \brief Creates a directory structure in the build directory with 3 worlds
void createLocal3Worlds(ClientConfig &_conf)
{
igndbg << "Creating 3 local worlds in [" << common::cwd() << "]" << std::endl;
gzdbg << "Creating 3 local worlds in [" << common::cwd() << "]" << std::endl;

auto serverPath = common::joinPaths("test_cache", "localhost:8007");
ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath,
Expand Down
4 changes: 2 additions & 2 deletions src/ModelIdentifier_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ TEST(ModelIdentifier, AsString)
id.SetUploadDate(d2);

auto str = id.AsString();
igndbg << str << std::endl;
gzdbg << str << std::endl;

EXPECT_NE(str.find("hello"), std::string::npos);
EXPECT_NE(str.find("raspberry"), std::string::npos);
Expand Down Expand Up @@ -219,7 +219,7 @@ TEST(ModelIdentifier, AsPrettyString)
id.SetUploadDate(d2);

auto str = id.AsPrettyString();
igndbg << str << std::endl;
gzdbg << str << std::endl;

EXPECT_NE(str.find("hello"), std::string::npos);
EXPECT_NE(str.find("raspberry"), std::string::npos);
Expand Down
2 changes: 1 addition & 1 deletion src/ModelIter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ IterRestIds::IterRestIds(const Rest &_rest, const ServerConfig &_config,
ptr->id.SetServer(this->config);
this->model = Model(ptr);

igndbg << "Got response [" << resp.data << "]\n";
gzdbg << "Got response [" << resp.data << "]\n";
}

//////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions src/WorldIdentifier_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ TEST(WorldIdentifier, AsString)
id.SetVersionStr("55");

auto str = id.AsString();
igndbg << str << std::endl;
gzdbg << str << std::endl;

EXPECT_NE(str.find("hello"), std::string::npos);
EXPECT_NE(str.find("raspberry"), std::string::npos);
Expand Down Expand Up @@ -176,7 +176,7 @@ TEST(WorldIdentifier, AsPrettyString)
id.SetVersionStr("55");

auto str = id.AsPrettyString();
igndbg << str << std::endl;
gzdbg << str << std::endl;

EXPECT_NE(str.find("hello"), std::string::npos);
EXPECT_NE(str.find("raspberry"), std::string::npos);
Expand Down
2 changes: 1 addition & 1 deletion src/WorldIter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ WorldIterRestIds::WorldIterRestIds(const Rest &_rest,
this->worldId = *(this->idIter);
this->worldId.SetServer(this->config);

igndbg << "Got response [" << resp.data << "]\n";
gzdbg << "Got response [" << resp.data << "]\n";
}

//////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/Zip.cc
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ bool Zip::Extract(const std::string &_src,
else
file.write(buf, len);

igndbg << "Created file [" << dst << "]" << std::endl;
gzdbg << "Created file [" << dst << "]" << std::endl;

delete[] buf;
file.close();
Expand Down

0 comments on commit 9825bea

Please sign in to comment.