More tests.

Author: ColinH

include/tao/json/compare.hh

@@ -32,7 +32,7 @@ namespace tao
 
       inline bool operator== ( const value & l, const value & r )
       {
-         return ( & l == & r ) || ( ( l.type() == r.type() ) && internal::equal_value( l, r ) );
+         return ( l.type() == r.type() ) && internal::equal_value( l, r );
       }
 
       inline bool operator!= ( const value & l, const value & r )
@@ -45,9 +45,19 @@ namespace tao
          return l.is_null();
       }
 
-      inline bool operator== ( const std::nullptr_t t, const value & r )
+      inline bool operator== ( const std::nullptr_t, const value & r )
       {
-         return r == t;
+         return r.is_null();
+      }
+
+      inline bool operator!= ( const value & l, const std::nullptr_t )
+      {
+         return ! l.is_null();
+      }
+
+      inline bool operator!= ( const std::nullptr_t, const value & r )
+      {
+         return ! r.is_null();
       }
 
       inline bool operator== ( const value & l, const bool b )

include/tao/json/internal/compare.hh

@@ -31,7 +31,7 @@ namespace tao
                case type::OBJECT:
                   return l.unsafe_object() < r.unsafe_object();
             }
-            assert( false );
+            assert( false );  // LCOV_EXCL_LINE
          }
 
          inline bool equal_value( const value & l, const value & r )
@@ -52,7 +52,7 @@ namespace tao
                case type::OBJECT:
                   return l.unsafe_object() == r.unsafe_object();
             }
-            assert( false );
+            assert( false );  // LCOV_EXCL_LINE
          }
 
       } // internal

src/test/json/compare.cc

@@ -7,6 +7,70 @@ namespace tao
 {
    namespace json
    {
+      void test_null()
+      {
+         value a;
+         value b( nullptr );
+
+         TEST_ASSERT( a.type() == type::NULL_ );
+         TEST_ASSERT( b.type() == type::NULL_ );
+
+         TEST_ASSERT( a == b );
+         TEST_ASSERT( ! ( a != b ) );
+
+         TEST_ASSERT( a <= b );
+         TEST_ASSERT( a >= b );
+
+         TEST_ASSERT( ! ( a < b ) );
+         TEST_ASSERT( ! ( a > b ) );
+
+         TEST_ASSERT( a == nullptr );
+         TEST_ASSERT( nullptr == b );
+      }
+
+      void test_bool()
+      {
+         value t( true );
+         value f( false );
+
+         TEST_ASSERT( t.type() == type::BOOL_ );
+         TEST_ASSERT( f.type() == type::BOOL_ );
+
+         TEST_ASSERT( t == t );
+         TEST_ASSERT( f == f );
+         TEST_ASSERT( t == value( true ) );
+         TEST_ASSERT( f == value( false ) );
+         TEST_ASSERT( t != value( nullptr ) );
+         TEST_ASSERT( f != value( nullptr ) );
+         TEST_ASSERT( t != f );
+         TEST_ASSERT( f != t );
+         TEST_ASSERT( ! ( t != value( true ) ) );
+         TEST_ASSERT( ! ( f != value( false ) ) );
+         TEST_ASSERT( ! ( f == value( true ) ) );
+         TEST_ASSERT( ! ( t == value( false ) ) );
+
+         TEST_ASSERT( t <= t );
+         TEST_ASSERT( f <= f );
+         TEST_ASSERT( f <= t );
+         TEST_ASSERT( ! ( t <= f ) );
+         TEST_ASSERT( t >= t );
+         TEST_ASSERT( f >= f );
+         TEST_ASSERT( t >= f );
+         TEST_ASSERT( ! ( f >= t ) );
+
+         TEST_ASSERT( ! ( t < t ) );
+         TEST_ASSERT( ! ( f < f ) );
+         TEST_ASSERT( ! ( t > t ) );
+         TEST_ASSERT( ! ( f > f ) );
+         TEST_ASSERT( ! ( f > t ) );
+         TEST_ASSERT( ! ( t < f ) );
+         TEST_ASSERT( t > f );
+         TEST_ASSERT( f < t );
+
+         TEST_ASSERT( t == true );
+         TEST_ASSERT( false == f );
+      }
+
       void test_int64()
       {
          value a( 42 );
@@ -33,12 +97,46 @@ namespace tao
 
          TEST_ASSERT( a == 42 );
          TEST_ASSERT( 42 == a );
+
+         // TODO
+      }
+
+      void test_string()
+      {
+         value a( "a" );
+         value b( "b" );
+         value foo( "foo" );
+
+         TEST_ASSERT( a.type() == type::STRING );
+         TEST_ASSERT( foo.type() == type::STRING );
+
+         TEST_ASSERT( a == a );
+         TEST_ASSERT( foo == foo );
+         TEST_ASSERT( a <= a );
+         TEST_ASSERT( a <= b );
+         TEST_ASSERT( a < b );
+         TEST_ASSERT( a != b );
+         TEST_ASSERT( b > a );
+         TEST_ASSERT( b >= a );
+         TEST_ASSERT( foo >= foo );
+         TEST_ASSERT( ! ( a == b ) );
+         TEST_ASSERT( ! ( b != b ) );
+         TEST_ASSERT( ! ( a < a ) );
+         TEST_ASSERT( ! ( b > b ) );
+         TEST_ASSERT( ! ( b <= a ) );
+         TEST_ASSERT( ! ( a >= b ) );
+
+         TEST_ASSERT( a == "a" );
+         TEST_ASSERT( "foo" == foo );
       }
 
       void unit_test()
       {
+         test_null();
+         test_bool();
          test_int64();
-         // TODO...
+         test_string();
+         // TODO
       }
 
    } // json