diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4443382b54..ba8f0624d8 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -448,7 +448,6 @@ ngen_add_test( utils/include/StreamOutputTest.cpp realizations/Formulation_Manager_Test.cpp utils/Partition_Test.cpp - utils/Partition_One_Test.cpp utils/mdarray_Test.cpp utils/mdframe_Test.cpp utils/mdframe_netcdf_Test.cpp @@ -461,16 +460,12 @@ ngen_add_test( NGen::core_mediator NGen::forcing NGen::geojson - NGen::geopackage NGen::realizations_catchment NGen::mdarray NGen::mdframe NGen::logging NGen::ngen_bmi testbmicppmodel - REQUIRES - NGEN_WITH_SQLITE - ) # Discover for test_all diff --git a/test/utils/Partition_One_Test.cpp b/test/utils/Partition_One_Test.cpp index bc33db4201..3125b885f5 100644 --- a/test/utils/Partition_One_Test.cpp +++ b/test/utils/Partition_One_Test.cpp @@ -120,13 +120,14 @@ TEST_F(PartitionOneTest, TestPartitionData_1a) std::set duplicates; //use set difference to identify all duplicates std::set_difference(cat_id_vec.begin(), cat_id_vec.end(), unique.begin(), unique.end(), std::inserter(duplicates, duplicates.end())); - if( duplicates.size() > 0 ){ - for( auto& id: duplicates){ + + for( auto& id: duplicates){ + if (!id.empty()) { + std::cout << "duplicates string set is not empty" << std::endl; + break; } - exit(1); } - - ASSERT_TRUE(true); + ASSERT_EQ(duplicates.size(), 0); } TEST_F(PartitionOneTest, TestPartitionData_1b) @@ -151,12 +152,14 @@ TEST_F(PartitionOneTest, TestPartitionData_1b) std::set duplicates; //use set difference to identify all duplicates std::set_difference(nex_id_vec.begin(), nex_id_vec.end(), unique.begin(), unique.end(), std::inserter(duplicates, duplicates.end())); - if( duplicates.size() > 0 ){ - for( auto& id: duplicates){ + + for( auto& id: duplicates){ + if (!id.empty()) { + std::cout << "duplicates string set is not empty" << std::endl; + break; } - exit(1); } - ASSERT_TRUE(true); + ASSERT_EQ(duplicates.size(), 0); } #undef NGEN_MPI_ACTIVE