|
@@ -150,7 +150,7 @@ TEST_F(CCSessionTest, parseCommand) {
|
|
|
}
|
|
|
|
|
|
TEST_F(CCSessionTest, session1) {
|
|
|
- EXPECT_EQ(false, session.haveSubscription("Spec1", "*"));
|
|
|
+ EXPECT_FALSE(session.haveSubscription("Spec1", "*"));
|
|
|
ModuleCCSession mccs(ccspecfile("spec1.spec"), session, NULL, NULL);
|
|
|
EXPECT_EQ(true, session.haveSubscription("Spec1", "*"));
|
|
|
|
|
@@ -166,7 +166,7 @@ TEST_F(CCSessionTest, session1) {
|
|
|
|
|
|
TEST_F(CCSessionTest, session2)
|
|
|
{
|
|
|
- EXPECT_EQ(false, session.haveSubscription("Spec2", "*"));
|
|
|
+ EXPECT_FALSE(session.haveSubscription("Spec2", "*"));
|
|
|
ModuleCCSession mccs(ccspecfile("spec2.spec"), session, NULL, NULL);
|
|
|
EXPECT_EQ(true, session.haveSubscription("Spec2", "*"));
|
|
|
|
|
@@ -212,7 +212,7 @@ TEST_F(CCSessionTest, session3) {
|
|
|
// client will ask for config
|
|
|
session.getMessages()->add(createAnswer(0, el("{}")));
|
|
|
|
|
|
- EXPECT_EQ(false, session.haveSubscription("Spec2", "*"));
|
|
|
+ EXPECT_FALSE(session.haveSubscription("Spec2", "*"));
|
|
|
ModuleCCSession mccs(ccspecfile("spec2.spec"), session, my_config_handler,
|
|
|
my_command_handler);
|
|
|
EXPECT_EQ(true, session.haveSubscription("Spec2", "*"));
|
|
@@ -236,7 +236,7 @@ TEST_F(CCSessionTest, checkCommand) {
|
|
|
// client will ask for config
|
|
|
session.getMessages()->add(createAnswer(0, el("{}")));
|
|
|
|
|
|
- EXPECT_EQ(false, session.haveSubscription("Spec2", "*"));
|
|
|
+ EXPECT_FALSE(session.haveSubscription("Spec2", "*"));
|
|
|
ModuleCCSession mccs(ccspecfile("spec2.spec"), session, my_config_handler,
|
|
|
my_command_handler);
|
|
|
EXPECT_EQ(true, session.haveSubscription("Spec2", "*"));
|
|
@@ -347,7 +347,7 @@ TEST_F(CCSessionTest, remoteConfig) {
|
|
|
// the default
|
|
|
session.getMessages()->add(createAnswer(0, el("{}")));
|
|
|
|
|
|
- EXPECT_EQ(false, session.haveSubscription("Spec2", "*"));
|
|
|
+ EXPECT_FALSE(session.haveSubscription("Spec2", "*"));
|
|
|
module_name = mccs.addRemoteConfig(ccspecfile("spec2.spec"));
|
|
|
EXPECT_EQ("Spec2", module_name);
|
|
|
EXPECT_EQ(true, session.haveSubscription("Spec2", "*"));
|
|
@@ -357,7 +357,7 @@ TEST_F(CCSessionTest, remoteConfig) {
|
|
|
|
|
|
// Remove it and see we get an error asking for a config value
|
|
|
mccs.removeRemoteConfig(module_name);
|
|
|
- EXPECT_EQ(false, session.haveSubscription("Spec2", "*"));
|
|
|
+ EXPECT_FALSE(session.haveSubscription("Spec2", "*"));
|
|
|
EXPECT_THROW(mccs.getRemoteConfigValue(module_name, "item1"), CCSessionError);
|
|
|
|
|
|
// Now re-add it, with a specific config value, and see we get that
|
|
@@ -388,7 +388,7 @@ TEST_F(CCSessionTest, ignoreRemoteConfigCommands) {
|
|
|
// client will ask for config
|
|
|
session.getMessages()->add(createAnswer(0, el("{ }")));
|
|
|
|
|
|
- EXPECT_EQ(false, session.haveSubscription("Spec2", "*"));
|
|
|
+ EXPECT_FALSE(session.haveSubscription("Spec2", "*"));
|
|
|
ModuleCCSession mccs(ccspecfile("spec2.spec"), session, my_config_handler, my_command_handler);
|
|
|
EXPECT_EQ(true, session.haveSubscription("Spec2", "*"));
|
|
|
|