Rename some test names for consistency

This commit is contained in:
Alexey Rybalchenko
2019-03-04 13:46:41 +01:00
committed by Dennis Klein
parent f191c5099c
commit 5af604c0a9
23 changed files with 146 additions and 146 deletions

View File

@@ -89,10 +89,10 @@ class TestDevice : public FairMQDevice
thread fDeviceThread;
};
class DeviceConfig : public ::testing::Test
class Config : public ::testing::Test
{
public:
DeviceConfig()
Config()
{}
string TestDeviceSetConfig(const string& transport)
@@ -157,7 +157,7 @@ class DeviceConfig : public ::testing::Test
}
};
TEST_F(DeviceConfig, SetConfig)
TEST_F(Config, SetConfig)
{
string transport = "zeromq";
string returnedTransport = TestDeviceSetConfig(transport);
@@ -165,7 +165,7 @@ TEST_F(DeviceConfig, SetConfig)
EXPECT_EQ(transport, returnedTransport);
}
TEST_F(DeviceConfig, SetTransport)
TEST_F(Config, SetTransport)
{
string transport = "zeromq";
string returnedTransport = TestDeviceSetTransport(transport);
@@ -173,7 +173,7 @@ TEST_F(DeviceConfig, SetTransport)
EXPECT_EQ(transport, returnedTransport);
}
TEST_F(DeviceConfig, ControlInConstructor)
TEST_F(Config, ControlInConstructor)
{
string transport = "zeromq";
string returnedTransport = TestDeviceControlInConstructor(transport);

View File

@@ -45,79 +45,79 @@ void RunExceptionIn(const std::string& state, const std::string& input = "")
exit(result.exit_code);
}
TEST(Exceptions, InInit_______static)
TEST(Exceptions, static_InInit)
{
EXPECT_EXIT(RunExceptionIn("Init"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InInitTask___static)
TEST(Exceptions, static_InInitTask)
{
EXPECT_EXIT(RunExceptionIn("InitTask"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InPreRun_____static)
TEST(Exceptions, static_InPreRun)
{
EXPECT_EXIT(RunExceptionIn("PreRun"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InRun________static)
TEST(Exceptions, static_InRun)
{
EXPECT_EXIT(RunExceptionIn("Run"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InPostRun____static)
TEST(Exceptions, static_InPostRun)
{
EXPECT_EXIT(RunExceptionIn("PostRun"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InResetTask__static)
TEST(Exceptions, static_InResetTask)
{
EXPECT_EXIT(RunExceptionIn("ResetTask"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InReset______static)
TEST(Exceptions, static_InReset)
{
EXPECT_EXIT(RunExceptionIn("Reset"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InInit_______interactive)
TEST(Exceptions, interactive_InInit)
{
EXPECT_EXIT(RunExceptionIn("Init", "q"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InInitTask___interactive)
TEST(Exceptions, interactive_InInitTask)
{
EXPECT_EXIT(RunExceptionIn("InitTask", "q"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InPreRun_____interactive)
TEST(Exceptions, interactive_InPreRun)
{
EXPECT_EXIT(RunExceptionIn("PreRun", "q"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InRun________interactive)
TEST(Exceptions, interactive_InRun)
{
EXPECT_EXIT(RunExceptionIn("Run", "q"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InPostRun____interactive)
TEST(Exceptions, interactive_InPostRun)
{
EXPECT_EXIT(RunExceptionIn("PostRun", "q"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InResetTask__interactive)
TEST(Exceptions, interactive_InResetTask)
{
EXPECT_EXIT(RunExceptionIn("ResetTask", "q"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InReset______interactive)
TEST(Exceptions, interactive_InReset)
{
EXPECT_EXIT(RunExceptionIn("Reset", "q"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InInit_______interactive_invalid)
TEST(Exceptions, interactive_invalid_InInit)
{
EXPECT_EXIT(RunExceptionIn("Init", "_"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InInitTask___interactive_invalid)
TEST(Exceptions, interactive_invalid_InInitTask)
{
EXPECT_EXIT(RunExceptionIn("InitTask", "_"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InPreRun_____interactive_invalid)
TEST(Exceptions, interactive_invalid_InPreRun)
{
EXPECT_EXIT(RunExceptionIn("PreRun", "_"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InRun________interactive_invalid)
TEST(Exceptions, interactive_invalid_InRun)
{
EXPECT_EXIT(RunExceptionIn("Run", "_"), ::testing::ExitedWithCode(1), "");
}
TEST(Exceptions, InPostRun____interactive_invalid)
TEST(Exceptions, interactive_invalid_InPostRun)
{
EXPECT_EXIT(RunExceptionIn("PostRun", "_"), ::testing::ExitedWithCode(1), "");
}

View File

@@ -28,10 +28,10 @@ class TestVersion : public FairMQDevice
{}
};
class DeviceVersion : public ::testing::Test
class Version : public ::testing::Test
{
public:
DeviceVersion()
Version()
{}
fair::mq::tools::Version TestDeviceVersion()
@@ -43,7 +43,7 @@ class DeviceVersion : public ::testing::Test
}
};
TEST_F(DeviceVersion, getter)
TEST_F(Version, getter)
{
struct fair::mq::tools::Version v{1, 2, 3};
fair::mq::tools::Version version = TestDeviceVersion();