Skip to content

Commit efc3340

Browse files
committed
Move tests for fixed_size_merge_sort into their own file
1 parent a9d94ec commit efc3340

File tree

3 files changed

+28
-15
lines changed

3 files changed

+28
-15
lines changed

source/containers/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ target_sources(containers_test PRIVATE
218218
FILES
219219
test/sort/chunked_insertion_sort.cpp
220220
test/sort/double_buffered_ska_sort.cpp
221+
test/sort/fixed_size_merge_sort.cpp
221222
test/sort/sort_test_data.cpp
222223
test/sort/ska_sort.cpp
223224
test/sort/sort.cpp

source/containers/algorithms/sort/fixed_size_merge_sort.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ import containers.algorithms.sort.sort_exactly_5;
1313

1414
import containers.algorithms.uninitialized;
1515

16-
import containers.array;
17-
import containers.begin_end;
18-
import containers.contiguous_iterator;
1916
import containers.subrange;
2017
import containers.uninitialized_array;
2118

@@ -57,15 +54,3 @@ export constexpr auto fixed_size_merge_sort(auto it, auto const size1, auto cons
5754
}
5855

5956
} // namespace containers
60-
61-
static_assert([]{
62-
auto container = containers::array{0, 1};
63-
containers::fixed_size_merge_sort(containers::begin(container), 1_bi, 1_bi, std::less());
64-
return container == containers::array{0, 1};
65-
}());
66-
67-
static_assert([]{
68-
auto container = containers::array{1, 0};
69-
containers::fixed_size_merge_sort(containers::begin(container), 1_bi, 1_bi, std::less());
70-
return container == containers::array{0, 1};
71-
}());
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Copyright David Stone 2023.
2+
// Distributed under the Boost Software License, Version 1.0.
3+
// (See accompanying file LICENSE_1_0.txt or copy at
4+
// http://www.boost.org/LICENSE_1_0.txt)
5+
6+
export module containers.test.algorithms.sort.fixed_size_merge_sort;
7+
8+
import containers.algorithms.sort.fixed_size_merge_sort;
9+
import containers.array;
10+
import containers.begin_end;
11+
12+
import bounded;
13+
import std_module;
14+
15+
using namespace bounded::literal;
16+
17+
static_assert([]{
18+
auto container = containers::array{0, 1};
19+
containers::fixed_size_merge_sort(containers::begin(container), 1_bi, 1_bi, std::less());
20+
return container == containers::array{0, 1};
21+
}());
22+
23+
static_assert([]{
24+
auto container = containers::array{1, 0};
25+
containers::fixed_size_merge_sort(containers::begin(container), 1_bi, 1_bi, std::less());
26+
return container == containers::array{0, 1};
27+
}());

0 commit comments

Comments
 (0)