Changeset eb129c for molecuilder/src

Timestamp:

Mar 25, 2010, 1:00:29 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

b787af

Parents:

fe3540 (diff), c3294f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' into MenuRefactoring

File:

• molecuilder/src/unittests/manipulateAtomsTest.cpp (modified) (3 diffs)

molecuilder/src/unittests/manipulateAtomsTest.cpp

@@ -18 +18 @@
 #include "Actions/ManipulateAtomsProcess.hpp"
 #include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionHistory.hpp"
 
 #include "World.hpp"
@@ -70 +71 @@
 // set up and tear down
 void manipulateAtomsTest::setUp(){
+  ActionHistory::init();
   World::getInstance();
   for(int i=0;i<ATOM_COUNT;++i){
@@ -79 +81 @@
   World::purgeInstance();
   ActionRegistry::purgeInstance();
+  ActionHistory::purgeInstance();
 }