Skip to content

Commit 14d50bc

Browse files
authored
[NFC][STLExtras] Use GTest matchers for drop_begin/drop_end tests (#164539)
1 parent d11b7bd commit 14d50bc

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

llvm/unittests/ADT/STLExtrasTest.cpp

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/ADT/STLExtras.h"
10+
#include "llvm/ADT/ArrayRef.h"
1011
#include "llvm/ADT/StringRef.h"
1112
#include "gmock/gmock.h"
1213
#include "gtest/gtest.h"
@@ -27,6 +28,7 @@
2728
using namespace llvm;
2829

2930
using testing::ElementsAre;
31+
using testing::ElementsAreArray;
3032
using testing::UnorderedElementsAre;
3133

3234
namespace {
@@ -772,48 +774,30 @@ TEST(STLExtrasTest, DropBeginTest) {
772774
SmallVector<int, 5> vec{0, 1, 2, 3, 4};
773775

774776
for (int n = 0; n < 5; ++n) {
775-
int i = n;
776-
for (auto &v : drop_begin(vec, n)) {
777-
EXPECT_EQ(v, i);
778-
i += 1;
779-
}
780-
EXPECT_EQ(i, 5);
777+
EXPECT_THAT(drop_begin(vec, n),
778+
ElementsAreArray(ArrayRef(&vec[n], vec.size() - n)));
781779
}
782780
}
783781

784782
TEST(STLExtrasTest, DropBeginDefaultTest) {
785783
SmallVector<int, 5> vec{0, 1, 2, 3, 4};
786784

787-
int i = 1;
788-
for (auto &v : drop_begin(vec)) {
789-
EXPECT_EQ(v, i);
790-
i += 1;
791-
}
792-
EXPECT_EQ(i, 5);
785+
EXPECT_THAT(drop_begin(vec), ElementsAre(1, 2, 3, 4));
793786
}
794787

795788
TEST(STLExtrasTest, DropEndTest) {
796789
SmallVector<int, 5> vec{0, 1, 2, 3, 4};
797790

798791
for (int n = 0; n < 5; ++n) {
799-
int i = 0;
800-
for (auto &v : drop_end(vec, n)) {
801-
EXPECT_EQ(v, i);
802-
i += 1;
803-
}
804-
EXPECT_EQ(i, 5 - n);
792+
EXPECT_THAT(drop_end(vec, n),
793+
ElementsAreArray(ArrayRef(vec.data(), vec.size() - n)));
805794
}
806795
}
807796

808797
TEST(STLExtrasTest, DropEndDefaultTest) {
809798
SmallVector<int, 5> vec{0, 1, 2, 3, 4};
810799

811-
int i = 0;
812-
for (auto &v : drop_end(vec)) {
813-
EXPECT_EQ(v, i);
814-
i += 1;
815-
}
816-
EXPECT_EQ(i, 4);
800+
EXPECT_THAT(drop_end(vec), ElementsAre(0, 1, 2, 3));
817801
}
818802

819803
TEST(STLExtrasTest, MapRangeTest) {

0 commit comments

Comments
 (0)