X-Git-Url: http://git.scottworley.com/slidingtile/blobdiff_plain/0e89d341b7be7fa1861892cbcb216bc188f02e60..ab51c07a99c1927c95a123e6912925adba83714f:/sliding_tile_lib_test.cc

diff --git a/sliding_tile_lib_test.cc b/sliding_tile_lib_test.cc
index a27361d..25b0e76 100644
--- a/sliding_tile_lib_test.cc
+++ b/sliding_tile_lib_test.cc
@@ -6,7 +6,7 @@
 #include <sstream>
 
 using testing::Field;
-using testing::ElementsAreArray;
+using testing::Pointee;
 
 TEST(Step, Adjacency) {
 	const signed char LEFT  = -1;
@@ -43,6 +43,8 @@ TEST(Board, Equal) {
   EXPECT_TRUE(b1 == b2);
   EXPECT_FALSE(b1 != b2);
   EXPECT_EQ(b1, b2);
+  EXPECT_FALSE(b1 < b2);
+  EXPECT_FALSE(b2 < b1);
 }
 
 TEST(Board, NotEqual) {
@@ -51,6 +53,8 @@ TEST(Board, NotEqual) {
   EXPECT_FALSE(b1 == b2);
   EXPECT_TRUE(b1 != b2);
   EXPECT_NE(b1, b2);
+  EXPECT_TRUE(b1 < b2);
+  EXPECT_FALSE(b2 < b1);
 }
 
 TEST(Board, GoodInput) {
@@ -59,7 +63,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) {
@@ -138,20 +142,20 @@ TEST(Board, MaxDistance) {
 
 TEST(Step, TwoSuccessors) {
   auto s = std::make_shared<Step>(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, nullptr});
-  std::vector<Step*> suc = s->successors(s);
+  std::vector<std::shared_ptr<Step>> 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})))));
+    Pointee(Field(&Step::board, Board{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,0,15}})),
+    Pointee(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>(Step{{{1,2,3,4,5,0,6,7,8,9,10,11,12,13,14,15}}, nullptr});
-  std::vector<Step*> suc = s->successors(s);
+  std::vector<std::shared_ptr<Step>> 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})))));
+    Pointee(Field(&Step::board, Board{{1,2,3,4,0,5,6,7,8,9,10,11,12,13,14,15}})),
+    Pointee(Field(&Step::board, Board{{1,2,3,4,5,6,0,7,8,9,10,11,12,13,14,15}})),
+    Pointee(Field(&Step::board, Board{{1,0,3,4,5,2,6,7,8,9,10,11,12,13,14,15}})),
+    Pointee(Field(&Step::board, Board{{1,2,3,4,5,9,6,7,8,0,10,11,12,13,14,15}}))));
 }
 
 TEST(Step, Output) {