Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

    r23b547 re6fdbe  
    1717#include "AnalysisCorrelationToSurfaceUnitTest.hpp"
    1818
    19 #include "World.hpp"
    2019#include "atom.hpp"
    2120#include "boundary.hpp"
    … …  
    6160
    6261  // construct periodentafel
    63   tafel = World::getInstance().getPeriode();
     62  tafel = new periodentafel;
    6463  tafel->AddElement(hydrogen);
    6564  tafel->AddElement(carbon);
    6665
    6766  // construct molecule (tetraeder of hydrogens) base
    68   TestMolecule = World::getInstance().createMolecule();
    69   Walker = World::getInstance().createAtom();
     67  TestMolecule = new molecule(tafel);
     68  Walker = new atom();
    7069  Walker->type = hydrogen;
    7170  Walker->node->Init(1., 0., 1. );
    7271  TestMolecule->AddAtom(Walker);
    73   Walker = World::getInstance().createAtom();
     72  Walker = new atom();
    7473  Walker->type = hydrogen;
    7574  Walker->node->Init(0., 1., 1. );
    7675  TestMolecule->AddAtom(Walker);
    77   Walker = World::getInstance().createAtom();
     76  Walker = new atom();
    7877  Walker->type = hydrogen;
    7978  Walker->node->Init(1., 1., 0. );
    8079  TestMolecule->AddAtom(Walker);
    81   Walker = World::getInstance().createAtom();
     80  Walker = new atom();
    8281  Walker->type = hydrogen;
    8382  Walker->node->Init(0., 0., 0. );
    … …  
    8786  CPPUNIT_ASSERT_EQUAL( TestMolecule->AtomCount, 4 );
    8887
    89   TestList = World::getInstance().getMolecules();
     88  TestList = new MoleculeListClass;
    9089  TestMolecule->ActiveFlag = true;
    9190  TestList->insert(TestMolecule);
    … …  
    10099
    101100  // add outer atoms
    102   Walker = World::getInstance().createAtom();
     101  Walker = new atom();
    103102  Walker->type = carbon;
    104103  Walker->node->Init(4., 0., 4. );
    105104  TestMolecule->AddAtom(Walker);
    106   Walker = World::getInstance().createAtom();
     105  Walker = new atom();
    107106  Walker->type = carbon;
    108107  Walker->node->Init(0., 4., 4. );
    109108  TestMolecule->AddAtom(Walker);
    110   Walker = World::getInstance().createAtom();
     109  Walker = new atom();
    111110  Walker->type = carbon;
    112111  Walker->node->Init(4., 4., 0. );
    113112  TestMolecule->AddAtom(Walker);
    114113  // add inner atoms
    115   Walker = World::getInstance().createAtom();
     114  Walker = new atom();
    116115  Walker->type = carbon;
    117116  Walker->node->Init(0.5, 0.5, 0.5 );
    … …  
    132131    delete(binmap);
    133132
     133  // remove
     134  delete(TestList);
    134135  delete(Surface);
    135136  // note that all the atoms are cleaned by TestMolecule
    136137  delete(LC);
    137   World::purgeInstance();
     138  delete(tafel);
     139  // note that element is cleaned by periodentafel
     140  World::destroy();
    138141  MemoryUsageObserver::purgeInstance();
    139142  logger::purgeInstance();
Note: See TracChangeset for help on using the changeset viewer.