Changes in src/unittests/ActionSequenceTest.cpp [0b2ce9:e4afb4]

File:

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

src/unittests/ActionSequenceTest.cpp

@@ -44 +44 @@
 {
 public:
-  canUndoActionStub(): Action("canUndoActionStub",false){}
+  canUndoActionStub(const ActionTraits &_trait):
+    Action(_trait,false){}
   virtual ~canUndoActionStub(){}
 
@@ -75 +76 @@
 {
 public:
-  cannotUndoActionStub() : Action("cannotUndoActionStub",false){}
+  cannotUndoActionStub(const ActionTraits &_trait) :
+    Action(_trait,false){}
   virtual ~cannotUndoActionStub(){}
 
@@ -106 +108 @@
 {
 public:
-  wasCalledActionStub() :
-      Action("wasCalledActionStub",false),
+  wasCalledActionStub(const ActionTraits &_trait) :
+      Action(_trait,false),
       called(false)
   {}
@@ -153 +155 @@
   UIFactory::makeUserInterface("Dummy");
   // create some necessary stubs used in this test
-  positive1 = new canUndoActionStub();
-  positive2 = new canUndoActionStub();
-  negative1 = new cannotUndoActionStub();
-  negative2 = new cannotUndoActionStub();
-
-  shouldCall1 = new wasCalledActionStub();
-  shouldCall2 = new wasCalledActionStub();
-  shouldNotCall1 = new wasCalledActionStub();
-  shouldNotCall2 = new wasCalledActionStub();
+  ActionTraits canUndoTrait("canUndoActionStub");
+  ActionTraits cannotUndoTrait("cannotUndoActionStub");
+  positive1 = new canUndoActionStub(canUndoTrait);
+  positive2 = new canUndoActionStub(canUndoTrait);
+  negative1 = new cannotUndoActionStub(cannotUndoTrait);
+  negative2 = new cannotUndoActionStub(cannotUndoTrait);
+
+  ActionTraits wasCalledTrait("wasCalledActionStub");
+  shouldCall1 = new wasCalledActionStub(wasCalledTrait);
+  shouldCall2 = new wasCalledActionStub(wasCalledTrait);
+  shouldNotCall1 = new wasCalledActionStub(wasCalledTrait);
+  shouldNotCall2 = new wasCalledActionStub(wasCalledTrait);
 
 }
@@ -254 +259 @@
 void ActionSequenceTest::doesUndoTest(){
   ActionSequence *sequence = new ActionSequence();
-  wasCalledActionStub *wasCalled1 = new wasCalledActionStub();
-  wasCalledActionStub *wasCalled2 = new wasCalledActionStub();
+  ActionTraits wasCalledTrait("wasCalledActionStub");
+  wasCalledActionStub *wasCalled1 = new wasCalledActionStub(wasCalledTrait);
+  wasCalledActionStub *wasCalled2 = new wasCalledActionStub(wasCalledTrait);
   sequence->addAction(wasCalled1);
   sequence->addAction(wasCalled2);
 
-  MakroAction act("Test MakroAction",sequence,false);
+  ActionTraits MakroTrait("Test MakroAction");
+  MakroAction act(MakroTrait,sequence,false);
 
   act.call();