Merge branch 'master' of git@github.com:mongodb/mongo

README

@@ -16,19 +16,6 @@ BUILDING
 
   http://www.mongodb.org/display/DOCS/Building
 
-
-- Pre-requisite for 'test' binary, the MongoDB unit test suite:
-  This is not required for building or running the database
-
-  To compile the unit tests, you need to install the unit test framework from:
-     http://unittest.red-bean.com/
-
-   $ cd ..
-   $ svn co http://svn.red-bean.com/unittest/trunk/ unittest
-   $ cd unittest
-   $ ./configure
-   $ make
-   $ sudo make install
 
 - Then use scons to build.
 
@@ -41,7 +28,7 @@ BUILDING
      $ scons
 
   To install
-     
+
      $ scons --prefix=/opt/mongo install
 
 RUNNING

db/dbcommands.cpp

@@ -1250,6 +1250,8 @@ namespace mongo {
                 if ( n == 0 ){
                     n = map.size();
                     s->setObject( "$key" , key , true );
+
+                    uassert( "group() can't handle more than 10000 unique keys" , n < 10000 );
                 }
 
                 s->setObject( "obj" , obj , true );
@@ -1258,7 +1260,7 @@ namespace mongo {
                     throw UserException( (string)"reduce invoke failed: " + s->getError() );
                 }
             }
-
+            
             if (!finalize.empty()){
                 s->exec( "$finalize = " + finalize , "finalize define" , false , true , true , 100 );
                 ScriptingFunction g = s->createFunction(

dbtests/basictests.cpp

@@ -49,13 +49,13 @@ namespace BasicTests {
 
     class All : public Suite {
     public:
-        All() {
+        All() : Suite( "basic" ){
+        }
+
+        void setupTests(){
             add< Rarely >();
         }
-    };
+    } myall;
 
 } // namespace BasicTests
 
-UnitTest::TestPtr basicTests() {
-    return UnitTest::createSuite< BasicTests::All >();
-}

dbtests/btreetests.cpp

@@ -213,19 +213,19 @@ namespace BtreeTests {
         }
     };
 
-    class All : public UnitTest::Suite {
+    class All : public Suite {
     public:
-        All() {
+        All() : Suite( "btree" ){
+        }
+
+        void setupTests(){
             add< Create >();
             add< SimpleInsertDelete >();
             add< SplitRightHeavyBucket >();
             add< SplitLeftHeavyBucket >();
             add< MissingLocate >();
             add< MissingLocateMultiBucket >();
         }
-    };
+    } myall;
 }
 
-UnitTest::TestPtr btreeTests() {
-    return UnitTest::createSuite< BtreeTests::All >();
-}

dbtests/cursortests.cpp

@@ -194,18 +194,16 @@ namespace CursorTests {
 
     } // namespace MultiBtreeCursorTests
 
-    class All : public ::Suite {
+    class All : public Suite {
     public:
-        All() {
+        All() : Suite( "cursor" ){}
+
+        void setupTests(){
             add< IdSetTests::BasicSize >();
             add< IdSetTests::Upgrade >();
             add< BtreeCursorTests::MultiRange >();
             add< BtreeCursorTests::MultiRangeGap >();
             add< BtreeCursorTests::MultiRangeReverse >();
         }
-    };
+    } myall;
 } // namespace CursorTests
-
-UnitTest::TestPtr cursorTests() {
-    return UnitTest::createSuite< CursorTests::All >();
-}

dbtests/dbtests.cpp

@@ -22,8 +22,6 @@
 #include "../db/instance.h"
 #include "../util/file_allocator.h"
 
-#include <unittest/Registry.hpp>
-
 #if !defined(_WIN32)
 #include <sys/file.h>
 #endif
@@ -34,14 +32,10 @@ using namespace std;
 
 namespace mongo {
     extern string dbpath;
-} // namespace mongo
-string dbpathSpec = "/tmp/unittest/";
-
-Suite::~Suite() {
-    DBDirectClient c;
-    c.dropDatabase( "unittests" );
 }
 
+string dbpathSpec = "/tmp/unittest/";
+
 void usage() {
     string instructions =
         "dbtests usage:\n"
@@ -97,29 +91,10 @@ int main( int argc, char** argv ) {
     out() << "random seed: " << seed << endl;
 
     theFileAllocator().start();
+
 
-    UnitTest::Registry tests;
-
-    // NOTE Starting JNI changes global state (for example, locale and FPU precision);
-    // make sure all tests run with this setup, by running javajs tests first.
-    tests.add( jsTests(), "js" );
-
-    tests.add( basicTests(), "basic" );
-    tests.add( btreeTests(), "btree" );
-    tests.add( cursorTests(), "cursor" );
-    tests.add( jsobjTests(), "jsobj" );
-    tests.add( jsonTests(), "json" );
-    tests.add( matcherTests(), "matcher" );
-    tests.add( namespaceTests(), "namespace" );
-    tests.add( pairingTests(), "pairing" );
-    tests.add( pdfileTests(), "pdfile" );
-    tests.add( queryTests(), "query" );
-    tests.add( queryOptimizerTests(), "queryoptimizer" );
-    tests.add( replTests(), "repl" );
-    tests.add( sockTests(), "sock" );
-    tests.add( updateTests(), "update" );
-
-    int ret = tests.run( argc, argv );
+
+    int ret = mongo::regression::Suite::run( argc, argv );
 
 #if !defined(_WIN32) && !defined(__sunos__)
     flock( lockFile, LOCK_UN );

dbtests/dbtests.h

@@ -17,28 +17,8 @@
 *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <unittest/UnitTest.hpp>
+#include "framework.h"
 
 using namespace mongo;
+using namespace mongo::regression;
 
-// Utility class to handle per suite cleanup
-class Suite : public UnitTest::Suite {
-public:
-    ~Suite();
-};
-
-UnitTest::TestPtr basicTests();
-UnitTest::TestPtr btreeTests();
-UnitTest::TestPtr cursorTests();
-UnitTest::TestPtr jsTests();
-UnitTest::TestPtr jsobjTests();
-UnitTest::TestPtr jsonTests();
-UnitTest::TestPtr matcherTests();
-UnitTest::TestPtr namespaceTests();
-UnitTest::TestPtr pairingTests();
-UnitTest::TestPtr pdfileTests();
-UnitTest::TestPtr queryTests();
-UnitTest::TestPtr queryOptimizerTests();
-UnitTest::TestPtr replTests();
-UnitTest::TestPtr sockTests();
-UnitTest::TestPtr updateTests();