diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index eb68fc2c..40b67541 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -3,7 +3,7 @@ include( FetchContent ) FetchContent_Declare( tools GIT_REPOSITORY ../../njoy/tools - GIT_TAG e0eb6b4f3e6d7afce7c2c521e68b4f223c50fe2d # tag: v0.4.0 + GIT_TAG 662232049b7230da645d741dad413c5f1a5b3ab1 # NOT A RELEASED VERSION - CHANGE ME! ) ####################################################################### diff --git a/src/ENDFtk/tree/File/test/File.test.cpp b/src/ENDFtk/tree/File/test/File.test.cpp index 4621364a..5189b871 100755 --- a/src/ENDFtk/tree/File/test/File.test.cpp +++ b/src/ENDFtk/tree/File/test/File.test.cpp @@ -488,22 +488,7 @@ SCENARIO( "tree::File" ) { GIVEN( "invalid data for a tree::File" ) { - WHEN( "the data is read from a string/stream with an invalid FEND" ) { - - std::string fileString = chunk() + invalidFEND(); - auto position = fileString.begin(); - auto start = fileString.begin(); - auto end = fileString.end(); - long lineNumber = 1; - HeadRecord head( position, end, lineNumber ); - - THEN( "an exception is thrown upon construction" ) { - - CHECK_THROWS( tree::File( head, start, position, end, lineNumber ) ); - } // THEN - } // WHEN - - WHEN( "the data is read from a string/stream without a SEND" ) { + WHEN( "the data is read from a string/stream that abruptly ends (no END record)" ) { std::string fileString = chunk(); auto position = fileString.begin(); @@ -697,7 +682,3 @@ std::string validSEND(){ std::string validFEND(){ return " 125 0 0 \n"; } - -std::string invalidFEND(){ - return " 125 3 0 \n"; -} diff --git a/src/ENDFtk/tree/Material/test/Material.test.cpp b/src/ENDFtk/tree/Material/test/Material.test.cpp index 8ca869b1..71bb34ac 100644 --- a/src/ENDFtk/tree/Material/test/Material.test.cpp +++ b/src/ENDFtk/tree/Material/test/Material.test.cpp @@ -800,22 +800,7 @@ SCENARIO( "tree::Material" ) { GIVEN( "invalid data for a tree::File" ) { - WHEN( "the data is read from a string/stream with an invalid MEND" ) { - - std::string materialString = chunk() + invalidMEND(); - auto position = materialString.begin(); - auto start = materialString.begin(); - auto end = materialString.end(); - long lineNumber = 1; - HeadRecord head( position, end, lineNumber ); - - THEN( "an exception is thrown upon construction" ) { - - CHECK_THROWS( tree::Material( head, start, position, end, lineNumber ) ); - } // THEN - } // WHEN - - WHEN( "the data is read from a string/stream without a MEND" ) { + WHEN( "the data is read from a string/stream that abruptly ends (no END record)" ) { std::string materialString = chunk(); auto position = materialString.begin(); @@ -985,7 +970,3 @@ std::string validFEND(){ std::string validMEND(){ return " 0 0 0 \n"; } - -std::string invalidMEND(){ - return " 2 0 0 \n"; -}