Merge pull request #301 from eranpeer/extend-action-lifetime

Extended lifetime of actions to match those of mocks.

Author: FranckRJ

include/fakeit/ActionSequence.hpp

@@ -44,7 +44,10 @@ namespace fakeit {
             Action<R, arglist...> &action = dynamic_cast<Action<R, arglist...> &>(destructable);
             std::function<void()> finallyClause = [&]() -> void {
                 if (action.isDone())
+                {
                     _recordedActions.erase(_recordedActions.begin());
+                    _usedActions.push_back(destructablePtr);
+                }
             };
             Finally onExit(finallyClause);
             return action.invoke(args);
@@ -76,11 +79,13 @@ namespace fakeit {
 
         void clear() {
             _recordedActions.clear();
+            _usedActions.clear();
             auto actionPtr = std::shared_ptr<Destructible> {new NoMoreRecordedAction()};
             _recordedActions.push_back(actionPtr);
         }
 
         std::vector<std::shared_ptr<Destructible>> _recordedActions;
+        std::vector<std::shared_ptr<Destructible>> _usedActions;
     };
 
 }

tests/stubbing_tests.cpp

@@ -54,7 +54,8 @@ struct BasicStubbing : tpunit::TestFixture {
                     TEST(BasicStubbing::exception_while_stubbing_should_cancel_stubbing),
                     TEST(BasicStubbing::reset_mock_to_initial_state),
                     TEST(BasicStubbing::use_lambda_to_change_ptr_value),
-                    TEST(BasicStubbing::assingOutParamsWithLambda)
+                    TEST(BasicStubbing::assingOutParamsWithLambda),
+                    TEST(BasicStubbing::return_ref_to_lambda_member)
             ) {
     }
 
@@ -63,6 +64,7 @@ struct BasicStubbing : tpunit::TestFixture {
         virtual int funcNoArgs() = 0;
         virtual int funcRefArgs(int*, int&) = 0;
         virtual int funcConvertibleNotAssignableArgs1(int&, int) = 0;
+        virtual const std::string& funcRetStrRef(int) = 0;
 
         virtual void proc(int) = 0;
         virtual void procRefArgs(int*, int&) = 0;
@@ -868,5 +870,18 @@ struct BasicStubbing : tpunit::TestFixture {
         ASSERT_EQUAL(3,result);
     }
 
+    void return_ref_to_lambda_member() {
+        Mock<SomeInterface> mock;
+
+        std::string str = "Some string with some content inside it";
+        When(Method(mock, funcRetStrRef)).Do([str](int) -> const std::string& {return str;});
+
+        SomeInterface& i = mock.get();
+
+        ASSERT_EQUAL(i.funcRetStrRef(5), str);
+
+        ASSERT_THROW(i.funcRetStrRef(5), fakeit::UnexpectedMethodCallException);
+    }
+
 } __BasicStubbing;