Changes in src/unittests/Makefile.am [57adc7:ab4b55]

File:

• src/unittests/Makefile.am (modified) (7 diffs)

src/unittests/Makefile.am

@@ -12 +12 @@
   AnalysisCorrelationToSurfaceUnitTest \
   AnalysisPairCorrelationUnitTest \
-  atomsCalculationTest \
-  AtomDescriptorTest \
   BondGraphUnitTest \
-  CacheableTest \
   GSLMatrixSymmetricUnitTest \
   GSLMatrixUnitTest \
@@ -23 +20 @@
   ListOfBondsUnitTest \
   LogUnitTest \
-  manipulateAtomsTest \
   MemoryUsageObserverUnitTest \
   MemoryAllocatorUnitTest \
-  MoleculeDescriptorTest \
-  ObserverTest \
   StackClassUnitTest \
   TesselationUnitTest \
@@ -33 +27 @@
   Tesselation_InOutsideUnitTest \
   VectorUnitTest \
-  ${MENUTESTS}
-  
-
-      
+  ObserverTest \
+  CacheableTest \
+  DescriptorUnittest \
+  ParserUnitTest \
+  manipulateAtomsTest \
+  atomsCalculationTest \
+  ${MENUTESTS}  
+    
   
 check_PROGRAMS = $(TESTS) 
@@ -46 +44 @@
 TESTSOURCES = \
   ActOnAllUnitTest.cpp \
-  ActionSequenceTest.cpp \
   analysisbondsunittest.cpp \
   AnalysisCorrelationToPointUnitTest.cpp \
   AnalysisCorrelationToSurfaceUnitTest.cpp  \
   AnalysisPairCorrelationUnitTest.cpp \
-  AtomDescriptorTest.cpp \
-  atomsCalculationTest.cpp \
   bondgraphunittest.cpp \
-  CacheableTest.cpp \
   gslmatrixsymmetricunittest.cpp \
   gslmatrixunittest.cpp \
@@ -62 +56 @@
   listofbondsunittest.cpp \
   logunittest.cpp \
-  manipulateAtomsTest.cpp \
   memoryallocatorunittest.cpp  \
   memoryusageobserverunittest.cpp \
-  MoleculeDescriptorTest.cpp \
-  ObserverTest.cpp \
   stackclassunittest.cpp \
   tesselationunittest.cpp \
   tesselation_boundarytriangleunittest.cpp \
   tesselation_insideoutsideunittest.cpp \
-  vectorunittest.cpp
+  vectorunittest.cpp \
+  ObserverTest.cpp \
+  CacheableTest.cpp \
+  DescriptorUnittest.cpp \
+  ParserUnitTest.cpp \
+  manipulateAtomsTest.cpp \
+  atomsCalculationTest.cpp \
+  ActionSequenceTest.cpp
 
 TESTHEADERS = \
@@ -121 +119 @@
 MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
 
-MoleculeDescriptorTest_SOURCES = UnitTestMain.cpp MoleculeDescriptorTest.cpp MoleculeDescriptorTest.hpp
-MoleculeDescriptorTest_LDADD = ${ALLLIBS}
-
 StackClassUnitTest_SOURCES = UnitTestMain.cpp stackclassunittest.cpp stackclassunittest.hpp
 StackClassUnitTest_LDADD = ${ALLLIBS}
@@ -148 +143 @@
 CacheableTest_LDADD = ${ALLLIBS}
 
-AtomDescriptorTest_SOURCES = UnitTestMain.cpp AtomDescriptorTest.cpp AtomDescriptorTest.hpp
-AtomDescriptorTest_LDADD = ${ALLLIBS}
+DescriptorUnittest_SOURCES = UnitTestMain.cpp DescriptorUnittest.cpp DescriptorUnittest.hpp
+DescriptorUnittest_LDADD = ${ALLLIBS}
+
+ParserUnitTest_SOURCES = UnitTestMain.cpp ParserUnitTest.cpp ParserUnitTest.hpp
+ParserUnitTest_LDADD = ${ALLLIBS}
 
 manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp