From 146afe38938b3c5c8baf5f3bdb95ba7c8b9e7e51 Mon Sep 17 00:00:00 2001
From: Gerardo Tauriello <gerardo.tauriello@unibas.ch>
Date: Mon, 30 Sep 2019 18:46:00 +0200
Subject: [PATCH] SCHWED-4328: remove deprecated Boost unit test usage.

This should be ok for Boost > 1.33 and was tested with Boost >= 1.53.
---
 modules/base/tests/test_generic_property.cc                 | 1 -
 modules/base/tests/test_pod_vector.cc                       | 1 -
 modules/base/tests/test_string_ref.cc                       | 1 -
 modules/base/tests/tests.cc                                 | 3 ---
 modules/conop/tests/test_amino_acids.cc                     | 1 -
 modules/conop/tests/test_heuristic_builder.cc               | 1 -
 modules/conop/tests/test_heuristic_conop.cc                 | 1 -
 modules/conop/tests/test_rule_based_conop.cc                | 1 -
 modules/conop/tests/tests.cc                                | 2 --
 modules/geom/tests/test_composite2.cc                       | 1 -
 modules/geom/tests/test_composite3.cc                       | 1 -
 modules/geom/tests/test_mat2.cc                             | 1 -
 modules/geom/tests/test_mat3.cc                             | 1 -
 modules/geom/tests/test_mat4.cc                             | 1 -
 modules/geom/tests/test_op2.cc                              | 1 -
 modules/geom/tests/test_op3.cc                              | 1 -
 modules/geom/tests/test_op4.cc                              | 1 -
 modules/geom/tests/test_quat.cc                             | 1 -
 modules/geom/tests/test_transform.cc                        | 1 -
 modules/geom/tests/test_vec2.cc                             | 1 -
 modules/geom/tests/test_vec3.cc                             | 1 -
 modules/geom/tests/test_vec4.cc                             | 1 -
 modules/geom/tests/tests.cc                                 | 3 ---
 modules/io/tests/test_clustal.cc                            | 1 -
 modules/io/tests/test_exceptions.cc                         | 1 -
 modules/io/tests/test_io_crd.cc                             | 1 -
 modules/io/tests/test_io_dcd.cc                             | 1 -
 modules/io/tests/test_io_img.cc                             | 1 -
 modules/io/tests/test_io_pdb.cc                             | 1 -
 modules/io/tests/test_io_sdf.cc                             | 1 -
 modules/io/tests/test_io_sequence_profile.cc                | 1 -
 modules/io/tests/test_iomanager.cc                          | 1 -
 modules/io/tests/test_mmcif_info.cc                         | 1 -
 modules/io/tests/test_mmcif_reader.cc                       | 1 -
 modules/io/tests/test_pir.cc                                | 1 -
 modules/io/tests/test_star_parser.cc                        | 1 -
 modules/io/tests/tests.cc                                   | 2 --
 modules/mol/alg/tests/test_consistency_checks.cc            | 1 -
 modules/mol/alg/tests/test_partial_sec_struct_assignment.cc | 1 -
 modules/mol/alg/tests/test_superposition.cc                 | 1 -
 modules/mol/alg/tests/tests.cc                              | 2 --
 modules/mol/base/tests/test_atom_groups.cc                  | 1 -
 modules/mol/base/tests/test_builder.cc                      | 1 -
 modules/mol/base/tests/test_chain.cc                        | 1 -
 modules/mol/base/tests/test_conn.cc                         | 1 -
 modules/mol/base/tests/test_coord_group.cc                  | 1 -
 modules/mol/base/tests/test_delete.cc                       | 1 -
 modules/mol/base/tests/test_entity.cc                       | 1 -
 modules/mol/base/tests/test_ics.cc                          | 1 -
 modules/mol/base/tests/test_iterators.cc                    | 1 -
 modules/mol/base/tests/test_query.cc                        | 1 -
 modules/mol/base/tests/test_residue.cc                      | 1 -
 modules/mol/base/tests/test_surface.cc                      | 1 -
 modules/mol/base/tests/test_transfer_connectivity.cc        | 1 -
 modules/mol/base/tests/test_view.cc                         | 1 -
 modules/mol/base/tests/test_view_op.cc                      | 1 -
 modules/mol/base/tests/tests.cc                             | 3 ---
 modules/mol/mm/tests/test_block.cc                          | 1 -
 modules/mol/mm/tests/test_block_modifiers.cc                | 1 -
 modules/mol/mm/tests/test_forcefield.cc                     | 1 -
 modules/mol/mm/tests/test_interaction.cc                    | 1 -
 modules/mol/mm/tests/test_simulation.cc                     | 1 -
 modules/mol/mm/tests/test_topology.cc                       | 1 -
 modules/mol/mm/tests/tests.cc                               | 3 ---
 modules/seq/alg/tests/test_distance_analysis.cc             | 1 -
 modules/seq/alg/tests/test_merge_pairwise_alignments.cc     | 1 -
 modules/seq/alg/tests/test_sequence_identity.cc             | 1 -
 modules/seq/alg/tests/tests.cc                              | 3 ---
 modules/seq/base/tests/test_aligned_column.cc               | 1 -
 modules/seq/base/tests/test_aligned_region.cc               | 1 -
 modules/seq/base/tests/test_alignment.cc                    | 1 -
 modules/seq/base/tests/test_profile.cc                      | 1 -
 modules/seq/base/tests/test_sequence.cc                     | 1 -
 modules/seq/base/tests/tests.cc                             | 2 --
 74 files changed, 88 deletions(-)

diff --git a/modules/base/tests/test_generic_property.cc b/modules/base/tests/test_generic_property.cc
index 17632311a..c30c1fc6f 100644
--- a/modules/base/tests/test_generic_property.cc
+++ b/modules/base/tests/test_generic_property.cc
@@ -19,7 +19,6 @@
 #define BOOST_TEST_DYN_LINK
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 
diff --git a/modules/base/tests/test_pod_vector.cc b/modules/base/tests/test_pod_vector.cc
index 0e7225ced..3cf34fc4c 100644
--- a/modules/base/tests/test_pod_vector.cc
+++ b/modules/base/tests/test_pod_vector.cc
@@ -22,7 +22,6 @@
 #include <ost/pod_vector.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 using namespace ost;
 
diff --git a/modules/base/tests/test_string_ref.cc b/modules/base/tests/test_string_ref.cc
index 05b9bd844..539440d17 100644
--- a/modules/base/tests/test_string_ref.cc
+++ b/modules/base/tests/test_string_ref.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <ost/string_ref.hh>
 using namespace ost;
diff --git a/modules/base/tests/tests.cc b/modules/base/tests/tests.cc
index 9d9646b9f..8bf9b0a23 100644
--- a/modules/base/tests/tests.cc
+++ b/modules/base/tests/tests.cc
@@ -18,7 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_base
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-
diff --git a/modules/conop/tests/test_amino_acids.cc b/modules/conop/tests/test_amino_acids.cc
index 29266729c..58c842a57 100644
--- a/modules/conop/tests/test_amino_acids.cc
+++ b/modules/conop/tests/test_amino_acids.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/conop/amino_acids.hh>
 
diff --git a/modules/conop/tests/test_heuristic_builder.cc b/modules/conop/tests/test_heuristic_builder.cc
index f2378e660..cf6efa96f 100644
--- a/modules/conop/tests/test_heuristic_builder.cc
+++ b/modules/conop/tests/test_heuristic_builder.cc
@@ -22,7 +22,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/log.hh>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/conop/tests/test_heuristic_conop.cc b/modules/conop/tests/test_heuristic_conop.cc
index 61155c644..65e0a7fc2 100644
--- a/modules/conop/tests/test_heuristic_conop.cc
+++ b/modules/conop/tests/test_heuristic_conop.cc
@@ -24,7 +24,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include "helper.hh"
 using boost::unit_test_framework::test_suite;
 using namespace ost;
diff --git a/modules/conop/tests/test_rule_based_conop.cc b/modules/conop/tests/test_rule_based_conop.cc
index 1ce4ebe24..485454611 100644
--- a/modules/conop/tests/test_rule_based_conop.cc
+++ b/modules/conop/tests/test_rule_based_conop.cc
@@ -20,7 +20,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 #include <ost/platform.hh>
diff --git a/modules/conop/tests/tests.cc b/modules/conop/tests/tests.cc
index 7a6d17c40..21dd70140 100644
--- a/modules/conop/tests/tests.cc
+++ b/modules/conop/tests/tests.cc
@@ -18,6 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_conop
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
diff --git a/modules/geom/tests/test_composite2.cc b/modules/geom/tests/test_composite2.cc
index 612d73b0a..a459f74d1 100644
--- a/modules/geom/tests/test_composite2.cc
+++ b/modules/geom/tests/test_composite2.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_composite3.cc b/modules/geom/tests/test_composite3.cc
index a9fb6ea4d..31479351c 100644
--- a/modules/geom/tests/test_composite3.cc
+++ b/modules/geom/tests/test_composite3.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include "helper.hh"
diff --git a/modules/geom/tests/test_mat2.cc b/modules/geom/tests/test_mat2.cc
index c0f2e429f..944de8e9a 100644
--- a/modules/geom/tests/test_mat2.cc
+++ b/modules/geom/tests/test_mat2.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_mat3.cc b/modules/geom/tests/test_mat3.cc
index 7481e519e..2d4ce923e 100644
--- a/modules/geom/tests/test_mat3.cc
+++ b/modules/geom/tests/test_mat3.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_mat4.cc b/modules/geom/tests/test_mat4.cc
index 64c0eff7a..bee468108 100644
--- a/modules/geom/tests/test_mat4.cc
+++ b/modules/geom/tests/test_mat4.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_op2.cc b/modules/geom/tests/test_op2.cc
index fd52c6f3b..3805cc879 100644
--- a/modules/geom/tests/test_op2.cc
+++ b/modules/geom/tests/test_op2.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_op3.cc b/modules/geom/tests/test_op3.cc
index b37013a8c..519b19f8e 100644
--- a/modules/geom/tests/test_op3.cc
+++ b/modules/geom/tests/test_op3.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_op4.cc b/modules/geom/tests/test_op4.cc
index b9c4beeed..96edec917 100644
--- a/modules/geom/tests/test_op4.cc
+++ b/modules/geom/tests/test_op4.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 
 #include "helper.hh"
diff --git a/modules/geom/tests/test_quat.cc b/modules/geom/tests/test_quat.cc
index 54b8cea33..b4228dc38 100644
--- a/modules/geom/tests/test_quat.cc
+++ b/modules/geom/tests/test_quat.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include "helper.hh"
diff --git a/modules/geom/tests/test_transform.cc b/modules/geom/tests/test_transform.cc
index 8ac2ce97b..f52a47628 100644
--- a/modules/geom/tests/test_transform.cc
+++ b/modules/geom/tests/test_transform.cc
@@ -21,7 +21,6 @@
  */
  #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/geom/geom.hh>
 
 using namespace geom;
diff --git a/modules/geom/tests/test_vec2.cc b/modules/geom/tests/test_vec2.cc
index c7cb014de..3ea6090b2 100644
--- a/modules/geom/tests/test_vec2.cc
+++ b/modules/geom/tests/test_vec2.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_vec3.cc b/modules/geom/tests/test_vec3.cc
index 9b2a4cc8b..b7c03ff7f 100644
--- a/modules/geom/tests/test_vec3.cc
+++ b/modules/geom/tests/test_vec3.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_vec4.cc b/modules/geom/tests/test_vec4.cc
index f39988a41..44b87bcf1 100644
--- a/modules/geom/tests/test_vec4.cc
+++ b/modules/geom/tests/test_vec4.cc
@@ -22,7 +22,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/tests.cc b/modules/geom/tests/tests.cc
index 87ec85ccf..c0b2b3030 100644
--- a/modules/geom/tests/tests.cc
+++ b/modules/geom/tests/tests.cc
@@ -18,7 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE geom
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-
diff --git a/modules/io/tests/test_clustal.cc b/modules/io/tests/test_clustal.cc
index b9ebf221b..c6cb21c58 100644
--- a/modules/io/tests/test_clustal.cc
+++ b/modules/io/tests/test_clustal.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/io/seq/clustal_io_handler.hh>
 #include <ost/io/seq/load.hh>
diff --git a/modules/io/tests/test_exceptions.cc b/modules/io/tests/test_exceptions.cc
index 27d9ea661..1a2befe05 100644
--- a/modules/io/tests/test_exceptions.cc
+++ b/modules/io/tests/test_exceptions.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/io/img/load_map.hh>
 #include <ost/img/image.hh>
diff --git a/modules/io/tests/test_io_crd.cc b/modules/io/tests/test_io_crd.cc
index 4cde64f32..f51d67af1 100644
--- a/modules/io/tests/test_io_crd.cc
+++ b/modules/io/tests/test_io_crd.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/test_utils/compare_files.hh>
 #include <ost/mol/mol.hh>
diff --git a/modules/io/tests/test_io_dcd.cc b/modules/io/tests/test_io_dcd.cc
index fb95e6e83..270d371e8 100644
--- a/modules/io/tests/test_io_dcd.cc
+++ b/modules/io/tests/test_io_dcd.cc
@@ -19,7 +19,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/io/mol/dcd_io.hh>
 #include <ost/mol/entity_handle.hh>
diff --git a/modules/io/tests/test_io_img.cc b/modules/io/tests/test_io_img.cc
index 9ac75d094..2e7b4961c 100644
--- a/modules/io/tests/test_io_img.cc
+++ b/modules/io/tests/test_io_img.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <map>
 #include <ost/io/img/load_map.hh>
diff --git a/modules/io/tests/test_io_pdb.cc b/modules/io/tests/test_io_pdb.cc
index ffc6dd286..4eb4cb19b 100644
--- a/modules/io/tests/test_io_pdb.cc
+++ b/modules/io/tests/test_io_pdb.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 using boost::unit_test_framework::test_suite;
 
diff --git a/modules/io/tests/test_io_sdf.cc b/modules/io/tests/test_io_sdf.cc
index c90b80b30..b15b4f6e7 100644
--- a/modules/io/tests/test_io_sdf.cc
+++ b/modules/io/tests/test_io_sdf.cc
@@ -19,7 +19,6 @@
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/io/tests/test_io_sequence_profile.cc b/modules/io/tests/test_io_sequence_profile.cc
index 05a02345e..a99b93c9c 100644
--- a/modules/io/tests/test_io_sequence_profile.cc
+++ b/modules/io/tests/test_io_sequence_profile.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <iostream>
 
 #include <ost/seq/profile_handle.hh>
diff --git a/modules/io/tests/test_iomanager.cc b/modules/io/tests/test_iomanager.cc
index b6e79f1fc..7cc80671b 100644
--- a/modules/io/tests/test_iomanager.cc
+++ b/modules/io/tests/test_iomanager.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 using boost::unit_test_framework::test_suite;
 #include <ost/io/io_manager.hh>
 
diff --git a/modules/io/tests/test_mmcif_info.cc b/modules/io/tests/test_mmcif_info.cc
index 6707ff930..28c165c80 100644
--- a/modules/io/tests/test_mmcif_info.cc
+++ b/modules/io/tests/test_mmcif_info.cc
@@ -19,7 +19,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <ost/io/io_exception.hh>
diff --git a/modules/io/tests/test_mmcif_reader.cc b/modules/io/tests/test_mmcif_reader.cc
index df82b4ec8..87e844f72 100644
--- a/modules/io/tests/test_mmcif_reader.cc
+++ b/modules/io/tests/test_mmcif_reader.cc
@@ -19,7 +19,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <fstream>
diff --git a/modules/io/tests/test_pir.cc b/modules/io/tests/test_pir.cc
index 946d113ba..7c4c67d97 100644
--- a/modules/io/tests/test_pir.cc
+++ b/modules/io/tests/test_pir.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/seq/invalid_sequence.hh>
 #include <ost/io/seq/pir_io_handler.hh>
 #include <ost/io/seq/load.hh>
diff --git a/modules/io/tests/test_star_parser.cc b/modules/io/tests/test_star_parser.cc
index c4e40fdbd..8024025a5 100644
--- a/modules/io/tests/test_star_parser.cc
+++ b/modules/io/tests/test_star_parser.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <fstream>
diff --git a/modules/io/tests/tests.cc b/modules/io/tests/tests.cc
index 85c0f12e2..faa6774fc 100644
--- a/modules/io/tests/tests.cc
+++ b/modules/io/tests/tests.cc
@@ -18,6 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_io
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
diff --git a/modules/mol/alg/tests/test_consistency_checks.cc b/modules/mol/alg/tests/test_consistency_checks.cc
index b7e3d3e4c..927b9d1ef 100644
--- a/modules/mol/alg/tests/test_consistency_checks.cc
+++ b/modules/mol/alg/tests/test_consistency_checks.cc
@@ -22,7 +22,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 #include <ost/mol/alg/consistency_checks.hh>
diff --git a/modules/mol/alg/tests/test_partial_sec_struct_assignment.cc b/modules/mol/alg/tests/test_partial_sec_struct_assignment.cc
index b6a991560..56d247515 100644
--- a/modules/mol/alg/tests/test_partial_sec_struct_assignment.cc
+++ b/modules/mol/alg/tests/test_partial_sec_struct_assignment.cc
@@ -21,7 +21,6 @@
 #include <ost/mol/alg/sec_struct.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/io/mol/pdb_reader.hh>
 #include <ost/mol/builder.hh>
diff --git a/modules/mol/alg/tests/test_superposition.cc b/modules/mol/alg/tests/test_superposition.cc
index e3c88d647..ba35aa122 100644
--- a/modules/mol/alg/tests/test_superposition.cc
+++ b/modules/mol/alg/tests/test_superposition.cc
@@ -23,7 +23,6 @@
 #include <ost/mol/alg/svd_superpose.hh>
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/mol/builder.hh>
 #include <ost/message.hh>
diff --git a/modules/mol/alg/tests/tests.cc b/modules/mol/alg/tests/tests.cc
index fb9a32714..4308786c1 100644
--- a/modules/mol/alg/tests/tests.cc
+++ b/modules/mol/alg/tests/tests.cc
@@ -22,6 +22,4 @@
  */
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_mol_alg
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
diff --git a/modules/mol/base/tests/test_atom_groups.cc b/modules/mol/base/tests/test_atom_groups.cc
index 7514f57ac..71898da71 100644
--- a/modules/mol/base/tests/test_atom_groups.cc
+++ b/modules/mol/base/tests/test_atom_groups.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/message.hh>
 #include "dummy_ent.hh"
diff --git a/modules/mol/base/tests/test_builder.cc b/modules/mol/base/tests/test_builder.cc
index f9128bca4..30e8bdcdd 100644
--- a/modules/mol/base/tests/test_builder.cc
+++ b/modules/mol/base/tests/test_builder.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 using namespace ost;
 using namespace ost::mol;
diff --git a/modules/mol/base/tests/test_chain.cc b/modules/mol/base/tests/test_chain.cc
index 8f6080401..c1442dd45 100644
--- a/modules/mol/base/tests/test_chain.cc
+++ b/modules/mol/base/tests/test_chain.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 #include <ost/message.hh>
diff --git a/modules/mol/base/tests/test_conn.cc b/modules/mol/base/tests/test_conn.cc
index be08f357a..140682182 100644
--- a/modules/mol/base/tests/test_conn.cc
+++ b/modules/mol/base/tests/test_conn.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 
 using namespace ost;
diff --git a/modules/mol/base/tests/test_coord_group.cc b/modules/mol/base/tests/test_coord_group.cc
index a26f2e2bd..39be2c38c 100644
--- a/modules/mol/base/tests/test_coord_group.cc
+++ b/modules/mol/base/tests/test_coord_group.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 #include <ost/mol/coord_group.hh>
diff --git a/modules/mol/base/tests/test_delete.cc b/modules/mol/base/tests/test_delete.cc
index 2d5f2339c..4f7b8dbb2 100644
--- a/modules/mol/base/tests/test_delete.cc
+++ b/modules/mol/base/tests/test_delete.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/log.hh>
 #include <ost/message.hh>
diff --git a/modules/mol/base/tests/test_entity.cc b/modules/mol/base/tests/test_entity.cc
index cab0efe69..7d8ea3485 100644
--- a/modules/mol/base/tests/test_entity.cc
+++ b/modules/mol/base/tests/test_entity.cc
@@ -22,7 +22,6 @@
  
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/geom/vec_mat_predicates.hh>
 #include <ost/mol/chem_class.hh>
 #include <ost/mol/mol.hh>
diff --git a/modules/mol/base/tests/test_ics.cc b/modules/mol/base/tests/test_ics.cc
index 231df43cd..a68d49734 100644
--- a/modules/mol/base/tests/test_ics.cc
+++ b/modules/mol/base/tests/test_ics.cc
@@ -22,7 +22,6 @@
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/log.hh>
 #include <ost/message.hh>
diff --git a/modules/mol/base/tests/test_iterators.cc b/modules/mol/base/tests/test_iterators.cc
index 47b24bb11..cfd61c509 100644
--- a/modules/mol/base/tests/test_iterators.cc
+++ b/modules/mol/base/tests/test_iterators.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/message.hh>
 #include <iostream>
diff --git a/modules/mol/base/tests/test_query.cc b/modules/mol/base/tests/test_query.cc
index 5f8865ae5..185b0f168 100644
--- a/modules/mol/base/tests/test_query.cc
+++ b/modules/mol/base/tests/test_query.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/query.hh>
 #include <ost/mol/mol.hh>
 #include <ost/mol/entity_view.hh>
diff --git a/modules/mol/base/tests/test_residue.cc b/modules/mol/base/tests/test_residue.cc
index d828544b7..a06c6a6cf 100644
--- a/modules/mol/base/tests/test_residue.cc
+++ b/modules/mol/base/tests/test_residue.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 
 #include <ost/message.hh>
diff --git a/modules/mol/base/tests/test_surface.cc b/modules/mol/base/tests/test_surface.cc
index d48b79843..ecc8d40b1 100644
--- a/modules/mol/base/tests/test_surface.cc
+++ b/modules/mol/base/tests/test_surface.cc
@@ -19,7 +19,6 @@
  
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/surface_handle.hh>
 #include <cmath>
diff --git a/modules/mol/base/tests/test_transfer_connectivity.cc b/modules/mol/base/tests/test_transfer_connectivity.cc
index 2f5dff143..1bb37feed 100644
--- a/modules/mol/base/tests/test_transfer_connectivity.cc
+++ b/modules/mol/base/tests/test_transfer_connectivity.cc
@@ -25,7 +25,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 using namespace ost;
 using namespace ost::mol;
diff --git a/modules/mol/base/tests/test_view.cc b/modules/mol/base/tests/test_view.cc
index 9a72c9d16..2aee173d3 100644
--- a/modules/mol/base/tests/test_view.cc
+++ b/modules/mol/base/tests/test_view.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 
 
diff --git a/modules/mol/base/tests/test_view_op.cc b/modules/mol/base/tests/test_view_op.cc
index abe84f3ba..f61f5d5bc 100644
--- a/modules/mol/base/tests/test_view_op.cc
+++ b/modules/mol/base/tests/test_view_op.cc
@@ -21,7 +21,6 @@
  */
  #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/mol/view_op.hh>
 
diff --git a/modules/mol/base/tests/tests.cc b/modules/mol/base/tests/tests.cc
index 8fb5bbd47..117985fd0 100644
--- a/modules/mol/base/tests/tests.cc
+++ b/modules/mol/base/tests/tests.cc
@@ -18,7 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_mol_base
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-
diff --git a/modules/mol/mm/tests/test_block.cc b/modules/mol/mm/tests/test_block.cc
index 20aaf2a73..93826f825 100644
--- a/modules/mol/mm/tests/test_block.cc
+++ b/modules/mol/mm/tests/test_block.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/interaction.hh>
 #include <ost/mol/mm/buildingblock.hh>
 #include <ost/mol/mol.hh>
diff --git a/modules/mol/mm/tests/test_block_modifiers.cc b/modules/mol/mm/tests/test_block_modifiers.cc
index 0c60dd268..46b9c03c6 100644
--- a/modules/mol/mm/tests/test_block_modifiers.cc
+++ b/modules/mol/mm/tests/test_block_modifiers.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/interaction.hh>
 #include <ost/mol/mm/buildingblock.hh>
 #include <ost/mol/mol.hh>
diff --git a/modules/mol/mm/tests/test_forcefield.cc b/modules/mol/mm/tests/test_forcefield.cc
index cda6b18df..45b658a1d 100644
--- a/modules/mol/mm/tests/test_forcefield.cc
+++ b/modules/mol/mm/tests/test_forcefield.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/settings.hh>
 #include <ost/mol/mm/forcefield.hh>
 #include <ost/mol/mm/interaction.hh>
diff --git a/modules/mol/mm/tests/test_interaction.cc b/modules/mol/mm/tests/test_interaction.cc
index d021c5e71..5c1980790 100644
--- a/modules/mol/mm/tests/test_interaction.cc
+++ b/modules/mol/mm/tests/test_interaction.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/interaction.hh>
 #include <ost/mol/mol.hh>
 #include <ost/mol/builder.hh>
diff --git a/modules/mol/mm/tests/test_simulation.cc b/modules/mol/mm/tests/test_simulation.cc
index cfe2b6081..4836f2f2a 100644
--- a/modules/mol/mm/tests/test_simulation.cc
+++ b/modules/mol/mm/tests/test_simulation.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/settings.hh>
 #include <ost/mol/mm/forcefield.hh>
 #include <ost/mol/mm/interaction.hh>
diff --git a/modules/mol/mm/tests/test_topology.cc b/modules/mol/mm/tests/test_topology.cc
index 5d8644fa2..e74b79a4b 100644
--- a/modules/mol/mm/tests/test_topology.cc
+++ b/modules/mol/mm/tests/test_topology.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <ost/mol/mm/topology.hh>
 #include <ost/mol/mm/topology_creator.hh>
 #include <ost/mol/mm/settings.hh>
diff --git a/modules/mol/mm/tests/tests.cc b/modules/mol/mm/tests/tests.cc
index 6a7e493fa..973da7b13 100644
--- a/modules/mol/mm/tests/tests.cc
+++ b/modules/mol/mm/tests/tests.cc
@@ -19,7 +19,4 @@
 
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_mol_base
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-
diff --git a/modules/seq/alg/tests/test_distance_analysis.cc b/modules/seq/alg/tests/test_distance_analysis.cc
index e8b41e819..928c00ead 100644
--- a/modules/seq/alg/tests/test_distance_analysis.cc
+++ b/modules/seq/alg/tests/test_distance_analysis.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/atom_view.hh>
 #include <ost/mol/xcs_editor.hh>
diff --git a/modules/seq/alg/tests/test_merge_pairwise_alignments.cc b/modules/seq/alg/tests/test_merge_pairwise_alignments.cc
index 5c23b1f65..bcdca910f 100644
--- a/modules/seq/alg/tests/test_merge_pairwise_alignments.cc
+++ b/modules/seq/alg/tests/test_merge_pairwise_alignments.cc
@@ -22,7 +22,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/seq/alg/merge_pairwise_alignments.hh>
 #include <ost/integrity_error.hh>
diff --git a/modules/seq/alg/tests/test_sequence_identity.cc b/modules/seq/alg/tests/test_sequence_identity.cc
index 7173ff8c2..d95d5a671 100644
--- a/modules/seq/alg/tests/test_sequence_identity.cc
+++ b/modules/seq/alg/tests/test_sequence_identity.cc
@@ -22,7 +22,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <ost/seq/alg/sequence_identity.hh>
 
diff --git a/modules/seq/alg/tests/tests.cc b/modules/seq/alg/tests/tests.cc
index 6203808c2..5a9ec9d00 100644
--- a/modules/seq/alg/tests/tests.cc
+++ b/modules/seq/alg/tests/tests.cc
@@ -18,7 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_seq_alg
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-
diff --git a/modules/seq/base/tests/test_aligned_column.cc b/modules/seq/base/tests/test_aligned_column.cc
index d934cefb0..73e75310c 100644
--- a/modules/seq/base/tests/test_aligned_column.cc
+++ b/modules/seq/base/tests/test_aligned_column.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 
diff --git a/modules/seq/base/tests/test_aligned_region.cc b/modules/seq/base/tests/test_aligned_region.cc
index 118c8d09f..27ddc299b 100644
--- a/modules/seq/base/tests/test_aligned_region.cc
+++ b/modules/seq/base/tests/test_aligned_region.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 
diff --git a/modules/seq/base/tests/test_alignment.cc b/modules/seq/base/tests/test_alignment.cc
index 52da21684..05a405b37 100644
--- a/modules/seq/base/tests/test_alignment.cc
+++ b/modules/seq/base/tests/test_alignment.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/invalid_handle.hh>
 #include <ost/mol/mol.hh>
diff --git a/modules/seq/base/tests/test_profile.cc b/modules/seq/base/tests/test_profile.cc
index c48e65f36..252add767 100644
--- a/modules/seq/base/tests/test_profile.cc
+++ b/modules/seq/base/tests/test_profile.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 #include <iostream>
 
 #include <ost/seq/profile_handle.hh>
diff --git a/modules/seq/base/tests/test_sequence.cc b/modules/seq/base/tests/test_sequence.cc
index 309939db0..b18855bdd 100644
--- a/modules/seq/base/tests/test_sequence.cc
+++ b/modules/seq/base/tests/test_sequence.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
 
 #include <ost/mol/mol.hh>
 
diff --git a/modules/seq/base/tests/tests.cc b/modules/seq/base/tests/tests.cc
index 8d2205011..4d3b8b161 100644
--- a/modules/seq/base/tests/tests.cc
+++ b/modules/seq/base/tests/tests.cc
@@ -18,6 +18,4 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ost_seq_base
-#define BOOST_AUTO_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/auto_unit_test.hpp>
-- 
GitLab