More tests.

Author: ColinH

include/tao/json/internal/value_action.hh

@@ -73,8 +73,8 @@ namespace tao
          {
             static void apply( const tao_json_pegtl::input & in, number_state & result )
             {
-               if ( in.size() >= ( 1 << 30 ) ) {
-                  throw tao_json_pegtl::parse_error( "json number with 1 gigabyte digits", in );
+               if ( in.size() > ( 1 << 20 ) ) {
+                  throw tao_json_pegtl::parse_error( "json number with 1 megabyte digits", in );
                }
                const auto c = std::min( in.size(), max_mantissa_digits );
                std::memcpy( result.mantissa + 1, in.begin(), c );

src/test/json/compare.cc

@@ -71,11 +71,12 @@ namespace tao
          TEST_ASSERT( false == f );
       }
 
-      void test_int64()
+      template< typename N >
+      void test_number()
       {
-         value a( 42 );
-         value b( 43 );
-         value c( 43 );
+         value a( N( 42 ) );
+         value b( N( 43 ) );
+         value c( N( 43 ) );
 
          TEST_ASSERT( a < b );
          TEST_ASSERT( c > a );
@@ -95,8 +96,8 @@ namespace tao
          TEST_ASSERT( ! ( b <= a ) );
          TEST_ASSERT( ! ( a >= b ) );
 
-         TEST_ASSERT( a == 42 );
-         TEST_ASSERT( 42 == a );
+         TEST_ASSERT( a == N( 42 ) );
+         TEST_ASSERT( N( 42 ) == a );
 
          // TODO
       }
@@ -130,13 +131,38 @@ namespace tao
          TEST_ASSERT( "foo" == foo );
       }
 
+      void test_array()
+      {
+         value a = from_string( "[ 1, 2 ]" );
+         value b = from_string( "[ 1, 3 ]" );
+
+         TEST_ASSERT( a.type() == type::ARRAY );
+         TEST_ASSERT( b.type() == type::ARRAY );
+
+         TEST_ASSERT( a == a );
+         TEST_ASSERT( a != b );
+         TEST_ASSERT( a <= a );
+         TEST_ASSERT( a <= b );
+         TEST_ASSERT( a >= a );
+         TEST_ASSERT( b >= a );
+         TEST_ASSERT( a < b );
+         TEST_ASSERT( b > a );
+         TEST_ASSERT( ! ( a == b ) );
+         TEST_ASSERT( ! ( a != a ) );
+         TEST_ASSERT( ! ( a < a ) );
+         TEST_ASSERT( ! ( b < a ) );
+         TEST_ASSERT( ! ( a > a ) );
+         TEST_ASSERT( ! ( a > b ) );
+      }
+
       void unit_test()
       {
          test_null();
          test_bool();
-         test_int64();
+         test_number< int64_t >();
+         test_number< double >();
          test_string();
-         // TODO
+         test_array();
       }
 
    } // json

src/test/json/double.cc

@@ -127,7 +127,10 @@ namespace tao
                       "7567186443383770486037861622771738545623065874679014086723327636718751234567890123456789012345678901"
                       "e-308", 2.2250738585072014e-308 );
 
+         test_double( "30e001", 300.0 );
+
          TEST_THROWS( from_string( "1.0e1234567890" ) );
+         TEST_THROWS( from_string( std::string( 1048577, '1' ) ) );
       }
 
    } // json

src/test/json/parse.cc

@@ -7,6 +7,16 @@ namespace tao
 {
    namespace json
    {
+      void test_string()
+      {
+         TEST_ASSERT( from_string( "\"\"" ) == value( "" ) );
+
+         TEST_THROWS( from_string( "\"" ) );
+         TEST_THROWS( from_string( "\"\r\n\"" ) );
+
+         // TODO...
+      }
+
       void test_array()
       {
          const auto v = from_string( "[ null, true, false, 42, 43.0, \"foo\", [ 1, 2, 3 ], { \"a\" : \"b\", \"c\" : \"d\" } ]" );
@@ -68,7 +78,6 @@ namespace tao
          TEST_ASSERT( from_string( "false" ) == value( false ) );
 
          // TODO: test_int64()
-         // TODO: test_string()
          test_array();
          test_object();
       }