Revert "Updated command line options tests with new port type"

kangas · kangas · commit a23a3f35d5fa · 2014-01-24T13:23:33.000-05:00
This reverts commit 59ffbe2.
diff --git a/src/mongo/tools/mongodump_options_test.cpp b/src/mongo/tools/mongodump_options_test.cpp
@@ -206,7 +206,7 @@ namespace {
             }
             else if (iterator->_dottedName == "port") {
                 ASSERT_EQUALS(iterator->_singleName, "port");
-                ASSERT_EQUALS(iterator->_type, moe::Int);
+                ASSERT_EQUALS(iterator->_type, moe::String);
                 ASSERT_EQUALS(iterator->_description, "server port. Can also use --host hostname:port");
                 ASSERT_EQUALS(iterator->_isVisible, true);
                 ASSERT_TRUE(iterator->_default.isEmpty());
diff --git a/src/mongo/tools/mongoexport_options_test.cpp b/src/mongo/tools/mongoexport_options_test.cpp
@@ -206,7 +206,7 @@ namespace {
             }
             else if (iterator->_dottedName == "port") {
                 ASSERT_EQUALS(iterator->_singleName, "port");
-                ASSERT_EQUALS(iterator->_type, moe::Int);
+                ASSERT_EQUALS(iterator->_type, moe::String);
                 ASSERT_EQUALS(iterator->_description, "server port. Can also use --host hostname:port");
                 ASSERT_EQUALS(iterator->_isVisible, true);
                 ASSERT_TRUE(iterator->_default.isEmpty());
diff --git a/src/mongo/tools/mongofiles_options_test.cpp b/src/mongo/tools/mongofiles_options_test.cpp
@@ -206,7 +206,7 @@ namespace {
             }
             else if (iterator->_dottedName == "port") {
                 ASSERT_EQUALS(iterator->_singleName, "port");
-                ASSERT_EQUALS(iterator->_type, moe::Int);
+                ASSERT_EQUALS(iterator->_type, moe::String);
                 ASSERT_EQUALS(iterator->_description, "server port. Can also use --host hostname:port");
                 ASSERT_EQUALS(iterator->_isVisible, true);
                 ASSERT_TRUE(iterator->_default.isEmpty());
diff --git a/src/mongo/tools/mongoimport_options_test.cpp b/src/mongo/tools/mongoimport_options_test.cpp
@@ -206,7 +206,7 @@ namespace {
             }
             else if (iterator->_dottedName == "port") {
                 ASSERT_EQUALS(iterator->_singleName, "port");
-                ASSERT_EQUALS(iterator->_type, moe::Int);
+                ASSERT_EQUALS(iterator->_type, moe::String);
                 ASSERT_EQUALS(iterator->_description, "server port. Can also use --host hostname:port");
                 ASSERT_EQUALS(iterator->_isVisible, true);
                 ASSERT_TRUE(iterator->_default.isEmpty());
diff --git a/src/mongo/tools/mongooplog_options_test.cpp b/src/mongo/tools/mongooplog_options_test.cpp
@@ -206,7 +206,7 @@ namespace {
             }
             else if (iterator->_dottedName == "port") {
                 ASSERT_EQUALS(iterator->_singleName, "port");
-                ASSERT_EQUALS(iterator->_type, moe::Int);
+                ASSERT_EQUALS(iterator->_type, moe::String);
                 ASSERT_EQUALS(iterator->_description, "server port. Can also use --host hostname:port");
                 ASSERT_EQUALS(iterator->_isVisible, true);
                 ASSERT_TRUE(iterator->_default.isEmpty());
diff --git a/src/mongo/tools/mongorestore_options_test.cpp b/src/mongo/tools/mongorestore_options_test.cpp
@@ -206,7 +206,7 @@ namespace {
             }
             else if (iterator->_dottedName == "port") {
                 ASSERT_EQUALS(iterator->_singleName, "port");
-                ASSERT_EQUALS(iterator->_type, moe::Int);
+                ASSERT_EQUALS(iterator->_type, moe::String);
                 ASSERT_EQUALS(iterator->_description, "server port. Can also use --host hostname:port");
                 ASSERT_EQUALS(iterator->_isVisible, true);
                 ASSERT_TRUE(iterator->_default.isEmpty());
diff --git a/src/mongo/tools/mongostat_options_test.cpp b/src/mongo/tools/mongostat_options_test.cpp
@@ -206,7 +206,7 @@ namespace {
             }
             else if (iterator->_dottedName == "port") {
                 ASSERT_EQUALS(iterator->_singleName, "port");
-                ASSERT_EQUALS(iterator->_type, moe::Int);
+                ASSERT_EQUALS(iterator->_type, moe::String);
                 ASSERT_EQUALS(iterator->_description, "server port. Can also use --host hostname:port");
                 ASSERT_EQUALS(iterator->_isVisible, true);
                 ASSERT_TRUE(iterator->_default.isEmpty());
diff --git a/src/mongo/tools/mongotop_options_test.cpp b/src/mongo/tools/mongotop_options_test.cpp
@@ -206,7 +206,7 @@ namespace {
             }
             else if (iterator->_dottedName == "port") {
                 ASSERT_EQUALS(iterator->_singleName, "port");
-                ASSERT_EQUALS(iterator->_type, moe::Int);
+                ASSERT_EQUALS(iterator->_type, moe::String);
                 ASSERT_EQUALS(iterator->_description, "server port. Can also use --host hostname:port");
                 ASSERT_EQUALS(iterator->_isVisible, true);
                 ASSERT_TRUE(iterator->_default.isEmpty());

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ namespace {`
`206`	`206`	`}`
`207`	`207`	`else if (iterator->_dottedName == "port") {`
`208`	`208`	`ASSERT_EQUALS(iterator->_singleName, "port");`
`209`		`- ASSERT_EQUALS(iterator->_type, moe::Int);`
	`209`	`+ ASSERT_EQUALS(iterator->_type, moe::String);`
`210`	`210`	`ASSERT_EQUALS(iterator->_description, "server port. Can also use --host hostname:port");`
`211`	`211`	`ASSERT_EQUALS(iterator->_isVisible, true);`
`212`	`212`	`ASSERT_TRUE(iterator->_default.isEmpty());`