Skip to content

Commit

Permalink
Use modified macro for test names only
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-rivero
j-rivero committed Jul 20, 2020
1 parent 64041ed commit 12699c7
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 28 deletions.
14 changes: 7 additions & 7 deletions src/Application_TEST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
//////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, Constructor)
TEST(ApplicationTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Constructor))
{
ignition::common::Console::SetVerbosity(4);

Expand All @@ -60,7 +60,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, Constructor)
}

//////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, LoadPlugin)
TEST(ApplicationTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(LoadPlugin))
{
ignition::common::Console::SetVerbosity(4);

Expand Down Expand Up @@ -118,7 +118,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, LoadPlugin)
}

//////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, LoadConfig)
TEST(ApplicationTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(LoadConfig))
{
ignition::common::Console::SetVerbosity(4);

Expand Down Expand Up @@ -146,7 +146,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, LoadConfig)
}

//////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, LoadDefaultConfig)
TEST(ApplicationTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(LoadDefaultConfig))
{
ignition::common::Console::SetVerbosity(4);

Expand All @@ -171,7 +171,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, LoadDefaultConfig)
}

//////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, InitializeMainWindow)
TEST(ApplicationTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(InitializeMainWindow))
{
ignition::common::Console::SetVerbosity(4);

Expand Down Expand Up @@ -241,7 +241,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, InitializeMainWindow)
}

//////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, Dialog)
TEST(ApplicationTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Dialog))
{
ignition::common::Console::SetVerbosity(4);

Expand Down Expand Up @@ -314,7 +314,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, Dialog)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplicationTest, messageHandler)
TEST(ApplicationTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(messageHandler))
{
ignition::common::Console::SetVerbosity(4);

Expand Down
2 changes: 1 addition & 1 deletion src/Helpers_TEST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ TEST(HelpersTest, stringTypeFromKey)

/////////////////////////////////////////////////
// See https://github.com/ignitionrobotics/ign-gui/issues/75
IGN_UTILS_TEST_DISABLED_ON_WIN32(HelpersTest, findFirstByProperty)
TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(findFirstByProperty))
{
Application app(gg_argc, gg_argv);

Expand Down
22 changes: 11 additions & 11 deletions src/MainWindow_TEST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace gui;

/////////////////////////////////////////////////
// See https://github.com/ignitionrobotics/ign-gui/issues/75
IGN_UTILS_TEST_DISABLED_ON_WIN32(MainWindowTest, Constructor)
TEST(MainWindowTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Constructor))
{
ignition::common::Console::SetVerbosity(4);
Application app(g_argc, g_argv);
Expand All @@ -48,7 +48,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(MainWindowTest, Constructor)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(MainWindowTest, OnSaveConfig)
TEST(MainWindowTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(OnSaveConfig))
{
ignition::common::Console::SetVerbosity(4);
Application app(g_argc, g_argv);
Expand Down Expand Up @@ -85,7 +85,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(MainWindowTest, OnSaveConfig)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(MainWindowTest, OnSaveConfigAs)
TEST(MainWindowTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(SaveConfigAs))
{
ignition::common::Console::SetVerbosity(4);
Application app(g_argc, g_argv);
Expand Down Expand Up @@ -121,7 +121,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(MainWindowTest, OnSaveConfigAs)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(MainWindowTest, OnLoadConfig)
TEST(MainWindowTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(OnLoadConfig))
{
ignition::common::Console::SetVerbosity(4);
Application app(g_argc, g_argv);
Expand Down Expand Up @@ -163,7 +163,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(MainWindowTest, OnLoadConfig)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_ENABLE_ONLY_LINUX(MainWindowTest, OnAddPlugin)
TEST(MainWindowTest, IGN_UTILS_TEST_ENABLE_ONLY_LINUX(OnAddPlugin))
{
ignition::common::Console::SetVerbosity(4);
Application app(g_argc, g_argv);
Expand Down Expand Up @@ -195,7 +195,7 @@ IGN_UTILS_TEST_ENABLE_ONLY_LINUX(MainWindowTest, OnAddPlugin)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(WindowConfigTest, defaultValues)
TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(defaultValues))
{
ignition::common::Console::SetVerbosity(4);

Expand Down Expand Up @@ -230,7 +230,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(WindowConfigTest, defaultValues)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(WindowConfigTest, mergeFromXML)
TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(mergeFromXML))
{
ignition::common::Console::SetVerbosity(4);

Expand Down Expand Up @@ -268,7 +268,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(WindowConfigTest, mergeFromXML)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(WindowConfigTest, MenusToString)
TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(MenusToString))
{
ignition::common::Console::SetVerbosity(4);

Expand Down Expand Up @@ -298,7 +298,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(WindowConfigTest, MenusToString)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(WindowConfigTest, IgnoreToString)
TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(IgnoreToString))
{
ignition::common::Console::SetVerbosity(4);

Expand All @@ -324,7 +324,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(WindowConfigTest, IgnoreToString)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_ENABLE_ONLY_LINUX(MainWindowTest, CloseWithoutSavingChanges)
TEST(MainWindowTest, IGN_UTILS_TEST_ENABLE_ONLY_LINUX(CloseWithoutSavingChanges))
{
ignition::common::Console::SetVerbosity(4);
Application app(g_argc, g_argv);
Expand Down Expand Up @@ -371,7 +371,7 @@ IGN_UTILS_TEST_ENABLE_ONLY_LINUX(MainWindowTest, CloseWithoutSavingChanges)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(MainWindowTest, ApplyConfig)
TEST(MainWindowTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(ApplyConfig))
{
ignition::common::Console::SetVerbosity(4);
Application app(g_argc, g_argv);
Expand Down
6 changes: 3 additions & 3 deletions src/Plugin_TEST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ using namespace ignition;
using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
IGN_UTILS_TEST_DISABLED_ON_WIN32(PluginTest, DeleteLater)
TEST(PluginTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(DeleteLater))
{
ignition::common::Console::SetVerbosity(4);

Expand Down Expand Up @@ -71,7 +71,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(PluginTest, DeleteLater)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(PluginTest, InvalidXmlText)
TEST(PluginTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(InvalidXmlText))
{
ignition::common::Console::SetVerbosity(4);

Expand Down Expand Up @@ -101,7 +101,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(PluginTest, InvalidXmlText)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(PluginTest, Getters)
TEST(PluginTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Getters))
{
ignition::common::Console::SetVerbosity(4);

Expand Down
2 changes: 1 addition & 1 deletion src/ign_TEST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ std::string custom_exec_str(std::string _cmd)
}

// See https://github.com/ignitionrobotics/ign-gui/issues/75
IGN_UTILS_TEST_DISABLED_ON_WIN32(CmdLine, list)
TEST(CmdLine, IGN_UTILS_TEST_DISABLED_ON_WIN32(list))
{
std::string output = custom_exec_str("ign gui -l");
EXPECT_NE(output.find("TopicEcho"), std::string::npos);
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/world_control/WorldControl_TEST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(WorldControlTest, Load)
TEST(WorldControlTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Load))
{
common::Console::SetVerbosity(4);

Expand All @@ -60,7 +60,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(WorldControlTest, Load)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(WorldControlTest, WorldControl)
TEST(WorldControlTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(WorldControl))
{
common::Console::SetVerbosity(4);

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/world_stats/WorldStats_TEST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(WorldStatsTest, Load)
TEST(WorldStatsTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Load))
{
common::Console::SetVerbosity(4);

Expand All @@ -60,7 +60,7 @@ IGN_UTILS_TEST_DISABLED_ON_WIN32(WorldStatsTest, Load)
}

/////////////////////////////////////////////////
IGN_UTILS_TEST_DISABLED_ON_WIN32(WorldStatsTest, WorldStats)
TEST(WorldStatsTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(WorldStats))
{
common::Console::SetVerbosity(4);

Expand Down
2 changes: 1 addition & 1 deletion test/integration/Examples_TEST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
/////////////////////////////////////////////////
IGN_UTILS_TEST_ENABLE_ONLY_LINUX(ExampleTest, Configs)
TEST(ExampleTest, IGN_UTILS_TEST_ENABLE_ONLY_LINUX(Configs))
{
common::Console::SetVerbosity(4);
auto exampleConfigPath = common::joinPaths(std::string(PROJECT_SOURCE_PATH),
Expand Down

0 comments on commit 12699c7

Please sign in to comment.