Move all array tests into array test file

Author: davidstone

source/containers/array.cpp

@@ -12,10 +12,8 @@ export module containers.array;
 
 import containers.begin_end;
 import containers.c_array;
-import containers.data;
 import containers.is_container;
 import containers.maximum_array_size;
-import containers.range_value_t;
 
 import bounded;
 import std_module;
@@ -169,61 +167,3 @@ template<std::size_t index, typename T, containers::array_size_type<T> size>
 struct std::tuple_element<index, ::containers::array<T, size>> {
 	using type = T;
 };
-
-namespace {
-
-constexpr auto size = 5_bi;
-constexpr containers::array<int, size> a = {};
-static_assert(a.size() == size, "Incorrect size.");
-static_assert(a[0_bi] == 0, "Incorrect value.");
-
-static_assert(std::is_standard_layout_v<containers::array<int, 0_bi>>);
-static_assert(std::is_trivial_v<containers::array<int, 0_bi>>);
-static_assert(std::is_empty_v<containers::array<int, 0_bi>>);
-
-template<typename T>
-concept qualifiers_are_contiguous_ranges = 
-	containers::contiguous_range<T const &> and
-	containers::contiguous_range<T &>;
-
-static_assert(qualifiers_are_contiguous_ranges<containers::array<int, 0_bi>>);
-static_assert(qualifiers_are_contiguous_ranges<containers::array<int, 5_bi>>);
-
-static_assert(containers::is_container<containers::array<int, 0_bi>>);
-static_assert(containers::is_container<containers::array<int, 1_bi>>);
-
-static_assert(bounded::convertible_to<containers::array<int, 3_bi> const &, std::span<int const>>);
-static_assert(!bounded::convertible_to<containers::array<int, 3_bi> const &, std::span<int>>);
-static_assert(bounded::convertible_to<containers::array<int, 3_bi> &, std::span<int const>>);
-static_assert(bounded::convertible_to<containers::array<int, 3_bi> &, std::span<int>>);
-
-static_assert(bounded::convertible_to<containers::array<int, 3_bi> const &, std::span<int const, 3>>);
-static_assert(!bounded::convertible_to<containers::array<int, 3_bi> const &, std::span<int, 3>>);
-static_assert(bounded::convertible_to<containers::array<int, 3_bi> &, std::span<int const, 3>>);
-static_assert(bounded::convertible_to<containers::array<int, 3_bi> &, std::span<int, 3>>);
-
-constexpr auto array_n = containers::make_array_n(6_bi, 5);
-static_assert(std::same_as<containers::range_value_t<decltype(array_n)>, int>, "Incorrect type from make_array_n.");
-static_assert(array_n.size() == 6_bi, "Incorrect size from make_array_n.");
-static_assert(array_n[3_bi] == 5, "Incorrect values from make_array_n.");
-
-struct non_copyable {
-	non_copyable() = default;
-	non_copyable(non_copyable const &) = delete;
-	non_copyable(non_copyable &&) = default;
-};
-
-constexpr auto array_non_copyable = containers::make_array_n(1_bi, non_copyable());
-static_assert(array_non_copyable.size() == 1_bi);
-
-constexpr auto array_empty = containers::make_array_n(0_bi, 2);
-static_assert(array_empty.size() == 0_bi);
-
-constexpr auto array_non_copyable_empty = containers::make_array_n(0_bi, non_copyable());
-static_assert(array_non_copyable_empty.size() == 0_bi);
-
-constexpr auto large_size = 10000_bi;
-constexpr auto large_array_n = containers::make_array_n(large_size, 0);
-static_assert(large_array_n.size() == large_size);
-
-} // namespace

source/containers/test/array.cpp

@@ -8,12 +8,76 @@ export module containers.test.array;
 import containers.test.test_sequence_container;
 
 import containers.array;
+import containers.data;
+import containers.is_container;
+import containers.range_value_t;
 
 import bounded;
+import std_module;
 
+namespace {
+	
 using namespace bounded::literal;
+	
+constexpr auto size = 5_bi;
+constexpr containers::array<int, size> a = {};
+static_assert(a.size() == size, "Incorrect size.");
+static_assert(a[0_bi] == 0, "Incorrect value.");
 
-static_assert(containers_test::test_sequence_container_default_constructed_empty<containers::array<int, 0_bi>>());
-static_assert(containers_test::test_sequence_container_implicit_from_two_empty_braces<containers::array<int, 0_bi>>());
-static_assert(containers_test::test_special_members<containers::array<int, 0_bi>>([] { return containers::array<int, 0_bi>({}); }));
-static_assert(containers_test::test_special_members<containers::array<int, 5_bi>>([] { return containers::array({0, 1, 2, 3, 4}); }));
+static_assert(std::is_standard_layout_v<containers::array<int, 0_bi>>);
+static_assert(std::is_trivial_v<containers::array<int, 0_bi>>);
+static_assert(std::is_empty_v<containers::array<int, 0_bi>>);
+
+template<typename T>
+concept qualifiers_are_contiguous_ranges = 
+	containers::contiguous_range<T const &> and
+	containers::contiguous_range<T &>;
+
+static_assert(qualifiers_are_contiguous_ranges<containers::array<int, 0_bi>>);
+static_assert(qualifiers_are_contiguous_ranges<containers::array<int, 5_bi>>);
+
+static_assert(containers::is_container<containers::array<int, 0_bi>>);
+static_assert(containers::is_container<containers::array<int, 1_bi>>);
+
+static_assert(bounded::convertible_to<containers::array<int, 3_bi> const &, std::span<int const>>);
+static_assert(!bounded::convertible_to<containers::array<int, 3_bi> const &, std::span<int>>);
+static_assert(bounded::convertible_to<containers::array<int, 3_bi> &, std::span<int const>>);
+static_assert(bounded::convertible_to<containers::array<int, 3_bi> &, std::span<int>>);
+
+static_assert(bounded::convertible_to<containers::array<int, 3_bi> const &, std::span<int const, 3>>);
+static_assert(!bounded::convertible_to<containers::array<int, 3_bi> const &, std::span<int, 3>>);
+static_assert(bounded::convertible_to<containers::array<int, 3_bi> &, std::span<int const, 3>>);
+static_assert(bounded::convertible_to<containers::array<int, 3_bi> &, std::span<int, 3>>);
+
+constexpr auto array_n = containers::make_array_n(6_bi, 5);
+static_assert(std::same_as<containers::range_value_t<decltype(array_n)>, int>, "Incorrect type from make_array_n.");
+static_assert(array_n.size() == 6_bi, "Incorrect size from make_array_n.");
+static_assert(array_n[3_bi] == 5, "Incorrect values from make_array_n.");
+
+struct non_copyable {
+	non_copyable() = default;
+	non_copyable(non_copyable const &) = delete;
+	non_copyable(non_copyable &&) = default;
+};
+
+constexpr auto array_non_copyable = containers::make_array_n(1_bi, non_copyable());
+static_assert(array_non_copyable.size() == 1_bi);
+
+constexpr auto array_empty = containers::make_array_n(0_bi, 2);
+static_assert(array_empty.size() == 0_bi);
+
+constexpr auto array_non_copyable_empty = containers::make_array_n(0_bi, non_copyable());
+static_assert(array_non_copyable_empty.size() == 0_bi);
+
+constexpr auto large_size = 10000_bi;
+constexpr auto large_array_n = containers::make_array_n(large_size, 0);
+static_assert(large_array_n.size() == large_size);
+
+using namespace containers_test;
+
+static_assert(test_sequence_container_default_constructed_empty<containers::array<int, 0_bi>>());
+static_assert(test_sequence_container_implicit_from_two_empty_braces<containers::array<int, 0_bi>>());
+static_assert(test_special_members<containers::array<int, 0_bi>>([] { return containers::array<int, 0_bi>({}); }));
+static_assert(test_special_members<containers::array<int, 5_bi>>([] { return containers::array({0, 1, 2, 3, 4}); }));
+
+} // namespace