SERVER-14357: Add support for top level JSON Array

1 files changed, 27 insertions, 4 deletions

diff --git a/src/mongo/dbtests/jsontests.cpp b/src/mongo/dbtests/jsontests.cpp
index c7aa8eedb8a..607e319a081 100644
--- a/src/mongo/dbtests/jsontests.cpp
+++ b/src/mongo/dbtests/jsontests.cpp
@@ -578,10 +578,10 @@ namespace JsonTests {
             virtual ~Base() {}
             void run() {
                 ASSERT( fromjson( json() ).valid() );
-                assertEquals( bson(), fromjson( json() ), "mode: <default>" );
-                assertEquals( bson(), fromjson( bson().jsonString( Strict ) ), "mode: strict" );
-                assertEquals( bson(), fromjson( bson().jsonString( TenGen ) ), "mode: tengen" );
-                assertEquals( bson(), fromjson( bson().jsonString( JS ) ), "mode: js" );
+                assertEquals( bson(), fromjson( tojson( bson() ) ), "mode: <default>" );
+                assertEquals( bson(), fromjson( tojson( bson(), Strict ) ), "mode: strict" );
+                assertEquals( bson(), fromjson( tojson( bson(), TenGen ) ), "mode: tengen" );
+                assertEquals( bson(), fromjson( tojson( bson(), JS ) ), "mode: js" );
             }
         protected:
             virtual BSONObj bson() const = 0;
@@ -814,6 +814,27 @@ namespace JsonTests {
             }
         };
 
+        class TopLevelArrayEmpty : public Base {
+            virtual BSONObj bson() const {
+                return BSONArray();
+            }
+            virtual string json() const {
+                return "[]";
+            }
+        };
+
+        class TopLevelArray : public Base {
+            virtual BSONObj bson() const {
+                BSONArrayBuilder builder;
+                builder.append(123);
+                builder.append("abc");
+                return builder.arr();
+            }
+            virtual string json() const {
+                return "[ 123, \"abc\" ]";
+            }
+        };
+
         class Array : public Base {
             virtual BSONObj bson() const {
                 vector< int > arr;
@@ -2675,6 +2696,8 @@ namespace JsonTests {
             add< FromJsonTests::Subobject >();
             add< FromJsonTests::DeeplyNestedObject >();
             add< FromJsonTests::ArrayEmpty >();
+            add< FromJsonTests::TopLevelArrayEmpty >();
+            add< FromJsonTests::TopLevelArray >();
             add< FromJsonTests::Array >();
             add< FromJsonTests::True >();
             add< FromJsonTests::False >();