More warnings

[slidingtile] / sliding_tile_lib_test.cc

diff --git a/sliding_tile_lib_test.cc b/sliding_tile_lib_test.cc
index aea4ab7984b10f1f14750500ab73c3a153727e01..8e6cb89b96b1e8b58f0fca65f6994fd54da2964e 100644 (file)
--- a/sliding_tile_lib_test.cc
+++ b/sliding_tile_lib_test.cc
@@ -3,6 +3,7 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 #include <vector>
+#include <sstream>
 
 using testing::Field;
 using testing::ElementsAreArray;
@@ -120,7 +121,7 @@ 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}))),
@@ -128,7 +129,7 @@ TEST(Step, TwoSuccessors) {
 }
 
 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}))),
@@ -136,3 +137,23 @@ TEST(Step, FourSuccessors) {
     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})))));
 }
+
+TEST(Step, Output) {
+  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;
+  expected << "11 down" << std::endl
+           << "7 right" << std::endl
+           << "6 up"    << std::endl
+           << "10 up"   << std::endl
+           << "14 left" << std::endl
+           << "15 left" << std::endl;
+  EXPECT_EQ(expected.str(), actual.str());
+}