Changes in src/unittests/atomsCalculationTest.cpp [bcf653:e4afb4]

File:

• src/unittests/atomsCalculationTest.cpp (modified) (3 diffs)

src/unittests/atomsCalculationTest.cpp

@@ -31 +31 @@
 #include "Actions/AtomsCalculation_impl.hpp"
 #include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionTraits.hpp"
 
 #include "World.hpp"
@@ -88 +89 @@
 
 void atomsCalculationTest::testCalculateSimple(){
-  AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),"FOO",AllAtoms());
+  ActionTraits FooTrait("FOO");
+  AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),FooTrait,AllAtoms());
   std::vector<atomId_t> allIds = (*calc)();
   CPPUNIT_ASSERT(hasAllIds(allIds,atomIds));
@@ -95 +97 @@
 
 void atomsCalculationTest::testCalculateExcluded(){
+  ActionTraits FooTrait("FOO");
   atomId_t excluded = atomIds[ATOM_COUNT/2];
-  AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),"FOO",AllAtoms() && !AtomById(excluded));
+  AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),FooTrait,AllAtoms() && !AtomById(excluded));
   std::vector<atomId_t> allIds = (*calc)();
   std::set<atomId_t> excluded_set;