@@ -30,8 +30,7 @@ using seqan3::operator""_phred42;
3030using seqan3::operator " " _tag;
3131
3232// global variables for reuse
33- seqan3::sam_file_input_options<seqan3::dna5> input_options;
34- seqan3::sam_file_output_options output_options;
33+ bio::map_io::reader_options default_options{};
3534
3635struct sam_file_data : public ::testing::Test
3736{
@@ -175,10 +174,7 @@ TYPED_TEST_P(sam_file_read, full_data_set)
175174
176175 // read data
177176 typename TestFixture::stream_type istream{this ->verbose_reads_input };
178- using record_t =
179- bio::detail::record_from_typelist<std::remove_cvref_t <decltype (bio::map_io::default_field_ids)>,
180- std::remove_cvref_t <decltype (bio::map_io::field_types_sam<>)>>;
181- bio::map_io::reader_options default_options{};
177+ using record_t = bio::record<decltype (default_options.field_ids ), decltype (default_options.field_types )>;
182178 bio::format_input_handler<bio::sam> input_handler{istream, default_options};
183179 record_t rec;
184180
@@ -205,10 +201,7 @@ TYPED_TEST_P(sam_file_read, all_missing_data)
205201{
206202 typename TestFixture::stream_type istream{this ->empty_input };
207203
208- using record_t =
209- bio::detail::record_from_typelist<std::remove_cvref_t <decltype (bio::map_io::default_field_ids)>,
210- std::remove_cvref_t <decltype (bio::map_io::field_types_sam<>)>>;
211- bio::map_io::reader_options default_options{};
204+ using record_t = bio::record<decltype (default_options.field_ids ), decltype (default_options.field_types )>;
212205 bio::format_input_handler<bio::sam> input_handler{istream, default_options};
213206 record_t rec;
214207
@@ -236,9 +229,7 @@ TYPED_TEST_P(sam_file_read, select_fields)
236229 constexpr auto fid = bio::vtag<bio::field::rname, bio::field::pos>;
237230 constexpr auto ftype = bio::ttag<std::string_view, int64_t >;
238231
239- using record_t =
240- bio::detail::record_from_typelist<std::remove_cvref_t <decltype (fid)>, std::remove_cvref_t <decltype (ftype)>>;
241- bio::map_io::reader_options default_options{};
232+ using record_t = bio::record<std::remove_cvref_t <decltype (fid)>, std::remove_cvref_t <decltype (ftype)>>;
242233 bio::format_input_handler<bio::sam> input_handler{istream, default_options};
243234 record_t rec;
244235
0 commit comments