@@ -134,16 +134,17 @@ BOOST_AUTO_TEST_CASE(processes_from_stdin_to_output_file) {
134134 BOOST_CHECK_EQUAL ( output_ss.str (), " " );
135135 istringstream expected_out_ss{ example_output };
136136 BOOST_CHECK_ISTREAM_AND_FILE_EQUAL ( expected_out_ss, " expected_crh_output" , TEMP_TEST_FILE_FILENAME );
137+ // BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( expected_out_ss, "expected_crh_output", TEMP_TEST_FILE_FILENAME );
137138}
138139
139140BOOST_AUTO_TEST_CASE (does_not_require_right_intersperses_all_to_cache) {
140141 // Given an input that requires caching at the start of match_b whilst processing in match_a and match_c
141142 // even though match_b doesn't right intersperse match_c
142- const string hits_str =
143+ const string input_hits_str =
143144 " query match_c 1 0-9,60-69\n "
144145 " query match_a 1 10-19,40-49\n "
145146 " query match_b 1 30-39,50-59\n " ;
146- input_ss.str ( hits_str );
147+ input_ss.str ( input_hits_str );
147148
148149 // When calling perform_resolve_hits on that data with no trimming
149150 execute_perform_resolve_hits ( {
@@ -153,7 +154,12 @@ BOOST_AUTO_TEST_CASE(does_not_require_right_intersperses_all_to_cache) {
153154 } );
154155
155156 // Then expect the output to be the same as the input
156- BOOST_CHECK_EQUAL ( output_ss.str (), hits_str );
157+ // (but with repeat of the boundaries for the resolved version)
158+ const string output_hits_str =
159+ " query match_c 1 0-9,60-69 0-9,60-69\n "
160+ " query match_a 1 10-19,40-49 10-19,40-49\n "
161+ " query match_b 1 30-39,50-59 30-39,50-59\n " ;
162+ BOOST_CHECK_EQUAL ( output_ss.str (), output_hits_str );
157163}
158164
159165BOOST_AUTO_TEST_CASE (file_domtbl) {
@@ -162,6 +168,7 @@ BOOST_AUTO_TEST_CASE(file_domtbl) {
162168 } );
163169 istringstream istream_of_output{ output_ss.str () };
164170 BOOST_CHECK_ISTREAM_AND_FILE_EQUAL ( istream_of_output, " got_ss" , CRH_EG_DOMTBL_OUT_FILENAME () );
171+ // BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_DOMTBL_OUT_FILENAME() );
165172}
166173
167174BOOST_AUTO_TEST_CASE (file_hmmsearch) {
@@ -170,6 +177,7 @@ BOOST_AUTO_TEST_CASE(file_hmmsearch) {
170177 } );
171178 istringstream istream_of_output{ output_ss.str () };
172179 BOOST_CHECK_ISTREAM_AND_FILE_EQUAL ( istream_of_output, " got_ss" , CRH_EG_HMMSEARCH_OUT_FILENAME () );
180+ // BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_OUT_FILENAME() );
173181}
174182
175183BOOST_AUTO_TEST_CASE (file_hmmsearch_big_gap) {
@@ -179,6 +187,7 @@ BOOST_AUTO_TEST_CASE(file_hmmsearch_big_gap) {
179187 } );
180188 istringstream istream_of_output{ output_ss.str () };
181189 BOOST_CHECK_ISTREAM_AND_FILE_EQUAL ( istream_of_output, " got_ss" , CRH_EG_HMMSEARCH_BIG_GAP_OUT_FILENAME () );
190+ // BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_BIG_GAP_OUT_FILENAME() );
182191}
183192
184193BOOST_AUTO_TEST_CASE (file_hmmsearch_small_gap) {
@@ -188,6 +197,7 @@ BOOST_AUTO_TEST_CASE(file_hmmsearch_small_gap) {
188197 } );
189198 istringstream istream_of_output{ output_ss.str () };
190199 BOOST_CHECK_ISTREAM_AND_FILE_EQUAL ( istream_of_output, " got_ss" , CRH_EG_HMMSEARCH_SMALL_GAP_OUT_FILENAME () );
200+ // BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_SMALL_GAP_OUT_FILENAME() );
191201}
192202
193203BOOST_AUTO_TEST_CASE (file_hmmsearch_trimmed) {
@@ -200,6 +210,16 @@ BOOST_AUTO_TEST_CASE(file_hmmsearch_trimmed) {
200210 // BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_TRIMMED_OUT_FILENAME() );
201211}
202212
213+ BOOST_AUTO_TEST_CASE (file_hmmsearch_big_trim) {
214+ execute_perform_resolve_hits ( {
215+ CRH_EG_HMMSEARCH_IN_FILENAME ().string (), " --" + crh_input_options_block::PO_INPUT_FORMAT, to_string ( hits_input_format_tag::HMMSEARCH_OUT ),
216+ " --" + crh_segment_options_block::PO_OVERLAP_TRIM_SPEC, " 100/60"
217+ } );
218+ istringstream istream_of_output{ output_ss.str () };
219+ BOOST_CHECK_ISTREAM_AND_FILE_EQUAL ( istream_of_output, " got_ss" , CRH_EG_HMMSEARCH_BIG_TRIM_OUT_FILENAME () );
220+ // BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_BIG_TRIM_OUT_FILENAME() );
221+ }
222+
203223BOOST_AUTO_TEST_CASE (file_raw_evalue) {
204224 execute_perform_resolve_hits ( {
205225 CRH_EG_RAW_EVALUE_IN_FILENAME ().string (), " --" + crh_input_options_block::PO_INPUT_FORMAT, to_string ( hits_input_format_tag::RAW_WITH_EVALUES ),
@@ -215,6 +235,7 @@ BOOST_AUTO_TEST_CASE(file_raw_score) {
215235 } );
216236 istringstream istream_of_output{ output_ss.str () };
217237 BOOST_CHECK_ISTREAM_AND_FILE_EQUAL ( istream_of_output, " got_ss" , CRH_EG_RAW_SCORE_OUT_FILENAME () );
238+ // BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_RAW_SCORE_OUT_FILENAME() );
218239}
219240
220241
@@ -226,6 +247,7 @@ BOOST_AUTO_TEST_CASE(handles_dc_correcctly) {
226247 } );
227248 istringstream istream_of_output{ output_ss.str () };
228249 BOOST_CHECK_ISTREAM_AND_FILE_EQUAL ( istream_of_output, " got_ss" , CRH_CATH_DC_HANDLING_DATA_DIR () / " dc_eg_domtblout.cath_rules.out" );
250+ // BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_CATH_DC_HANDLING_DATA_DIR() / "dc_eg_domtblout.cath_rules.out" );
229251}
230252
231253
0 commit comments