Fix test

Author: HIROSN

tests/unittests/RouteTests.cpp

@@ -60,23 +60,20 @@ class Canary : public std::string {
 
 class RouteTests : public StrictMock<Test> {
   public:
-    RouteSink<RouteTests>                                                                  sink0{this, &RouteTests::handleSink0};
-    RouteSink<RouteTests, int>                                                             sink1{this, &RouteTests::handleSink1};
-    RoutePassThrough<RouteTests, int>                                                      passThrough1a{this, &RouteTests::handlePassThrough1a};
-    RoutePassThrough<RouteTests, int>                                                      passThrough1b{this, &RouteTests::handlePassThrough1b};
-    RouteSink<RouteTests, int, bool&, NonCopyableThing const&, Canary, std::vector<int>&&> sink5{this, &RouteTests::handleSink5x};
+    RouteSink<RouteTests>                                                                 sink0{this, &RouteTests::handleSink0};
+    RouteSink<RouteTests, int>                                                            sink1{this, &RouteTests::handleSink1};
+    RoutePassThrough<RouteTests, int>                                                     passThrough1a{this, &RouteTests::handlePassThrough1a};
+    RoutePassThrough<RouteTests, int>                                                     passThrough1b{this, &RouteTests::handlePassThrough1b};
+    RouteSink<RouteTests, int, bool&, NonCopyableThing const&, Canary, std::vector<int>&> sink5{this, &RouteTests::handleSink5x};
 
     MOCK_METHOD0(handleSink0, void());
     MOCK_METHOD1(handleSink1, void(int));
     MOCK_METHOD1(handlePassThrough1a, bool(int));
     MOCK_METHOD1(handlePassThrough1b, bool(int));
     MOCK_METHOD4(handleSink5, void(int, bool&, NonCopyableThing const &, Canary));
 
-    void handleSink5x(int a, bool& b, NonCopyableThing const& c, Canary d, std::vector<int>&& e)
+    void handleSink5x(int a, bool& b, NonCopyableThing const& c, Canary d, std::vector<int>&)
     {
-        // This extra function exists just to handle the r-value reference.
-        // The move cannot be done properly in a mocked method.
-        std::vector<int> x = std::move(e);
         handleSink5(a, b, c, d);
     }
 };
@@ -99,11 +96,11 @@ TEST_F(RouteTests, SinkPassesArgsAsDefined)
         SetArgReferee<1>(true),
         InvokeArgument<3>()
         ));
-    sink5(123, flag, thing, canary, std::move(data));
+    sink5(123, flag, thing, canary, data);
 
     EXPECT_THAT(flag, true);
     EXPECT_THAT(canary, Eq("alive"));
-    EXPECT_THAT(data, IsEmpty());
+    EXPECT_THAT(data, Not(IsEmpty()));
 }
 
 TEST_F(RouteTests, SourceIsNoopWhenUnbound)