diff --git a/tests/test_wellsmanager.cpp b/tests/test_wellsmanager.cpp index 70cc0c23..9a380fe0 100644 --- a/tests/test_wellsmanager.cpp +++ b/tests/test_wellsmanager.cpp @@ -176,14 +176,7 @@ void check_controls_epoch1( struct WellControls ** ctrls) { void check_controls_epoch3( struct WellControls ** ctrls) { // The new producer const struct WellControls * ctrls1 = ctrls[1]; - const struct WellControls * ctrls2 = ctrls[2]; - - - BOOST_CHECK_EQUAL( 0 , well_controls_get_num(ctrls1)); - BOOST_CHECK( well_controls_well_is_shut( ctrls1)); - - BOOST_CHECK_EQUAL( 0 , well_controls_get_num(ctrls2)); - BOOST_CHECK( well_controls_well_is_shut(ctrls2)); + BOOST_CHECK_EQUAL( 5 , well_controls_get_num(ctrls1)); } @@ -215,10 +208,12 @@ BOOST_AUTO_TEST_CASE(New_Constructor_Works) { Opm::WellsManager wellsManager(eclipseState, 3, *gridManager.c_grid(), NULL); const Wells* wells = wellsManager.c_wells(); - BOOST_CHECK_EQUAL(3 , wells->number_of_wells); + // There is 3 wells in total in the deck at the 3rd schedule step. + // PROD1 is shut and should therefore not be counted. + // The new well is therefore the secound well. + BOOST_CHECK_EQUAL(2 , wells->number_of_wells); BOOST_CHECK_EQUAL( wells->name[0] , "INJ1"); - BOOST_CHECK_EQUAL( wells->name[1] , "PROD1"); - BOOST_CHECK_EQUAL( wells->name[2] , "NEW"); + BOOST_CHECK_EQUAL( wells->name[1] , "NEW"); check_controls_epoch3( wellsManager.c_wells()->ctrls ); } diff --git a/tests/wells_manager_data.data b/tests/wells_manager_data.data index 320d6e99..1c10c4ef 100755 --- a/tests/wells_manager_data.data +++ b/tests/wells_manager_data.data @@ -83,23 +83,5 @@ WCONHIST 'NEW' 'OPEN' 'ORAT' 0.000 0.000 0.000 5* / / - - -WCONPROD - 'NEW' 'SHUT' / -/ - - - - - -WCONPROD - 'PROD1' 'SHUT' / -/ - - - - - END