Switch from priority_queue to multimap

[slidingtile] / sliding_tile_lib_test.cc

diff --git a/sliding_tile_lib_test.cc b/sliding_tile_lib_test.cc
index 5597a1b3bcb1b638fec2b1041a4cccdd10336177..25b0e76f55dcc4455cba1daa9dac8e45dfd9daa6 100644 (file)
--- a/sliding_tile_lib_test.cc
+++ b/sliding_tile_lib_test.cc
@@ -6,6 +6,7 @@
 #include <sstream>
 
 using testing::Field;
 #include <sstream>
 
 using testing::Field;

+using testing::Pointee;

 
 TEST(Step, Adjacency) {
        const signed char LEFT  = -1;
 
 TEST(Step, Adjacency) {
        const signed char LEFT  = -1;


@@ -141,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});
 
 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(
   EXPECT_THAT(suc, testing::UnorderedElementsAre(

-    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}})));
+    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});
 }
 
 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(
   EXPECT_THAT(suc, testing::UnorderedElementsAre(

-    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}})));
+    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) {
 }
 
 TEST(Step, Output) {