#934: Unify test directories (#939)

There really wasn't much point to having "unit" tests and story tests
("legacy" tests, really) in separate directories.  Sweep them all
together into a single directory — it's simpler, and possibly faster
on some build systems.

src/strconv.cxx

@@ -147,10 +147,9 @@ inline char *wrap_to_chars(char *begin, char *end, T const &value)
 namespace pqxx
 {
 template<pqxx::internal::integer T>
-inline
-  zview
-  // NOLINTNEXTLINE(readability-non-const-parameter)
-  string_traits<T>::to_buf(char *begin, char *end, T const &value)
+inline zview
+// NOLINTNEXTLINE(readability-non-const-parameter)
+string_traits<T>::to_buf(char *begin, char *end, T const &value)
 {
   static_assert(std::is_integral_v<T>);
   auto const space{end - begin},

test/CMakeLists.txt

@@ -4,7 +4,7 @@ if(NOT PostgreSQL_FOUND)
     find_package(PostgreSQL REQUIRED)
 endif()
 
-file(GLOB TEST_SOURCES test*.cxx unit/test_*.cxx runner.cxx)
+file(GLOB TEST_SOURCES *.cxx)
 
 add_executable(runner ${TEST_SOURCES})
 target_link_libraries(runner PUBLIC pqxx)

test/Makefile.am

@@ -74,50 +74,50 @@ runner_SOURCES = \
   test88.cxx \
   test89.cxx \
   test90.cxx \
-  unit/test_array.cxx \
-  unit/test_blob.cxx \
-  unit/test_cancel_query.cxx \
-  unit/test_column.cxx \
-  unit/test_composite.cxx \
-  unit/test_connection.cxx \
-  unit/test_cursor.cxx \
-  unit/test_encodings.cxx \
-  unit/test_error_verbosity.cxx \
-  unit/test_errorhandler.cxx \
-  unit/test_escape.cxx \
-  unit/test_exceptions.cxx \
-  unit/test_field.cxx \
-  unit/test_float.cxx \
-  unit/test_largeobject.cxx \
-  unit/test_nonblocking_connect.cxx \
-  unit/test_notice_handler.cxx \
-  unit/test_notification.cxx \
-  unit/test_pipeline.cxx \
-  unit/test_prepared_statement.cxx \
-  unit/test_range.cxx \
-  unit/test_read_transaction.cxx \
-  unit/test_result_iteration.cxx \
-  unit/test_row.cxx \
-  unit/test_separated_list.cxx \
-  unit/test_simultaneous_transactions.cxx \
-  unit/test_sql_cursor.cxx \
-  unit/test_stateless_cursor.cxx \
-  unit/test_strconv.cxx \
-  unit/test_stream_from.cxx \
-  unit/test_stream_query.cxx \
-  unit/test_stream_to.cxx \
-  unit/test_string_conversion.cxx \
-  unit/test_subtransaction.cxx \
-  unit/test_test_helpers.cxx \
-  unit/test_thread_safety_model.cxx \
-  unit/test_time.cxx \
-  unit/test_transaction.cxx \
-  unit/test_transaction_base.cxx \
-  unit/test_transaction_focus.cxx \
-  unit/test_transactor.cxx \
-  unit/test_type_name.cxx \
-  unit/test_util.cxx \
-  unit/test_zview.cxx \
+  test_array.cxx \
+  test_blob.cxx \
+  test_cancel_query.cxx \
+  test_column.cxx \
+  test_composite.cxx \
+  test_connection.cxx \
+  test_cursor.cxx \
+  test_encodings.cxx \
+  test_error_verbosity.cxx \
+  test_errorhandler.cxx \
+  test_escape.cxx \
+  test_exceptions.cxx \
+  test_field.cxx \
+  test_float.cxx \
+  test_largeobject.cxx \
+  test_nonblocking_connect.cxx \
+  test_notice_handler.cxx \
+  test_notification.cxx \
+  test_pipeline.cxx \
+  test_prepared_statement.cxx \
+  test_range.cxx \
+  test_read_transaction.cxx \
+  test_result_iteration.cxx \
+  test_row.cxx \
+  test_separated_list.cxx \
+  test_simultaneous_transactions.cxx \
+  test_sql_cursor.cxx \
+  test_stateless_cursor.cxx \
+  test_strconv.cxx \
+  test_stream_from.cxx \
+  test_stream_query.cxx \
+  test_stream_to.cxx \
+  test_string_conversion.cxx \
+  test_subtransaction.cxx \
+  test_test_helpers.cxx \
+  test_thread_safety_model.cxx \
+  test_time.cxx \
+  test_transaction.cxx \
+  test_transaction_base.cxx \
+  test_transaction_focus.cxx \
+  test_transactor.cxx \
+  test_type_name.cxx \
+  test_util.cxx \
+  test_zview.cxx \
   runner.cxx
 
 runner_LDADD = $(top_builddir)/src/libpqxx.la ${POSTGRES_LIB}

test/Makefile.am.template

@@ -26,9 +26,6 @@ MAINTAINERCLEANFILES=Makefile.in
 runner_SOURCES = \
 ###MAKTEMPLATE:FOREACH test/test*.cxx
   ###BASENAME###.cxx \
-###MAKTEMPLATE:ENDFOREACH
-###MAKTEMPLATE:FOREACH test/unit/test_*.cxx
-  unit/###BASENAME###.cxx \
 ###MAKTEMPLATE:ENDFOREACH
   runner.cxx