more updates

src/tools/disco/Character/test/Character.test.cpp

@@ -34,7 +34,7 @@ SCENARIO( "Character" ) {
     end = string.end();
     CHECK( "ab  " == Character< 4 >::read< std::string >( begin, end ) );
     CHECK( begin == end - 1 );
-  }
+  } // THEN
 
   THEN( "strings can be written" ) {
 
@@ -65,5 +65,5 @@ SCENARIO( "Character" ) {
     iter = std::back_inserter( buffer );
     Character< 4 >::write( string, iter );
     CHECK( "    " == buffer );
-  }
+  } // THEN
 } // SCENARIO

src/tools/disco/Column/test/Column.test.cpp

@@ -40,7 +40,7 @@ SCENARIO( "Column" ) {
     CHECK( begin == end - 2 );
     Column< 3 >::read( begin, end );
     CHECK( begin == end - 1 );
-  }
+  } // THEN
 
   THEN( "columns can be written" ) {
 
@@ -56,5 +56,5 @@ SCENARIO( "Column" ) {
     iter = std::back_inserter( buffer );
     Column< 1 >::write( iter );
     CHECK( " " == buffer );
-  }
+  } // THEN
 } // SCENARIO

src/tools/disco/ENDF/test/CMakeLists.txt

@@ -0,0 +1 @@
+add_cpp_test( disco.ENDF ENDF.test.cpp )

src/tools/disco/ENDF/test/ENDF.test.cpp

@@ -0,0 +1,125 @@
+// include Catch2
+#include <catch2/catch_test_macros.hpp>
+
+// what we are testing
+#include "tools/disco/Scientific.hpp"
+
+// other includes
+
+// convenience typedefs
+using namespace njoy::tools::disco;
+
+SCENARIO( "Scientific" ) {
+
+  THEN( "values can be written" ) {
+
+    double value;
+    std::string buffer;
+    auto iter = std::back_inserter( buffer );
+
+    value = 0;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( " 0.00000E+00" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = 2;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( " 2.00000E+00" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = 10;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( " 1.00000E+01" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = 3.14159265359;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( " 3.14159E+00" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = 0.69314718056;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( " 6.93147E-01" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = 1e-100;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( "1.00000E-100" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = 1e+100;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( "1.00000E+100" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = -2;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( "-2.00000E+00" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = -10;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( "-1.00000E+01" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = -3.14159265359;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( "-3.14159E+00" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = -0.69314718056;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( "-6.93147E-01" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = -1e-100;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( "-1.0000E-100" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = -1e+100;
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( "-1.0000E+100" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = std::numeric_limits< double >::max();
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( "         Inf" == buffer );
+    CHECK( 12 == buffer.size() );
+
+    value = -std::numeric_limits< double >::max();
+    buffer = "";
+    iter = std::back_inserter( buffer );
+    Scientific< 12, 5 >::write( value, iter );
+    CHECK( "        -Inf" == buffer );
+    CHECK( 12 == buffer.size() );
+  } // THEN
+} // SCENARIO

src/tools/disco/FixedPoint/test/FixedPoint.test.cpp

@@ -107,5 +107,5 @@ SCENARIO( "FixedPoint" ) {
     FixedPoint< 12, 5 >::write( value, iter );
     CHECK( "        -Inf" == buffer );
     CHECK( 12 == buffer.size() );
-  }
+  } // THEN
 } // SCENARIO

src/tools/disco/Record/test/Record.test.cpp

@@ -52,8 +52,8 @@ SCENARIO( "Record" ) {
       CHECK(      2 == std::get<1>(tuple) );
       CHECK( "abcd" == std::get<2>(tuple) );
       CHECK( iter == end );
-    }
-  }
+    } // THEN
+  } // GIVEN
 
   GIVEN( "a line of data" ) {
 
@@ -76,9 +76,9 @@ SCENARIO( "Record" ) {
         CHECK( 1e-11 == value1 );
         CHECK( 1e-10 == value2 );
         CHECK( iter == end );
-      }
-    }
-  }
+      } // THEN
+    } // WHEN
+  } // GIVEN
 
   GIVEN( "data" ) {
 
@@ -96,7 +96,7 @@ SCENARIO( "Record" ) {
                 Integer< 4 >,
                 Character< 5 > >::write( iter, f, i, s );
         CHECK( " 2.0000E+00   4  abc\n" == buffer );
-      }
-    }
-  }
+      } // THEN
+    } // WHEN
+  } // GIVEN
 } // SCENARIO

src/tools/disco/Scientific/test/Scientific.test.cpp

@@ -121,5 +121,5 @@ SCENARIO( "Scientific" ) {
     Scientific< 12, 5 >::write( value, iter );
     CHECK( "        -Inf" == buffer );
     CHECK( 12 == buffer.size() );
-  }
+  } // THEN
 } // SCENARIO