1 files changed, 129 insertions, 142 deletions
diff --git a/src/mongo/s/type_mongos_test.cpp b/src/mongo/s/type_mongos_test.cpp
index 1c0ab5be56d..210c1ae4169 100644
--- a/src/mongo/s/type_mongos_test.cpp
+++ b/src/mongo/s/type_mongos_test.cpp
@@ -32,154 +32,141 @@
 
 namespace {
 
-    using std::string;
-    using mongo::BSONObj;
-    using mongo::MongosType;
-    using mongo::Date_t;
+using std::string;
+using mongo::BSONObj;
+using mongo::MongosType;
+using mongo::Date_t;
 
-    TEST(Validity, MissingName) {
-        MongosType mongos;
-        string errMsg;
-        BSONObj obj = BSON(MongosType::ping(Date_t::fromMillisSinceEpoch(1)) <<
-                           MongosType::up(100) <<
-                           MongosType::waiting(false) <<
-                           MongosType::mongoVersion("x.x.x") <<
-                           MongosType::configVersion(0));
-        ASSERT(mongos.parseBSON(obj, &errMsg));
-        ASSERT_EQUALS(errMsg, "");
-        ASSERT_FALSE(mongos.isNameSet());
-        ASSERT_TRUE(mongos.isPingSet());
-        ASSERT_TRUE(mongos.isUpSet());
-        ASSERT_TRUE(mongos.isWaitingSet());
-        ASSERT_TRUE(mongos.isMongoVersionSet());
-        ASSERT_TRUE(mongos.isConfigVersionSet());
-        ASSERT_FALSE(mongos.isValid(NULL));
-    }
+TEST(Validity, MissingName) {
+    MongosType mongos;
+    string errMsg;
+    BSONObj obj = BSON(MongosType::ping(Date_t::fromMillisSinceEpoch(1))
+                       << MongosType::up(100) << MongosType::waiting(false)
+                       << MongosType::mongoVersion("x.x.x") << MongosType::configVersion(0));
+    ASSERT(mongos.parseBSON(obj, &errMsg));
+    ASSERT_EQUALS(errMsg, "");
+    ASSERT_FALSE(mongos.isNameSet());
+    ASSERT_TRUE(mongos.isPingSet());
+    ASSERT_TRUE(mongos.isUpSet());
+    ASSERT_TRUE(mongos.isWaitingSet());
+    ASSERT_TRUE(mongos.isMongoVersionSet());
+    ASSERT_TRUE(mongos.isConfigVersionSet());
+    ASSERT_FALSE(mongos.isValid(NULL));
+}
 
-    TEST(Validity, MissingPing) {
-        MongosType mongos;
-        string errMsg;
-        BSONObj obj = BSON(MongosType::name("localhost:27017") <<
-                           MongosType::up(100) <<
-                           MongosType::waiting(false) <<
-                           MongosType::mongoVersion("x.x.x") <<
-                           MongosType::configVersion(0));
-        ASSERT(mongos.parseBSON(obj, &errMsg));
-        ASSERT_EQUALS(errMsg, "");
-        ASSERT_TRUE(mongos.isNameSet());
-        ASSERT_FALSE(mongos.isPingSet());
-        ASSERT_TRUE(mongos.isUpSet());
-        ASSERT_TRUE(mongos.isWaitingSet());
-        ASSERT_TRUE(mongos.isMongoVersionSet());
-        ASSERT_TRUE(mongos.isConfigVersionSet());
-        ASSERT_FALSE(mongos.isValid(NULL));
-    }
+TEST(Validity, MissingPing) {
+    MongosType mongos;
+    string errMsg;
+    BSONObj obj = BSON(MongosType::name("localhost:27017")
+                       << MongosType::up(100) << MongosType::waiting(false)
+                       << MongosType::mongoVersion("x.x.x") << MongosType::configVersion(0));
+    ASSERT(mongos.parseBSON(obj, &errMsg));
+    ASSERT_EQUALS(errMsg, "");
+    ASSERT_TRUE(mongos.isNameSet());
+    ASSERT_FALSE(mongos.isPingSet());
+    ASSERT_TRUE(mongos.isUpSet());
+    ASSERT_TRUE(mongos.isWaitingSet());
+    ASSERT_TRUE(mongos.isMongoVersionSet());
+    ASSERT_TRUE(mongos.isConfigVersionSet());
+    ASSERT_FALSE(mongos.isValid(NULL));
+}
 
-    TEST(Validity, MissingUp) {
-        MongosType mongos;
-        string errMsg;
-        BSONObj obj = BSON(MongosType::name("localhost:27017") <<
-                           MongosType::ping(Date_t::fromMillisSinceEpoch(1)) <<
-                           MongosType::waiting(false) <<
-                           MongosType::mongoVersion("x.x.x") <<
-                           MongosType::configVersion(0));
-        ASSERT(mongos.parseBSON(obj, &errMsg));
-        ASSERT_EQUALS(errMsg, "");
-        ASSERT_TRUE(mongos.isNameSet());
-        ASSERT_TRUE(mongos.isPingSet());
-        ASSERT_FALSE(mongos.isUpSet());
-        ASSERT_TRUE(mongos.isWaitingSet());
-        ASSERT_TRUE(mongos.isMongoVersionSet());
-        ASSERT_TRUE(mongos.isConfigVersionSet());
-        ASSERT_FALSE(mongos.isValid(NULL));
-    }
+TEST(Validity, MissingUp) {
+    MongosType mongos;
+    string errMsg;
+    BSONObj obj =
+        BSON(MongosType::name("localhost:27017")
+             << MongosType::ping(Date_t::fromMillisSinceEpoch(1)) << MongosType::waiting(false)
+             << MongosType::mongoVersion("x.x.x") << MongosType::configVersion(0));
+    ASSERT(mongos.parseBSON(obj, &errMsg));
+    ASSERT_EQUALS(errMsg, "");
+    ASSERT_TRUE(mongos.isNameSet());
+    ASSERT_TRUE(mongos.isPingSet());
+    ASSERT_FALSE(mongos.isUpSet());
+    ASSERT_TRUE(mongos.isWaitingSet());
+    ASSERT_TRUE(mongos.isMongoVersionSet());
+    ASSERT_TRUE(mongos.isConfigVersionSet());
+    ASSERT_FALSE(mongos.isValid(NULL));
+}
 
-    TEST(Validity, MissingWaiting) {
-        MongosType mongos;
-        string errMsg;
-        BSONObj obj = BSON(MongosType::name("localhost:27017") <<
-                           MongosType::ping(Date_t::fromMillisSinceEpoch(1)) <<
-                           MongosType::up(100) <<
-                           MongosType::mongoVersion("x.x.x") <<
-                           MongosType::configVersion(0));
-        ASSERT(mongos.parseBSON(obj, &errMsg));
-        ASSERT_EQUALS(errMsg, "");
-        ASSERT_TRUE(mongos.isNameSet());
-        ASSERT_TRUE(mongos.isPingSet());
-        ASSERT_TRUE(mongos.isUpSet());
-        ASSERT_FALSE(mongos.isWaitingSet());
-        ASSERT_TRUE(mongos.isMongoVersionSet());
-        ASSERT_TRUE(mongos.isConfigVersionSet());
-        ASSERT_FALSE(mongos.isValid(NULL));
-    }
+TEST(Validity, MissingWaiting) {
+    MongosType mongos;
+    string errMsg;
+    BSONObj obj = BSON(MongosType::name("localhost:27017")
+                       << MongosType::ping(Date_t::fromMillisSinceEpoch(1)) << MongosType::up(100)
+                       << MongosType::mongoVersion("x.x.x") << MongosType::configVersion(0));
+    ASSERT(mongos.parseBSON(obj, &errMsg));
+    ASSERT_EQUALS(errMsg, "");
+    ASSERT_TRUE(mongos.isNameSet());
+    ASSERT_TRUE(mongos.isPingSet());
+    ASSERT_TRUE(mongos.isUpSet());
+    ASSERT_FALSE(mongos.isWaitingSet());
+    ASSERT_TRUE(mongos.isMongoVersionSet());
+    ASSERT_TRUE(mongos.isConfigVersionSet());
+    ASSERT_FALSE(mongos.isValid(NULL));
+}
 
-    TEST(Validity, MissingMongoVersion) {
-        MongosType mongos;
-        string errMsg;
-        BSONObj obj = BSON(MongosType::name("localhost:27017") <<
-                           MongosType::ping(Date_t::fromMillisSinceEpoch(1)) <<
-                           MongosType::up(100) <<
-                           MongosType::waiting(false) <<
-                           MongosType::configVersion(0));
-        ASSERT(mongos.parseBSON(obj, &errMsg));
-        ASSERT_EQUALS(errMsg, "");
-        ASSERT_TRUE(mongos.isNameSet());
-        ASSERT_TRUE(mongos.isPingSet());
-        ASSERT_TRUE(mongos.isUpSet());
-        ASSERT_TRUE(mongos.isWaitingSet());
-        ASSERT_FALSE(mongos.isMongoVersionSet());
-        ASSERT_TRUE(mongos.isConfigVersionSet());
-        /* NOTE: mongoVersion should eventually become mandatory, but is optional now for backward
-         * compatibility reasons */
-        ASSERT_TRUE(mongos.isValid(NULL));
-    }
+TEST(Validity, MissingMongoVersion) {
+    MongosType mongos;
+    string errMsg;
+    BSONObj obj = BSON(MongosType::name("localhost:27017")
+                       << MongosType::ping(Date_t::fromMillisSinceEpoch(1)) << MongosType::up(100)
+                       << MongosType::waiting(false) << MongosType::configVersion(0));
+    ASSERT(mongos.parseBSON(obj, &errMsg));
+    ASSERT_EQUALS(errMsg, "");
+    ASSERT_TRUE(mongos.isNameSet());
+    ASSERT_TRUE(mongos.isPingSet());
+    ASSERT_TRUE(mongos.isUpSet());
+    ASSERT_TRUE(mongos.isWaitingSet());
+    ASSERT_FALSE(mongos.isMongoVersionSet());
+    ASSERT_TRUE(mongos.isConfigVersionSet());
+    /* NOTE: mongoVersion should eventually become mandatory, but is optional now for backward
+     * compatibility reasons */
+    ASSERT_TRUE(mongos.isValid(NULL));
+}
 
-    TEST(Validity, MissingConfigVersion) {
-        MongosType mongos;
-        string errMsg;
-        BSONObj obj = BSON(MongosType::name("localhost:27017") <<
-                           MongosType::ping(Date_t::fromMillisSinceEpoch(1)) <<
-                           MongosType::up(100) <<
-                           MongosType::waiting(false) <<
-                           MongosType::mongoVersion("x.x.x"));
-        ASSERT(mongos.parseBSON(obj, &errMsg));
-        ASSERT_EQUALS(errMsg, "");
-        ASSERT_TRUE(mongos.isNameSet());
-        ASSERT_TRUE(mongos.isPingSet());
-        ASSERT_TRUE(mongos.isUpSet());
-        ASSERT_TRUE(mongos.isWaitingSet());
-        ASSERT_TRUE(mongos.isMongoVersionSet());
-        ASSERT_FALSE(mongos.isConfigVersionSet());
-        /* NOTE: configVersion should eventually become mandatory, but is optional now for backward
-         * compatibility reasons */
-        ASSERT_TRUE(mongos.isValid(NULL));
-    }
+TEST(Validity, MissingConfigVersion) {
+    MongosType mongos;
+    string errMsg;
+    BSONObj obj = BSON(MongosType::name("localhost:27017")
+                       << MongosType::ping(Date_t::fromMillisSinceEpoch(1)) << MongosType::up(100)
+                       << MongosType::waiting(false) << MongosType::mongoVersion("x.x.x"));
+    ASSERT(mongos.parseBSON(obj, &errMsg));
+    ASSERT_EQUALS(errMsg, "");
+    ASSERT_TRUE(mongos.isNameSet());
+    ASSERT_TRUE(mongos.isPingSet());
+    ASSERT_TRUE(mongos.isUpSet());
+    ASSERT_TRUE(mongos.isWaitingSet());
+    ASSERT_TRUE(mongos.isMongoVersionSet());
+    ASSERT_FALSE(mongos.isConfigVersionSet());
+    /* NOTE: configVersion should eventually become mandatory, but is optional now for backward
+     * compatibility reasons */
+    ASSERT_TRUE(mongos.isValid(NULL));
+}
 
-    TEST(Validity, Valid) {
-        MongosType mongos;
-        BSONObj obj = BSON(MongosType::name("localhost:27017") <<
-                           MongosType::ping(Date_t::fromMillisSinceEpoch(1)) <<
-                           MongosType::up(100) <<
-                           MongosType::waiting(false) <<
-                           MongosType::mongoVersion("x.x.x") <<
-                           MongosType::configVersion(0));
-        string errMsg;
-        ASSERT(mongos.parseBSON(obj, &errMsg));
-        ASSERT_EQUALS(errMsg, "");
-        ASSERT_TRUE(mongos.isValid(NULL));
-        ASSERT_EQUALS(mongos.getName(), "localhost:27017");
-        ASSERT_EQUALS(mongos.getPing(), Date_t::fromMillisSinceEpoch(1));
-        ASSERT_EQUALS(mongos.getUp(), 100);
-        ASSERT_EQUALS(mongos.getWaiting(), false);
-        ASSERT_EQUALS(mongos.getMongoVersion(), "x.x.x");
-        ASSERT_EQUALS(mongos.getConfigVersion(), 0);
-    }
+TEST(Validity, Valid) {
+    MongosType mongos;
+    BSONObj obj = BSON(MongosType::name("localhost:27017")
+                       << MongosType::ping(Date_t::fromMillisSinceEpoch(1)) << MongosType::up(100)
+                       << MongosType::waiting(false) << MongosType::mongoVersion("x.x.x")
+                       << MongosType::configVersion(0));
+    string errMsg;
+    ASSERT(mongos.parseBSON(obj, &errMsg));
+    ASSERT_EQUALS(errMsg, "");
+    ASSERT_TRUE(mongos.isValid(NULL));
+    ASSERT_EQUALS(mongos.getName(), "localhost:27017");
+    ASSERT_EQUALS(mongos.getPing(), Date_t::fromMillisSinceEpoch(1));
+    ASSERT_EQUALS(mongos.getUp(), 100);
+    ASSERT_EQUALS(mongos.getWaiting(), false);
+    ASSERT_EQUALS(mongos.getMongoVersion(), "x.x.x");
+    ASSERT_EQUALS(mongos.getConfigVersion(), 0);
+}
 
-    TEST(Validity, BadType) {
-        MongosType mongos;
-        BSONObj obj = BSON(MongosType::name() << 0);
-        string errMsg;
-        ASSERT((!mongos.parseBSON(obj, &errMsg)) && (errMsg != ""));
-    }
+TEST(Validity, BadType) {
+    MongosType mongos;
+    BSONObj obj = BSON(MongosType::name() << 0);
+    string errMsg;
+    ASSERT((!mongos.parseBSON(obj, &errMsg)) && (errMsg != ""));
+}
 
-} // unnamed namespace
+}  // unnamed namespace