Skip to content

Commit

Permalink
Fix xtd::tunit::collection_assert::contains and xtd::tunit::collectio…
Browse files Browse the repository at this point in the history 
…n_assert::does_not_contain methods on linux
  • Loading branch information
@gammasoft71
gammasoft71 committed Nov 10, 2024
1 parent 605b8c8 commit cd1a18d
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions src/xtd.tunit/include/xtd/tunit/collection_assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,8 @@ namespace xtd {
/// ```
template<typename expected_t, typename actual_t>
static void contains(const expected_t& expected, const actual_t& actual, const std::string& message, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {
for (auto item : expected) {
if (std::find(actual.begin(), actual.end(), item) == actual.end()) {
for (const auto& item : expected) {
if (std::find_if(std::begin(actual), std::end(actual), [&](const auto& value) {return value == item;}) == std::end(actual)) {
fail("contains " + join_items(expected), join_items(actual), message, stack_frame);
return;
}
Expand All @@ -470,8 +470,8 @@ namespace xtd {
static void contains(const std::initializer_list<item_t>& expected, const std::initializer_list<item_t>& actual, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {contains(expected, actual, xtd::string::empty_string, stack_frame);}
template<typename item_t>
static void contains(const std::initializer_list<item_t>& expected, const std::initializer_list<item_t>& actual, const std::string& message, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {
for (auto item : expected) {
if (std::find(actual.begin(), actual.end(), item) == actual.end()) {
for (const auto& item : expected) {
if (std::find_if(std::begin(actual), std::end(actual), [&](const item_t& value) {return value == item;}) == std::end(actual)) {
fail("contains " + join_items(expected), join_items(actual), message, stack_frame);
return;
}
Expand All @@ -482,8 +482,8 @@ namespace xtd {
static void contains(const collection_t& expected, const std::initializer_list<item_t>& actual, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {contains(expected, actual, xtd::string::empty_string, stack_frame);}
template<typename collection_t, typename item_t>
static void contains(const collection_t& expected, const std::initializer_list<item_t>& actual, const std::string& message, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {
for (auto item : expected) {
if (std::find(actual.begin(), actual.end(), item) == actual.end()) {
for (const auto& item : expected) {
if (std::find_if(std::begin(actual), std::end(actual), [&](const item_t& value) {return value == item;}) == std::end(actual)) {
fail("contains " + join_items(expected), join_items(actual), message, stack_frame);
return;
}
Expand All @@ -494,8 +494,8 @@ namespace xtd {
static void contains(const std::initializer_list<item_t>& expected, const collection_t& actual, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {contains(expected, actual, xtd::string::empty_string, stack_frame);}
template<typename item_t, typename collection_t>
static void contains(const std::initializer_list<item_t>& expected, const collection_t& actual, const std::string& message, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {
for (auto item : expected) {
if (std::find(actual.begin(), actual.end(), item) == actual.end()) {
for (const auto& item : expected) {
if (std::find_if(std::begin(actual), std::end(actual), [&](const item_t& value) {return value == item;}) == std::end(actual)) {
fail("contains " + join_items(expected), join_items(actual), message, stack_frame);
return;
}
Expand Down Expand Up @@ -530,8 +530,8 @@ namespace xtd {
/// ```
template<typename expected_t, typename actual_t>
static void does_not_contain(const expected_t& expected, const actual_t& actual, const std::string& message, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {
for (auto item : expected) {
if (std::find(actual.begin(), actual.end(), item) == actual.end()) {
for (const auto& item : expected) {
if (std::find_if(std::begin(actual), std::end(actual), [&](const auto& value) {return value == item;}) == std::end(actual)) {
assert::succeed(message, stack_frame);
return;
}
Expand All @@ -544,8 +544,8 @@ namespace xtd {
static void does_not_contain(const std::initializer_list<item_t>& expected, const std::initializer_list<item_t>& actual, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {does_not_contain(expected, actual, xtd::string::empty_string, stack_frame);}
template<typename item_t>
static void does_not_contain(const std::initializer_list<item_t>& expected, const std::initializer_list<item_t>& actual, const std::string& message, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {
for (auto item : expected) {
if (std::find(actual.begin(), actual.end(), item) == actual.end()) {
for (const auto& item : expected) {
if (std::find_if(std::begin(actual), std::end(actual), [&](const item_t& value) {return value == item;}) == std::end(actual)) {
assert::succeed(message, stack_frame);
return;
}
Expand All @@ -556,8 +556,8 @@ namespace xtd {
static void does_not_contain(const collection_t& expected, const std::initializer_list<item_t>& actual, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {does_not_contain(expected, actual, xtd::string::empty_string, stack_frame);}
template<typename collection_t, typename item_t>
static void does_not_contain(const collection_t& expected, const std::initializer_list<item_t>& actual, const std::string& message, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {
for (auto item : expected) {
if (std::find(actual.begin(), actual.end(), item) == actual.end()) {
for (const auto& item : expected) {
if (std::find_if(std::begin(actual), std::end(actual), [&](const item_t& value) {return value == item;}) == std::end(actual)) {
assert::succeed(message, stack_frame);
return;
}
Expand All @@ -568,8 +568,8 @@ namespace xtd {
static void does_not_contain(const std::initializer_list<item_t>& expected, const collection_t& actual, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {does_not_contain(expected, actual, xtd::string::empty_string, stack_frame);}
template<typename item_t, typename collection_t>
static void does_not_contain(const std::initializer_list<item_t>& expected, const collection_t& actual, const std::string& message, const xtd::diagnostics::stack_frame& stack_frame = xtd::diagnostics::stack_frame::current()) {
for (auto item : expected) {
if (std::find(actual.begin(), actual.end(), item) == actual.end()) {
for (const auto& item : expected) {
if (std::find_if(std::begin(actual), std::end(actual), [&](const item_t& value) {return value == item;}) == std::end(actual)) {
assert::succeed(message, stack_frame);
return;
}
Expand Down Expand Up @@ -719,10 +719,10 @@ namespace xtd {
static bool __are_equivalent(const expected_t expected, const actual_t& actual) {
if (std::distance(expected.begin(), expected.end()) != std::distance(actual.begin(), actual.end())) return false;
for (auto iterator = expected.begin(); iterator != expected.end(); ++iterator)
if (std::find(actual.begin(), actual.end(), *iterator) == actual.end()) return false;
if (std::find_if(std::begin(actual), std::end(actual), [&](const auto& value) {return value == *iterator;}) == std::end(actual)) return false;
return true;
}

};
}
}

0 comments on commit cd1a18d

Please sign in to comment.