Skip to content

[libc++][test] Fix test not relying on MinSequenceContainer #140372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 30, 2025
Merged

[libc++][test] Fix test not relying on MinSequenceContainer #140372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5399bfa
[libc++][test] Fix test not relying on MinSequenceContainer
huixie90 May 17, 2025
23c6407
Merge branch 'main' into hxie/fix_test
huixie90 May 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions libcxx/test/libcxx/containers/container.adaptors/flat.multiset/insert_range.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,27 @@
// out there are in that situation.
// https://github.com/llvm/llvm-project/issues/136656

#include <algorithm>
#include <cassert>
#include <flat_set>
#include <ranges>
#include <sstream>
#include <vector>

#include "MinSequenceContainer.h"
#include "../flat_helpers.h"
#include "test_macros.h"

void test() {
MinSequenceContainer<int> v;
NotQuiteSequenceContainer<int> v;
std::flat_multiset s(v);
std::istringstream ints("0 1 1 0");
auto r = std::ranges::subrange(std::istream_iterator<int>(ints), std::istream_iterator<int>()) |
std::views::transform([](int i) { return i * i; });
static_assert(
![](auto& t) { return requires { t.insert_range(r); }; }(v),
![](auto& t) { return requires { t.insert_range(t.end(), r); }; }(v),
"This test is to test the case where the underlying container does not provide insert_range");
s.insert_range(r);
assert(std::ranges::equal(s, std::vector<int>{0, 0, 1, 1}));
}

int main(int, char**) {
Expand Down
9 changes: 6 additions & 3 deletions libcxx/test/libcxx/containers/container.adaptors/flat.set/insert_range.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,27 @@
// out there are in that situation.
// https://github.com/llvm/llvm-project/issues/136656

#include <algorithm>
#include <cassert>
#include <flat_set>
#include <ranges>
#include <sstream>
#include <vector>

#include "MinSequenceContainer.h"
#include "../flat_helpers.h"
#include "test_macros.h"

void test() {
MinSequenceContainer<int> v;
NotQuiteSequenceContainer<int> v;
std::flat_set s(v);
std::istringstream ints("0 1 1 0");
auto r = std::ranges::subrange(std::istream_iterator<int>(ints), std::istream_iterator<int>()) |
std::views::transform([](int i) { return i * i; });
static_assert(
![](auto& t) { return requires { t.insert_range(r); }; }(v),
![](auto& t) { return requires { t.insert_range(t.end(), r); }; }(v),
"This test is to test the case where the underlying container does not provide insert_range");
s.insert_range(r);
assert(std::ranges::equal(s, std::vector<int>{0, 1}));
}

int main(int, char**) {
Expand Down
8 changes: 8 additions & 0 deletions libcxx/test/libcxx/containers/container.adaptors/flat_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#ifndef TEST_LIBCXX_CONTAINERS_CONTAINER_ADAPTORS_FLAT_HELPERS_H
#define TEST_LIBCXX_CONTAINERS_CONTAINER_ADAPTORS_FLAT_HELPERS_H

#include <vector>

struct TrackCopyMove {
mutable int copy_count = 0;
int move_count = 0;
Expand Down Expand Up @@ -37,4 +39,10 @@ struct TrackCopyMove {
constexpr bool operator<(const TrackCopyMove&) const { return false; }
};

template <class T>
struct NotQuiteSequenceContainer : std::vector<T> {
// hide the name insert_range
void insert_range() = delete;
};

#endif // TEST_LIBCXX_CONTAINERS_CONTAINER_ADAPTORS_FLAT_HELPERS_H
Loading