X-Git-Url: http://git.scottworley.com/slidingtile/blobdiff_plain/49358f3664c36c346dba758ae1b7da9106c42e3b..310a7132ffc617b93969703de7f3bf1c5ea0fa30:/sliding_tile_lib_test.cc?ds=sidebyside

diff --git a/sliding_tile_lib_test.cc b/sliding_tile_lib_test.cc
index d57c7a4..5597a1b 100644
--- a/sliding_tile_lib_test.cc
+++ b/sliding_tile_lib_test.cc
@@ -6,7 +6,6 @@
 #include <sstream>
 
 using testing::Field;
-using testing::ElementsAreArray;
 
 TEST(Step, Adjacency) {
 	const signed char LEFT  = -1;
@@ -37,13 +36,33 @@ TEST(Step, Adjacency) {
   }
 }
 
+TEST(Board, Equal) {
+  Board b1{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}};
+  Board b2{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}};
+  EXPECT_TRUE(b1 == b2);
+  EXPECT_FALSE(b1 != b2);
+  EXPECT_EQ(b1, b2);
+  EXPECT_FALSE(b1 < b2);
+  EXPECT_FALSE(b2 < b1);
+}
+
+TEST(Board, NotEqual) {
+  Board b1{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}};
+  Board b2{{1,2,3,4,5,6,7,8,10,9,11,12,13,14,15,0}};
+  EXPECT_FALSE(b1 == b2);
+  EXPECT_TRUE(b1 != b2);
+  EXPECT_NE(b1, b2);
+  EXPECT_TRUE(b1 < b2);
+  EXPECT_FALSE(b2 < b1);
+}
+
 TEST(Board, GoodInput) {
   std::istringstream is{"15,14,9,13,3,1,12,8,0,11,6,4,7,5,2,10"};
   Board b;
   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) {
@@ -121,31 +140,31 @@ TEST(Board, MaxDistance) {
 }
 
 TEST(Step, TwoSuccessors) {
-  auto s = std::shared_ptr<Step>(new Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, nullptr});
+  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);
   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::shared_ptr<Step>(new Step{{{1,2,3,4,5,0,6,7,8,9,10,11,12,13,14,15}}, nullptr});
+  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);
   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) {
-  auto s1 = std::shared_ptr<Step>(new Step{{{1,2,3,4,5,7,11,8,9,6,0,12,13,10,14,15}}, nullptr});
-  auto s2 = std::shared_ptr<Step>(new Step{{{1,2,3,4,5,7,0,8,9,6,11,12,13,10,14,15}}, s1});
-  auto s3 = std::shared_ptr<Step>(new Step{{{1,2,3,4,5,0,7,8,9,6,11,12,13,10,14,15}}, s2});
-  auto s4 = std::shared_ptr<Step>(new Step{{{1,2,3,4,5,6,7,8,9,0,11,12,13,10,14,15}}, s3});
-  auto s5 = std::shared_ptr<Step>(new Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,0,14,15}}, s4});
-  auto s6 = std::shared_ptr<Step>(new Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,0,15}}, s5});
-  auto s7 = std::shared_ptr<Step>(new Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, s6});
+  auto s1 = std::make_shared<Step>(Step{{{1,2,3,4,5,7,11,8,9,6,0,12,13,10,14,15}}, nullptr});
+  auto s2 = std::make_shared<Step>(Step{{{1,2,3,4,5,7,0,8,9,6,11,12,13,10,14,15}}, s1});
+  auto s3 = std::make_shared<Step>(Step{{{1,2,3,4,5,0,7,8,9,6,11,12,13,10,14,15}}, s2});
+  auto s4 = std::make_shared<Step>(Step{{{1,2,3,4,5,6,7,8,9,0,11,12,13,10,14,15}}, s3});
+  auto s5 = std::make_shared<Step>(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,0,14,15}}, s4});
+  auto s6 = std::make_shared<Step>(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,0,15}}, s5});
+  auto s7 = std::make_shared<Step>(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, s6});
   std::ostringstream actual;
   actual << *s7;
   std::ostringstream expected;