From e7a6ae5068372743dd3f8cecac4587363dbbddd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= Date: Tue, 26 Apr 2016 12:22:22 +0200 Subject: [PATCH] RAII cleanup of test files; WRITE removed The WRITE test was a mere convenience to create and inspect a summary file, but this should instead be moved to applications or examples, and out of tests. The helper class setup now has a destructor that will automatically attempt to clean up the files produced by ert. --- tests/test_Summary.cpp | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/tests/test_Summary.cpp b/tests/test_Summary.cpp index 1a5f85aea..62a7df11d 100644 --- a/tests/test_Summary.cpp +++ b/tests/test_Summary.cpp @@ -95,11 +95,6 @@ ERT::ert_unique_ptr< ecl_sum_type, ecl_sum_free > readsum( const std::string& ba ); } -void rmfiles( const std::string& basename ) { - std::remove( ( basename + ".UNSMRY" ).c_str() ); - std::remove( ( basename + ".SMSPEC" ).c_str() ); -} - struct setup { std::shared_ptr< Deck > deck; EclipseState es; @@ -114,6 +109,11 @@ struct setup { wells( result_wells() ), name( fname ) {} + + ~setup() { + std::remove( ( name + ".UNSMRY" ).c_str() ); + std::remove( ( name + ".SMSPEC" ).c_str() ); + } }; /* @@ -140,7 +140,6 @@ BOOST_AUTO_TEST_CASE(W_WOG_PR) { BOOST_CHECK_CLOSE( 10.2, ecl_sum_get_well_var( resp, 0, "W_1", "WGPR" ), 1e-5 ); BOOST_CHECK_CLOSE( 20.2, ecl_sum_get_well_var( resp, 0, "W_2", "WGPR" ), 1e-5 ); BOOST_CHECK_CLOSE( 30.2, ecl_sum_get_well_var( resp, 0, "W_3", "WGPR" ), 1e-5 ); - rmfiles( cfg.name ); } BOOST_AUTO_TEST_CASE(W_WOG_PT) { @@ -176,7 +175,6 @@ BOOST_AUTO_TEST_CASE(W_WOG_PT) { BOOST_CHECK_CLOSE( 2 * 10.2 / day, ecl_sum_get_well_var( resp, 1, "W_1", "WGPT" ), 1e-5 ); BOOST_CHECK_CLOSE( 2 * 20.2 / day, ecl_sum_get_well_var( resp, 1, "W_2", "WGPT" ), 1e-5 ); BOOST_CHECK_CLOSE( 2 * 30.2 / day, ecl_sum_get_well_var( resp, 1, "W_3", "WGPT" ), 1e-5 ); - rmfiles( cfg.name ); } BOOST_AUTO_TEST_CASE(WWCT) { @@ -196,7 +194,6 @@ BOOST_AUTO_TEST_CASE(WWCT) { BOOST_CHECK_CLOSE( wcut1, ecl_sum_get_well_var( resp, 0, "W_1", "WWCT" ), 1e-5 ); BOOST_CHECK_CLOSE( wcut2, ecl_sum_get_well_var( resp, 0, "W_2", "WWCT" ), 1e-5 ); BOOST_CHECK_CLOSE( wcut3, ecl_sum_get_well_var( resp, 0, "W_3", "WWCT" ), 1e-5 ); - rmfiles( cfg.name ); } BOOST_AUTO_TEST_CASE(WGOR) { @@ -216,7 +213,6 @@ BOOST_AUTO_TEST_CASE(WGOR) { BOOST_CHECK_CLOSE( wgor1, ecl_sum_get_well_var( resp, 0, "W_1", "WGOR" ), 1e-5 ); BOOST_CHECK_CLOSE( wgor2, ecl_sum_get_well_var( resp, 0, "W_2", "WGOR" ), 1e-5 ); BOOST_CHECK_CLOSE( wgor3, ecl_sum_get_well_var( resp, 0, "W_3", "WGOR" ), 1e-5 ); - rmfiles( cfg.name ); } BOOST_AUTO_TEST_CASE(WBHP) { @@ -232,7 +228,6 @@ BOOST_AUTO_TEST_CASE(WBHP) { BOOST_CHECK_CLOSE( 0.1, ecl_sum_get_well_var( resp, 0, "W_1", "WBHP" ), 1e-5 ); BOOST_CHECK_CLOSE( 1.1, ecl_sum_get_well_var( resp, 0, "W_2", "WBHP" ), 1e-5 ); BOOST_CHECK_CLOSE( 2.1, ecl_sum_get_well_var( resp, 0, "W_3", "WBHP" ), 1e-5 ); - rmfiles( cfg.name ); } BOOST_AUTO_TEST_CASE(WTHP) { @@ -248,7 +243,6 @@ BOOST_AUTO_TEST_CASE(WTHP) { BOOST_CHECK_CLOSE( 0.2, ecl_sum_get_well_var( resp, 0, "W_1", "WTHP" ), 1e-5 ); BOOST_CHECK_CLOSE( 1.2, ecl_sum_get_well_var( resp, 0, "W_2", "WTHP" ), 1e-5 ); BOOST_CHECK_CLOSE( 2.2, ecl_sum_get_well_var( resp, 0, "W_3", "WTHP" ), 1e-5 ); - rmfiles( cfg.name ); } BOOST_AUTO_TEST_CASE(WLP_R_T) { @@ -276,8 +270,6 @@ BOOST_AUTO_TEST_CASE(WLP_R_T) { BOOST_CHECK_CLOSE( (30.0 + 30.1) / day, ecl_sum_get_well_var( resp, 0, "W_3", "WLPT" ), 1e-5 ); BOOST_CHECK_CLOSE( (30.0 + 30.1), ecl_sum_get_well_var( resp, 1, "W_3", "WLPR" ), 1e-5 ); BOOST_CHECK_CLOSE( 2 * (30.0 + 30.1) / day, ecl_sum_get_well_var( resp, 1, "W_3", "WLPT" ), 1e-5 ); - - rmfiles( cfg.name ); } BOOST_AUTO_TEST_CASE(W_WOG_PRH) { @@ -298,8 +290,6 @@ BOOST_AUTO_TEST_CASE(W_WOG_PRH) { BOOST_CHECK_CLOSE( 10.2, ecl_sum_get_well_var( resp, 0, "W_1", "WGPRH" ), 1e-5 ); BOOST_CHECK_CLOSE( 20.2, ecl_sum_get_well_var( resp, 0, "W_2", "WGPRH" ), 1e-5 ); - - rmfiles( cfg.name ); } BOOST_AUTO_TEST_CASE(W_WOG_PTH) { @@ -320,7 +310,6 @@ BOOST_AUTO_TEST_CASE(W_WOG_PTH) { BOOST_CHECK_CLOSE( 2 * 10.2 / day, ecl_sum_get_well_var( resp, 1, "W_1", "WGPTH" ), 1e-5 ); BOOST_CHECK_CLOSE( 2 * 20.2 / day, ecl_sum_get_well_var( resp, 1, "W_2", "WGPTH" ), 1e-5 ); - rmfiles( cfg.name ); } BOOST_AUTO_TEST_CASE(Time) { @@ -344,15 +333,3 @@ BOOST_AUTO_TEST_CASE(Time) { BOOST_CHECK_EQUAL( ecl_sum_iget_sim_days( resp, 2 ), 20 ); BOOST_CHECK_EQUAL( ecl_sum_get_sim_length( resp ), 20 ); } - -BOOST_AUTO_TEST_CASE(WRITE) { - const auto deck = Parser().parseFile( path, ParseContext() ); - EclipseState es( deck, ParseContext() ); - SummaryConfig config( *deck, es ); - const auto wells = result_wells(); - - out::Summary writer( es, config ); - writer.add_timestep( 1, 1, es, wells ); - writer.add_timestep( 1, 1, es, wells ); - writer.write(); -}