Changeset 2704e2 for molecuilder/src/unittests

Timestamp:

Mar 30, 2010, 1:22:20 PM (15 years ago)

Author:

Saskia Metzler <metzler@…>

Children:

0f7883

Parents:

fd9d77

Message:

WIP tremolo parser

Location:

molecuilder/src/unittests

Files:

• Makefile.am (modified) (1 diff)
• ParserUnitTest.cpp (modified) (3 diffs)
• ParserUnitTest.hpp (modified) (2 diffs)

molecuilder/src/unittests/Makefile.am

@@ -55 +55 @@
   bondgraphunittest.cpp \
   CacheableTest.cpp \
-  DescriptorUnittest.cpp \
   gslmatrixsymmetricunittest.cpp \
   gslmatrixunittest.cpp \

molecuilder/src/unittests/ParserUnitTest.cpp

@@ -13 +13 @@
 
 #include "Parser/XyzParser.hpp"
+#include "Parser/TremoloParser.hpp"
 #include "World.hpp"
 #include "element.hpp"
@@ -45 +46 @@
 
 void ParserUnitTest::rewriteAnXyzTest() {
+  cout << "Testing the XYZ parser." << endl;
   XyzParser* testParser = new XyzParser();
   string waterXyz = "3\nH2O: water molecule\nO\t0.000000\t0.000000\t0.000000\nH\t0.758602\t0.000000\t0.504284\nH\t0.758602\t0.000000\t-0.504284\n";
@@ -61 +63 @@
 }
 
+void ParserUnitTest::rewriteTremoloTest() {
+  cout << "Testing the tremolo parser." << endl;
+  TremoloParser* testParser = new TremoloParser();
+  string waterTremolo = "#\n# ATOMDATA Id name Type x=3\n\n\n";
+  stringstream input;
+  input << waterTremolo;
+  testParser->load(&input);
+  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);
+  cout << "testing the tremolo parser is done" << endl;
+}

molecuilder/src/unittests/ParserUnitTest.hpp

@@ -15 +15 @@
   CPPUNIT_TEST_SUITE( ParserUnitTest ) ;
   CPPUNIT_TEST ( rewriteAnXyzTest );
+  CPPUNIT_TEST ( rewriteTremoloTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -22 +23 @@
 
   void rewriteAnXyzTest();
+  void rewriteTremoloTest();
 };