Changes in src/unittests/ActionSequenceTest.cpp [f59d81:5b0b98]

File:

• src/unittests/ActionSequenceTest.cpp (modified) (4 diffs)

src/unittests/ActionSequenceTest.cpp

@@ -35 +35 @@
   virtual ~canUndoActionStub(){}
 
-  virtual void call(){}
-  virtual void undo(){}
+  virtual Action::state_ptr performCall(){
+    return Action::success;
+  }
+  virtual Action::state_ptr performUndo(Action::state_ptr){
+    return Action::success;
+  }
+  virtual Action::state_ptr performRedo(Action::state_ptr){
+    return Action::success;
+  }
   virtual bool canUndo(){
+    return true;
+  }
+  virtual bool shouldUndo(){
     return true;
   }
@@ -48 +58 @@
   virtual ~cannotUndoActionStub(){}
 
-  virtual void call(){}
-  virtual void undo(){}
+  virtual Action::state_ptr performCall(){
+    return Action::success;
+  }
+  virtual Action::state_ptr performUndo(Action::state_ptr){
+    return Action::success;
+  }
+  virtual Action::state_ptr performRedo(Action::state_ptr){
+    return Action::success;
+  }
   virtual bool canUndo(){
     return false;
+  }
+  virtual bool shouldUndo(){
+   return true;
   }
 };
@@ -64 +84 @@
   virtual ~wasCalledActionStub(){}
 
-  virtual void call(){
+  virtual Action::state_ptr performCall(){
     called = true;
-  }
-  virtual void undo(){
+    return Action::success;
+  }
+  virtual Action::state_ptr performUndo(Action::state_ptr){
     called = false;
+    return Action::success;
+  }
+  virtual Action::state_ptr performRedo(Action::state_ptr){
+    called = true;
+    return Action::success;
   }
   virtual bool canUndo(){
+    return true;
+  }
+  virtual bool shouldUndo(){
     return true;
   }
@@ -185 +214 @@
   sequence->addAction(shouldCall2);
 
-  sequence->callAll();
-
-  sequence->removeLastAction();
-  sequence->removeLastAction();
-
-  sequence->undoAll();
+  ActionSequence::stateSet states = sequence->callAll();
+
+  sequence->removeLastAction();
+  sequence->removeLastAction();
+
+  sequence->undoAll(states);
 
   CPPUNIT_ASSERT_EQUAL(true,shouldCall1->wasCalled());