From 9b1ce99505059bba03b178c45721c73f3d36fb35 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Sat, 9 Jan 2016 01:56:52 -0800 Subject: [PATCH 1/1] Use Board's == instead of ElementsAreArray --- sliding_tile_lib_test.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sliding_tile_lib_test.cc b/sliding_tile_lib_test.cc index a27361d..54d7db6 100644 --- a/sliding_tile_lib_test.cc +++ b/sliding_tile_lib_test.cc @@ -6,7 +6,6 @@ #include using testing::Field; -using testing::ElementsAreArray; TEST(Step, Adjacency) { const signed char LEFT = -1; @@ -59,7 +58,7 @@ TEST(Board, GoodInput) { is >> b; EXPECT_FALSE(is.fail()); EXPECT_TRUE(is.eof()); - EXPECT_THAT(b.board, ElementsAreArray({15,14,9,13,3,1,12,8,0,11,6,4,7,5,2,10})); + EXPECT_EQ((Board{{15,14,9,13,3,1,12,8,0,11,6,4,7,5,2,10}}), b); } TEST(Board, ShortInput) { @@ -140,18 +139,18 @@ TEST(Step, TwoSuccessors) { auto s = std::make_shared(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, nullptr}); std::vector suc = s->successors(s); EXPECT_THAT(suc, testing::UnorderedElementsAre( - Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,5,6,7,8,9,10,11,12,13,14,0,15}))), - Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,5,6,7,8,9,10,11,0,13,14,15,12}))))); + Field(&Step::board, Board{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,0,15}}), + Field(&Step::board, Board{{1,2,3,4,5,6,7,8,9,10,11,0,13,14,15,12}}))); } TEST(Step, FourSuccessors) { auto s = std::make_shared(Step{{{1,2,3,4,5,0,6,7,8,9,10,11,12,13,14,15}}, nullptr}); std::vector suc = s->successors(s); EXPECT_THAT(suc, testing::UnorderedElementsAre( - Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,0,5,6,7,8,9,10,11,12,13,14,15}))), - Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,5,6,0,7,8,9,10,11,12,13,14,15}))), - Field(&Step::board, Field(&Board::board, ElementsAreArray({1,0,3,4,5,2,6,7,8,9,10,11,12,13,14,15}))), - Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,5,9,6,7,8,0,10,11,12,13,14,15}))))); + Field(&Step::board, Board{{1,2,3,4,0,5,6,7,8,9,10,11,12,13,14,15}}), + Field(&Step::board, Board{{1,2,3,4,5,6,0,7,8,9,10,11,12,13,14,15}}), + Field(&Step::board, Board{{1,0,3,4,5,2,6,7,8,9,10,11,12,13,14,15}}), + Field(&Step::board, Board{{1,2,3,4,5,9,6,7,8,0,10,11,12,13,14,15}}))); } TEST(Step, Output) { -- 2.44.1