Changeset 0f7883 for molecuilder/src/unittests/ParserUnitTest.cpp

Timestamp:

Apr 1, 2010, 12:16:29 PM (16 years ago)

Author:

Saskia Metzler <metzler@…>

Children:

d3513b

Parents:

2704e2 (diff), 770138 (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 Till's structure refactoring

Merge commit 'till/StructureRefactoring' into StateAndFormatParser

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/unittests/Makefile.am

File:

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

molecuilder/src/unittests/ParserUnitTest.cpp

@@ -32 +32 @@
   oxygen->symbol[0] = 'O';
   oxygen->Z = 8;
-  World::get()->getPeriode()->AddElement(oxygen);
+  World::getInstance().getPeriode()->AddElement(oxygen);
 
   element* hydrogen = new element();
   hydrogen->symbol[0] = 'H';
   hydrogen->Z = 1;
-  World::get()->getPeriode()->AddElement(hydrogen);
+  World::getInstance().getPeriode()->AddElement(hydrogen);
 }
 
@@ -53 +53 @@
   testParser->load(&input);
 
-  CPPUNIT_ASSERT_EQUAL(3, World::get()->numAtoms());
+  CPPUNIT_ASSERT_EQUAL(3, World::getInstance().numAtoms());
 
   string newWaterXyz = "";
@@ -66 +66 @@
   cout << "Testing the tremolo parser." << endl;
   TremoloParser* testParser = new TremoloParser();
+  stringstream input;
+
+  // Atomdata beginning with "# ATOMDATA"
   string waterTremolo = "#\n# ATOMDATA Id name Type x=3\n\n\n";
-  stringstream input;
   input << waterTremolo;
   testParser->load(&input);
+  input.clear();
+
+  // Atomdata beginning with "#ATOMDATA"
   waterTremolo = "#\n#ATOMDATA Id name Type x=3\n1 H hydrogen 3.0 4.5 0.1\n\n";
-  input.clear();
   input << waterTremolo;
   testParser->load(&input);
+  input.clear();
+
+  // One simple data line
+  waterTremolo = "#\n#ATOMDATA Id name Type x=3\n1 H hydrogen 3.0 4.5 0.1\n\n";
+  input << waterTremolo;
+  testParser->load(&input);
+  input.clear();
+
+  // Invalid key in Atomdata line
+  waterTremolo = "#\n#ATOMDATA Id name foo Type x=3\n\n\n";
+  input << waterTremolo;
+  testParser->load(&input);
+  input.clear();
+
   cout << "testing the tremolo parser is done" << endl;
 }