Improve test coverage.

taocpp · Apr 2, 2024 · 2614b21 · 2614b21
1 parent a292fc5
commit 2614b21
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 76 deletions.
diff --git a/include/tao/config/internal/function_traits.hpp b/include/tao/config/internal/function_traits.hpp
@@ -92,19 +92,19 @@ namespace tao::config::internal
       }
    };
 
-   template<>
-   struct function_traits< std::vector< std::byte > >
-   {
-      [[nodiscard]] static std::vector< std::byte > get( array& f, const std::size_t i )
-      {
-         const entry& e = function_traits_entry( f, i );
-
-         if( e.is_binary() ) {
-            return e.get_binary();
-         }
-         throw pegtl::parse_error( "invalid type for binary argument", e.get_position() );
-      }
-   };
+   // template<>
+   // struct function_traits< std::vector< std::byte > >
+   // {
+   //    [[nodiscard]] static std::vector< std::byte > get( array& f, const std::size_t i )
+   //    {
+   //       const entry& e = function_traits_entry( f, i );
+
+   //       if( e.is_binary() ) {
+   //          return e.get_binary();
+   //       }
+   //       throw pegtl::parse_error( "invalid type for binary argument", e.get_position() );
+   //    }
+   // };
 
 }  // namespace tao::config::internal
 

diff --git a/include/tao/config/internal/phase3_remove.hpp b/include/tao/config/internal/phase3_remove.hpp
@@ -20,56 +20,6 @@ namespace tao::config::internal
    inline void phase3_remove( array& a );
    inline void phase3_remove( object& o );
 
-   [[nodiscard]] inline std::string phase3_partial_type( const entry& e )
-   {
-      switch( e.kind() ) {
-         case entry_kind::NULL_:
-            return "null";
-         case entry_kind::BOOLEAN:
-            return "boolean";
-         case entry_kind::STRING:
-            return "string";
-         case entry_kind::BINARY:
-            return "binary";
-         case entry_kind::SIGNED:
-            return "signed";
-         case entry_kind::UNSIGNED:
-            return "unsigned";
-         case entry_kind::DOUBLE:
-            return "double";
-         case entry_kind::ARRAY:
-            return "array";
-         case entry_kind::OBJECT:
-            return "object";
-         case entry_kind::ASTERISK:
-            throw std::logic_error( "code should be unreachable" );  // LCOV_EXCL_LINE
-         case entry_kind::REFERENCE:
-            throw std::logic_error( "code should be unreachable" );  // LCOV_EXCL_LINE
-      }
-      throw std::logic_error( "code should be unreachable" );  // LCOV_EXCL_LINE
-   }
-
-   [[nodiscard]] inline pegtl::position phase3_partial_position( const entry& e )
-   {
-      switch( e.kind() ) {
-         case entry_kind::NULL_:
-         case entry_kind::BOOLEAN:
-         case entry_kind::STRING:
-         case entry_kind::BINARY:
-         case entry_kind::SIGNED:
-         case entry_kind::UNSIGNED:
-         case entry_kind::DOUBLE:
-         case entry_kind::ARRAY:
-         case entry_kind::OBJECT:
-            return e.get_position();
-         case entry_kind::ASTERISK:
-            throw std::logic_error( "code should be unreachable" );  // LCOV_EXCL_LINE
-         case entry_kind::REFERENCE:
-            throw std::logic_error( "code should be unreachable" );  // LCOV_EXCL_LINE
-      }
-      throw std::logic_error( "code should be unreachable" );  // LCOV_EXCL_LINE
-   }
-
    inline void phase3_remove( concat& c )
    {
       for( auto& e : c.concat ) {
@@ -100,11 +50,11 @@ namespace tao::config::internal
       }
       if( c.concat.size() > 1 ) {
          auto i = c.concat.begin();
-         const auto lt = phase3_partial_type( *i );
-         const auto lp = phase3_partial_position( *i );
+         const auto lt = to_string( i->kind() );
+         const auto& lp = i->get_position();
          ++i;
-         const auto rt = phase3_partial_type( *i );
-         const auto rp = phase3_partial_position( *i );
+         const auto rt = to_string( i->kind() );
+         const auto& rp = i->get_position();
          throw pegtl::parse_error( strcat( "incompatible types ", lt, "@", lp, " and ", rt, "@", rp ), c.position );
       }
    }

diff --git a/src/test/config/failure.cpp b/src/test/config/failure.cpp
@@ -35,9 +35,6 @@ namespace tao
       catch( const pegtl::parse_error_base& e ) {
          std::cout << ansi_text << "pegtl::parse_error: " << ansi_message << e.message() << ": " << ansi_source << e.position_string() << ansi_reset << std::endl;
       }
-      catch( const std::exception& e ) {
-         std::cout << "std::exception: " << e.what() << std::endl;
-      }
    }
 
 }  // namespace tao

diff --git a/src/test/config/success.cpp b/src/test/config/success.cpp
@@ -103,14 +103,10 @@ namespace tao::config
          std::cerr << "Testcase '" << path << "' failed with exception '" << e.what() << "'" << std::endl;
          ++failed;
       }
-      catch( const std::string& s ) {
-         std::cerr << "Testcase '" << path << "' failed with error '" << s << "'" << std::endl;
-         ++failed;
-      }
       // LCOV_EXCL_STOP
    }
 
-}  // namespace tao
+}  // namespace tao::config
 
 int main()
 {

diff --git a/src/test/config/to_stream.cpp b/src/test/config/to_stream.cpp
@@ -28,7 +28,8 @@ namespace tao::config
             ++failed;
             // LCOV_EXCL_STOP
          }
-      } {
+      }
+      {
          std::ostringstream oss;
          tao::config::to_stream( oss, parsed, 3 );
          const std::string string2 = oss.str();

diff --git a/tests/jaxn.jaxn b/tests/jaxn.jaxn
@@ -0,0 +1,18 @@
+{
+   foo: [
+      null,
+      true,
+      false,
+      42,
+      $FF,
+      "foo",
+      {
+         a: null,
+         b: true,
+         c: false,
+         d: 42,
+         e: $FF,
+         f: "foo"
+      }
+   ]
+}
diff --git a/tests/jaxn.success b/tests/jaxn.success
@@ -0,0 +1 @@
+foo = (jaxn "[ null, true, false, 42, $ff, 'foo', { a: null, b: true, c: false, d: 42, e: $ff, f: 'foo' } ]")
diff --git a/tests/string_01.failure b/tests/string_01.failure
@@ -0,0 +1 @@
+foo = (split 42)
diff --git a/tests/string_02.failure b/tests/string_02.failure
@@ -0,0 +1 @@
+foo = (env $ff)