Refactor test sources

cmake/toolchains/msvc.cmake

@@ -9,7 +9,7 @@ add_compile_options(
     /permissive-  # strict C++
     /W4           # enable all warnings
     /MP           # multi-processor compilation
-    /fsanitize=address
+    #/fsanitize=address
 )
 if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32") # 32-bit
     add_compile_options(

include/boost/url/detail/test/test_main.cpp

@@ -7,7 +7,7 @@
 // Official repository: https://github.com/CPPAlliance/url
 //
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 #include <iostream>
 #ifdef _MSC_VER

include/boost/url/rfc/uri_reference_bnf.hpp

@@ -12,7 +12,9 @@
 
 #include <boost/url/detail/config.hpp>
 #include <boost/url/error.hpp>
+#include <boost/url/rfc/authority_bnf.hpp>
 #include <boost/url/rfc/fragment_part_bnf.hpp>
+#include <boost/url/rfc/paths_bnf.hpp>
 #include <boost/url/rfc/query_part_bnf.hpp>
 #include <boost/url/rfc/scheme_part_bnf.hpp>
 

test/CMakeLists.txt

@@ -8,66 +8,4 @@
 # Official repository: https://github.com/CPPAlliance/url
 #
 
-if(NOT TARGET tests)
-    add_custom_target(tests)
-    set_property(TARGET tests PROPERTY FOLDER _deps)
-endif()
-
-set(BOOST_URL_TESTS_FILES
-    CMakeLists.txt
-    Jamfile
-    include/main.cpp
-    include/test_suite.hpp
-    include/test_bnf.hpp
-    error.cpp
-    host_type.cpp
-    ipv4_address.cpp
-    ipv6_address.cpp
-    path_view.cpp
-    pct_encoding.cpp
-    query_params_view.cpp
-    scheme.cpp
-    static_pool.cpp
-    static_url.cpp
-    string.cpp
-    url.cpp
-    url_view.cpp
-    urls.cpp
-    bnf/ascii.cpp
-    bnf/char_set.cpp
-    bnf/parse.cpp
-    bnf/range.cpp
-    bnf/repeat.cpp
-    bnf/token.cpp
-    rfc/absolute_uri_bnf.cpp
-    rfc/authority_bnf.cpp
-    rfc/char_sets.cpp
-    rfc/fragment_bnf.cpp
-    rfc/fragment_part_bnf.cpp
-    rfc/hier_part_bnf.cpp
-    rfc/host_bnf.cpp
-    rfc/ip_literal_bnf.cpp
-    rfc/ipv_future_bnf.cpp
-    rfc/ipv4_address_bnf.cpp
-    rfc/ipv6_address_bnf.cpp
-    rfc/paths_bnf.cpp
-    rfc/pct_encoded_bnf.cpp
-    rfc/port_bnf.cpp
-    rfc/port_part_bnf.cpp
-    rfc/query_bnf.cpp
-    rfc/query_part_bnf.cpp
-    rfc/relative_part_bnf.cpp
-    rfc/scheme_bnf.cpp
-    rfc/scheme_part_bnf.cpp
-    rfc/uri_bnf.cpp
-    rfc/userinfo_bnf.cpp
-    )
-
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "" FILES ${BOOST_URL_TESTS_FILES})
-add_executable(boost_url_tests ${BOOST_URL_TESTS_FILES})
-target_include_directories(boost_url_tests PRIVATE . ./include)
-target_link_libraries(boost_url_tests PRIVATE Boost::url)
-add_test(NAME boost_url_tests COMMAND boost_url_tests)
-add_dependencies(tests boost_url_tests)
-
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../src PREFIX "" FILES ../src/src.cpp)
+add_subdirectory(unit)

test/Jamfile

@@ -7,71 +7,4 @@
 # Official repository: https://github.com/vinniefalco/url
 #
 
-import testing ;
-
-
-project
-    : requirements
-      $(c11-requires)
-      <source>include/main.cpp
-      <include>include
-    ;
-
-
-local SOURCES =
-    include/main.cpp
-    include/test_suite.hpp
-    include/test_bnf.hpp
-    error.cpp
-    host_type.cpp
-    ipv4_address.cpp
-    ipv6_address.cpp
-    path_view.cpp
-    pct_encoding.cpp
-    query_params_view.cpp
-    scheme.cpp
-    static_pool.cpp
-    static_url.cpp
-    string.cpp
-    url.cpp
-    url_view.cpp
-    urls.cpp
-    bnf/char_set.cpp
-    bnf/parse.cpp
-    bnf/range.cpp
-    bnf/repeat.cpp
-    bnf/token.cpp
-    rfc/absolute_uri_bnf.cpp
-    rfc/authority_bnf.cpp
-    rfc/char_sets.cpp
-    rfc/fragment_bnf.cpp
-    rfc/fragment_part_bnf.cpp
-    rfc/hier_part_bnf.cpp
-    rfc/host_bnf.cpp
-    rfc/ip_literal_bnf.cpp
-    rfc/ipv_future_bnf.cpp
-    rfc/ipv4_address_bnf.cpp
-    rfc/ipv6_address_bnf.cpp
-    rfc/paths_bnf.cpp
-    rfc/pct_encoded_bnf.cpp
-    rfc/port_bnf.cpp
-    rfc/port_part_bnf.cpp
-    rfc/query_bnf.cpp
-    rfc/query_part_bnf.cpp
-    rfc/relative_part_bnf.cpp
-    rfc/scheme_bnf.cpp
-    rfc/scheme_part_bnf.cpp
-    rfc/uri_bnf.cpp
-    rfc/userinfo_bnf.cpp
-    ;
-for local f in $(SOURCES)
-{
-    run $(f) /boost/url//boost_url ;
-}
-
-local LIMIT_SOURCES =
-    ;
-for local f in $(LIMIT_SOURCES)
-{
-    run $(f) include/main.cpp /boost/url//url_sources ;
-}
+build-project unit ;

test/unit/CMakeLists.txt

@@ -0,0 +1,75 @@
+#
+# Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
+# Copyright (c) 2021 DMitry Arkhipov (grisumbras@gmail.com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/CPPAlliance/url
+#
+
+if(NOT TARGET tests)
+    add_custom_target(tests)
+    set_property(TARGET tests PROPERTY FOLDER _deps)
+endif()
+
+set(BOOST_URL_TESTS_FILES
+    CMakeLists.txt
+    Jamfile
+    test_bnf.hpp
+    error.cpp
+    host_type.cpp
+    ipv4_address.cpp
+    ipv6_address.cpp
+    path_view.cpp
+    pct_encoding.cpp
+    query_params_view.cpp
+    scheme.cpp
+    static_pool.cpp
+    static_url.cpp
+    string.cpp
+    url.cpp
+    url_view.cpp
+    urls.cpp
+    bnf/ascii.cpp
+    bnf/char_set.cpp
+    bnf/parse.cpp
+    bnf/range.cpp
+    bnf/repeat.cpp
+    bnf/token.cpp
+    rfc/absolute_uri_bnf.cpp
+    rfc/authority_bnf.cpp
+    rfc/char_sets.cpp
+    rfc/fragment_bnf.cpp
+    rfc/fragment_part_bnf.cpp
+    rfc/hier_part_bnf.cpp
+    rfc/host_bnf.cpp
+    rfc/ip_literal_bnf.cpp
+    rfc/ipv_future_bnf.cpp
+    rfc/ipv4_address_bnf.cpp
+    rfc/ipv6_address_bnf.cpp
+    rfc/paths_bnf.cpp
+    rfc/pct_encoded_bnf.cpp
+    rfc/port_bnf.cpp
+    rfc/port_part_bnf.cpp
+    rfc/query_bnf.cpp
+    rfc/query_part_bnf.cpp
+    rfc/relative_part_bnf.cpp
+    rfc/scheme_bnf.cpp
+    rfc/scheme_part_bnf.cpp
+    rfc/uri_bnf.cpp
+    rfc/uri_reference_bnf.cpp
+    rfc/userinfo_bnf.cpp
+    )
+
+set(TEST_MAIN ../../include/boost/url/detail/test/test_main.cpp)
+
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "" FILES ${BOOST_URL_TESTS_FILES})
+source_group(TREE ../include/boost/url/detail/test PREFIX "" FILES ${TEST_MAIN})
+add_executable(boost_url_tests ${BOOST_URL_TESTS_FILES} ${TEST_MAIN})
+target_include_directories(boost_url_tests PRIVATE . )
+target_link_libraries(boost_url_tests PRIVATE Boost::url)
+add_test(NAME boost_url_tests COMMAND boost_url_tests)
+add_dependencies(tests boost_url_tests)
+
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../../src PREFIX "" FILES ../../src/src.cpp)

test/unit/Jamfile

@@ -0,0 +1,77 @@
+#
+# Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/vinniefalco/url
+#
+
+import testing ;
+
+
+project
+    : requirements
+      $(c11-requires)
+      <source>../../include/boost/url/detail/test/test_main.cpp
+      <include>.
+    ;
+
+
+local SOURCES =
+    ../../include/boost/url/detail/test/test_main.cpp
+    error.cpp
+    host_type.cpp
+    ipv4_address.cpp
+    ipv6_address.cpp
+    path_view.cpp
+    pct_encoding.cpp
+    query_params_view.cpp
+    scheme.cpp
+    static_pool.cpp
+    static_url.cpp
+    string.cpp
+    url.cpp
+    url_view.cpp
+    urls.cpp
+    bnf/ascii.cpp
+    bnf/char_set.cpp
+    bnf/parse.cpp
+    bnf/range.cpp
+    bnf/repeat.cpp
+    bnf/token.cpp
+    rfc/absolute_uri_bnf.cpp
+    rfc/authority_bnf.cpp
+    rfc/char_sets.cpp
+    rfc/fragment_bnf.cpp
+    rfc/fragment_part_bnf.cpp
+    rfc/hier_part_bnf.cpp
+    rfc/host_bnf.cpp
+    rfc/ip_literal_bnf.cpp
+    rfc/ipv_future_bnf.cpp
+    rfc/ipv4_address_bnf.cpp
+    rfc/ipv6_address_bnf.cpp
+    rfc/paths_bnf.cpp
+    rfc/pct_encoded_bnf.cpp
+    rfc/port_bnf.cpp
+    rfc/port_part_bnf.cpp
+    rfc/query_bnf.cpp
+    rfc/query_part_bnf.cpp
+    rfc/relative_part_bnf.cpp
+    rfc/scheme_bnf.cpp
+    rfc/scheme_part_bnf.cpp
+    rfc/uri_bnf.cpp
+    rfc/uri_reference_bnf.cpp
+    rfc/userinfo_bnf.cpp
+    ;
+for local f in $(SOURCES)
+{
+    run $(f) /boost/url//boost_url ;
+}
+
+local LIMIT_SOURCES =
+    ;
+for local f in $(LIMIT_SOURCES)
+{
+    run $(f) ../../include/boost/url/detail/test/test_main.cpp /boost/url//url_sources ;
+}

test/unit/bnf/ascii.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/bnf/ascii.hpp>
 
 #include <boost/url/string.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 #include <memory>
 

test/unit/bnf/char_set.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/bnf/char_set.hpp>
 
 #include <boost/url/string.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/bnf/parse.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/bnf/parse.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 namespace boost {
 namespace urls {

test/unit/bnf/token.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/bnf/token.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/error.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/error.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 #include <memory>
 

test/unit/host_type.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/host_type.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 namespace boost {
 namespace urls {

test/unit/ipv4_address.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/ipv4_address.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include <sstream>
 
 namespace boost {

test/unit/ipv6_address.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/ipv6_address.hpp>
 
 #include <boost/url/ipv4_address.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include <sstream>
 
 namespace boost {

test/unit/path_view.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/path_view.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include <algorithm>
 #include <iterator>
 #include <string>

test/unit/pct_encoding.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/pct_encoding.hpp>
 
 #include <boost/url/static_pool.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 namespace boost {
 namespace urls {

test/unit/query_params_view.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/query_params_view.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 namespace boost {
 namespace urls {

test/unit/rfc/absolute_uri_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/absolute_uri_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 #include <iostream>

test/unit/rfc/authority_bnf.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/url/bnf/parse.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 #include <type_traits>

test/unit/rfc/char_sets.cpp

@@ -12,7 +12,7 @@
 #include <boost/url/string.hpp>
 
 #include "test_bnf.hpp"
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 #include <array>
 #include <iostream>

test/unit/rfc/fragment_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/fragment_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 #include <iostream>

test/unit/rfc/hier_part_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/hier_part_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/rfc/host_bnf.cpp

@@ -13,7 +13,7 @@
 #include <boost/url/bnf/parse.hpp>
 #include <boost/static_assert.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 #include <type_traits>

test/unit/rfc/ip_literal_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/ip_literal_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/rfc/ipv4_address_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/ipv4_address_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/rfc/ipv6_address_bnf.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/rfc/ipv6_address_bnf.hpp>
 
 #include <boost/url/bnf/parse.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/rfc/ipv_future_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/ipv_future_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/rfc/paths_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/paths_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 namespace boost {
 namespace urls {

test/unit/rfc/pct_encoded_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/pct_encoded_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 namespace boost {
 namespace urls {

test/unit/rfc/port_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/port_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/rfc/query_bnf.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/url/bnf/range.hpp>
 #include <boost/url/rfc/detail/query_params_bnf.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 #include <iostream>
 

test/unit/rfc/relative_part_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/relative_part_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/rfc/scheme_bnf.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/rfc/scheme_bnf.hpp>
 
 #include <boost/url/bnf/parse.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/rfc/uri_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/uri_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 #include <iostream>

test/unit/rfc/uri_reference_bnf.cpp

@@ -10,7 +10,7 @@
 // Test that header file is self-contained.
 #include <boost/url/rfc/uri_reference_bnf.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 #include <iostream>

test/unit/rfc/userinfo_bnf.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/rfc/userinfo_bnf.hpp>
 
 #include <boost/url/bnf/parse.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include "test_bnf.hpp"
 
 namespace boost {

test/unit/scheme.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/scheme.hpp>
 
 #include <boost/url/bnf/ascii.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 namespace boost {
 namespace urls {

test/unit/static_pool.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/static_pool.hpp>
 
 #include <boost/url/string.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 #include <iostream>
 

test/unit/static_url.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/static_url.hpp>
 
 #include <boost/url/url_view.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include <iostream>
 
 namespace boost {

test/unit/test_bnf.hpp

@@ -15,7 +15,7 @@
 #include <boost/url/string.hpp>
 #include <initializer_list>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 namespace boost {
 namespace urls {

test/unit/url.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/url/url_view.hpp>
 
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 
 namespace boost {
 namespace urls {

test/unit/url_view.cpp

@@ -11,7 +11,7 @@
 #include <boost/url/url_view.hpp>
 
 #include <boost/url/static_pool.hpp>
-#include "test_suite.hpp"
+#include <boost/url/detail/test/test_suite.hpp>
 #include <sstream>
 
 namespace boost {