summaryrefslogtreecommitdiff
path: root/src/mongo/db/jsobj.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/jsobj.cpp')
-rw-r--r--src/mongo/db/jsobj.cpp82
1 files changed, 40 insertions, 42 deletions
diff --git a/src/mongo/db/jsobj.cpp b/src/mongo/db/jsobj.cpp
index f418f5d034c..627d346445e 100644
--- a/src/mongo/db/jsobj.cpp
+++ b/src/mongo/db/jsobj.cpp
@@ -34,8 +34,6 @@
#include "jsobjmanipulator.h"
#include "../util/optime.h"
#include <boost/static_assert.hpp>
-#undef assert
-#define assert MONGO_assert
// make sure our assumptions are valid
BOOST_STATIC_ASSERT( sizeof(short) == 2 );
@@ -372,7 +370,7 @@ namespace mongo {
}
log() << "compareDottedFieldNames ERROR l: " << l << " r: " << r << " TOO MANY LOOPS" << endl;
- assert(0);
+ verify(0);
return SAME; // will never get here
}
@@ -732,7 +730,7 @@ namespace mongo {
returns n added not counting _id unless requested.
*/
int BSONObj::addFields(BSONObj& from, set<string>& fields) {
- assert( isEmpty() && !isOwned() ); /* partial implementation for now... */
+ verify( isEmpty() && !isOwned() ); /* partial implementation for now... */
BSONObjBuilder b;
@@ -952,8 +950,8 @@ namespace mongo {
c.appendRegex("x", "goo");
BSONObj p = c.done();
- assert( !o.binaryEqual( p ) );
- assert( o.woCompare( p ) < 0 );
+ verify( !o.binaryEqual( p ) );
+ verify( o.woCompare( p ) < 0 );
}
void testoid() {
@@ -964,10 +962,10 @@ namespace mongo {
OID b;
// goes with sleep above...
// b.init();
- // assert( memcmp(id.getData(), b.getData(), 12) < 0 );
+ // verify( memcmp(id.getData(), b.getData(), 12) < 0 );
b.init( id.str() );
- assert( b == id );
+ verify( b == id );
}
void testbounds() {
@@ -982,15 +980,15 @@ namespace mongo {
b.append( "x" , numeric_limits<double>::max() );
r = b.obj();
}
- assert( l.woCompare( r ) < 0 );
- assert( r.woCompare( l ) > 0 );
+ verify( l.woCompare( r ) < 0 );
+ verify( r.woCompare( l ) > 0 );
{
BSONObjBuilder b;
b.append( "x" , numeric_limits<int>::max() );
l = b.obj();
}
- assert( l.woCompare( r ) < 0 );
- assert( r.woCompare( l ) > 0 );
+ verify( l.woCompare( r ) < 0 );
+ verify( r.woCompare( l ) > 0 );
}
void testorder() {
@@ -999,12 +997,12 @@ namespace mongo {
{ BSONObjBuilder b; b.append( "x" , (long long)2 ); x = b.obj(); }
{ BSONObjBuilder b; b.append( "x" , (int)3 ); y = b.obj(); }
{ BSONObjBuilder b; b.append( "x" , (long long)4 ); z = b.obj(); }
- assert( x.woCompare( y ) < 0 );
- assert( x.woCompare( z ) < 0 );
- assert( y.woCompare( x ) > 0 );
- assert( z.woCompare( x ) > 0 );
- assert( y.woCompare( z ) < 0 );
- assert( z.woCompare( y ) > 0 );
+ verify( x.woCompare( y ) < 0 );
+ verify( x.woCompare( z ) < 0 );
+ verify( y.woCompare( x ) > 0 );
+ verify( z.woCompare( x ) > 0 );
+ verify( y.woCompare( z ) < 0 );
+ verify( z.woCompare( y ) > 0 );
}
{
@@ -1015,36 +1013,36 @@ namespace mongo {
{ BSONObjBuilder b; b.appendNull( "x" ); n = b.obj(); }
{ BSONObjBuilder b; u = b.obj(); }
- assert( ll.woCompare( u ) == d.woCompare( u ) );
- assert( ll.woCompare( u ) == i.woCompare( u ) );
+ verify( ll.woCompare( u ) == d.woCompare( u ) );
+ verify( ll.woCompare( u ) == i.woCompare( u ) );
BSONObj k = BSON( "x" << 1 );
- assert( ll.woCompare( u , k ) == d.woCompare( u , k ) );
- assert( ll.woCompare( u , k ) == i.woCompare( u , k ) );
+ verify( ll.woCompare( u , k ) == d.woCompare( u , k ) );
+ verify( ll.woCompare( u , k ) == i.woCompare( u , k ) );
- assert( u.woCompare( ll ) == u.woCompare( d ) );
- assert( u.woCompare( ll ) == u.woCompare( i ) );
- assert( u.woCompare( ll , k ) == u.woCompare( d , k ) );
- assert( u.woCompare( ll , k ) == u.woCompare( d , k ) );
+ verify( u.woCompare( ll ) == u.woCompare( d ) );
+ verify( u.woCompare( ll ) == u.woCompare( i ) );
+ verify( u.woCompare( ll , k ) == u.woCompare( d , k ) );
+ verify( u.woCompare( ll , k ) == u.woCompare( d , k ) );
- assert( i.woCompare( n ) == d.woCompare( n ) );
+ verify( i.woCompare( n ) == d.woCompare( n ) );
- assert( ll.woCompare( n ) == d.woCompare( n ) );
- assert( ll.woCompare( n ) == i.woCompare( n ) );
- assert( ll.woCompare( n , k ) == d.woCompare( n , k ) );
- assert( ll.woCompare( n , k ) == i.woCompare( n , k ) );
+ verify( ll.woCompare( n ) == d.woCompare( n ) );
+ verify( ll.woCompare( n ) == i.woCompare( n ) );
+ verify( ll.woCompare( n , k ) == d.woCompare( n , k ) );
+ verify( ll.woCompare( n , k ) == i.woCompare( n , k ) );
- assert( n.woCompare( ll ) == n.woCompare( d ) );
- assert( n.woCompare( ll ) == n.woCompare( i ) );
- assert( n.woCompare( ll , k ) == n.woCompare( d , k ) );
- assert( n.woCompare( ll , k ) == n.woCompare( d , k ) );
+ verify( n.woCompare( ll ) == n.woCompare( d ) );
+ verify( n.woCompare( ll ) == n.woCompare( i ) );
+ verify( n.woCompare( ll , k ) == n.woCompare( d , k ) );
+ verify( n.woCompare( ll , k ) == n.woCompare( d , k ) );
}
{
BSONObj l,r;
{ BSONObjBuilder b; b.append( "x" , "eliot" ); l = b.obj(); }
{ BSONObjBuilder b; b.appendSymbol( "x" , "eliot" ); r = b.obj(); }
- assert( l.woCompare( r ) == 0 );
- assert( r.woCompare( l ) == 0 );
+ verify( l.woCompare( r ) == 0 );
+ verify( r.woCompare( l ) == 0 );
}
}
@@ -1057,11 +1055,11 @@ namespace mongo {
BSONObj a = A.done();
BSONObj b = B.done();
BSONObj c = C.done();
- assert( !a.binaryEqual( b ) ); // comments on operator==
+ verify( !a.binaryEqual( b ) ); // comments on operator==
int cmp = a.woCompare(b);
- assert( cmp == 0 );
+ verify( cmp == 0 );
cmp = a.woCompare(c);
- assert( cmp < 0 );
+ verify( cmp < 0 );
testoid();
testbounds();
testorder();
@@ -1226,9 +1224,9 @@ namespace mongo {
BSONObjIterator i( o );
while ( i.more() ) {
_fields[x++] = i.next().rawdata();
- assert( _fields[x-1] );
+ verify( _fields[x-1] );
}
- assert( x == _nfields );
+ verify( x == _nfields );
std::sort( _fields , _fields + _nfields , cmp );
_cur = 0;
}
View Lorry Controller Status