Changes in src/Parser/unittests/ParserPdbUnitTest.cpp [3bdb6d:765f16]

File:

• src/Parser/unittests/ParserPdbUnitTest.cpp (modified) (6 diffs)

src/Parser/unittests/ParserPdbUnitTest.cpp

@@ -24 +24 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "Parser/PdbParser.hpp"
 #include "World.hpp"
 #include "atom.hpp"
-#include "Element/element.hpp"
-#include "Element/periodentafel.hpp"
+#include "element.hpp"
+#include "periodentafel.hpp"
 #include "CodePatterns/Log.hpp"
 #include "Descriptors/AtomTypeDescriptor.hpp"
+#include "Parser/ChangeTracker.hpp"
+#include "Parser/PdbParser.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -63 +64 @@
   World::getInstance();
 
+  parser = new FormatParser<pdb>();
+
   setVerbosity(2);
 
@@ -70 +73 @@
 }
 
-void ParserPdbUnitTest::tearDown() {
+void ParserPdbUnitTest::tearDown() 
+{
+  delete parser;
   ChangeTracker::purgeInstance();
   World::purgeInstance();
@@ -80 +85 @@
   stringstream input;
   input << waterPdb;
-  PdbParser* testParser = new PdbParser();
-  testParser->load(&input);
+  parser->load(&input);
   input.clear();
 
@@ -88 +92 @@
   stringstream output;
   std::vector<atom *> atoms = World::getInstance().getAllAtoms();
-  testParser->save(&output, atoms);
+  parser->save(&output, atoms);
 
 //  std::cout << "Save PDB is:" << std::endl;
@@ -94 +98 @@
 
   input << output.str();
-  PdbParser* testParser2 = new PdbParser();
-  testParser2->load(&input);
+  FormatParser<pdb>* parser2 = new FormatParser<pdb>();
+  parser2->load(&input);
 
   CPPUNIT_ASSERT_EQUAL(12, World::getInstance().numAtoms());
+
+  delete parser2;
 }