Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    ra564be rf844ef  
    11# PLEASE adhere to the alphabetical ordering in this Makefile!
    22# Also indentation by a single tab
     3
     4SUBDIRS = \
     5        ../Actions/unittests \
     6        ../Descriptors/unittests \
     7        ../Helpers/unittests \
     8        ../LinearAlgebra/unittests \
     9        ../Parser/unittests \
     10        ../Patterns/unittests \
     11        ../UIElements/Menu/unittests
    312
    413INCLUDES = -I$(top_srcdir)/src
    … …  
    918
    1019TESTS = \
    11   ActionSequenceTest \
    12   ActOnAllUnitTest \
    13   AnalysisBondsUnitTests \
     20  AnalysisBondsUnitTest \
    1421  AnalysisCorrelationToPointUnitTest \
    1522  AnalysisCorrelationToSurfaceUnitTest \
    1623  AnalysisPairCorrelationUnitTest \
    17   atomsCalculationTest \
    18   AtomDescriptorTest \
    1924  BondGraphUnitTest \
    20   BoxUnittest \
    21   CacheableTest \
     25  BoxUnitTest \
    2226  CountBondsUnitTest \
    2327  FormulaUnittest \
    24   InfoUnitTest \
    25   LinearSystemOfEquationsUnitTest \
    26   LineUnittest \
    2728  LinkedCellUnitTest \
    2829  ListOfBondsUnitTest \
    29   LogUnitTest \
    30   manipulateAtomsTest \
    31   MatrixContentSymmetricUnitTest \
    32   MatrixContentUnitTest \
    33   MatrixUnittest \
    34   MenuDescriptionUnitTest \
    35   MoleculeDescriptorTest \
    36   ObserverTest \
    37   ParserCommonUnitTest \
    38   ParserTremoloUnitTest \
    39   periodentafelTest \
    40   PlaneUnittest \
    41   Registry \
    42   ShapeUnittest \
    43   SingletonTest \
     30  PeriodentafelUnitTest \
    4431  SubspaceFactorizerUnitTest \
    4532  TesselationUnitTest \
    4633  Tesselation_BoundaryTriangleUnitTest \
    47   Tesselation_InOutsideUnitTest \
    48   VectorContentUnitTest \
    49   VectorUnitTest
     34  Tesselation_InOutsideUnitTest
    5035
    5136
    … …  
    7055
    7156TESTSOURCES = \
    72   ActOnAllUnitTest.cpp \
    73   ActionSequenceTest.cpp \
    74   analysisbondsunittest.cpp \
     57  ../Actions/unittests/ActionRegistryUnitTest.cpp \
     58  ../Actions/unittests/ActionSequenceUnitTest.cpp \
     59  AnalysisBondsUnitTest.cpp \
    7560  AnalysisCorrelationToPointUnitTest.cpp \
    7661  AnalysisCorrelationToSurfaceUnitTest.cpp  \
    7762  AnalysisPairCorrelationUnitTest.cpp \
    78   AtomDescriptorTest.cpp \
    79   atomsCalculationTest.cpp \
    80   bondgraphunittest.cpp \
    81   BoxUnittest.cpp \
    82   CacheableTest.cpp \
     63  ../Descriptors/unittests/AtomDescriptorUnitTest.cpp \
     64  ../Actions/unittests/AtomsCalculationUnitTest.cpp \
     65  BondGraphUnitTest.cpp \
     66  BoxUnitTest.cpp \
     67  ../Patterns/unittests/CacheableUnitTest.cpp \
    8368  CountBondsUnitTest.cpp \
    84   FormulaUnittest.cpp \
    85   infounittest.cpp \
    86   linearsystemofequationsunittest.cpp \
    87   LineUnittest.cpp \
     69  FormulaUnitTest.cpp \
     70  ../Helpers/unittests/InfoUnitTest.cpp \
     71  ../LinearAlgebra/unittests/LinearSystemOfEquationsUnitTest.cpp \
     72  ../LinearAlgebra/unittests/LineUnitTest.cpp \
    8873  LinkedCellUnitTest.cpp \
    89   listofbondsunittest.cpp \
    90   logunittest.cpp \
    91   MatrixContentSymmetricUnittest.cpp \
    92   MatrixContentUnittest.cpp \
    93   MatrixUnittest.cpp \
    94   manipulateAtomsTest.cpp \
    95   MenuDescriptionUnitTest.cpp \
    96   MoleculeDescriptorTest.cpp \
    97   ObserverTest.cpp \
    98   ParserCommonUnitTest.cpp \
    99   ParserTremoloUnitTest.cpp \
    100   periodentafelTest.cpp \
    101   PlaneUnittest.cpp \
    102   RegistryUnitTest.cpp \
    103   ShapeUnittest.cpp \
    104   SingletonTest.cpp \
    105   tesselationunittest.cpp \
    106   tesselation_boundarytriangleunittest.cpp \
    107   tesselation_insideoutsideunittest.cpp \
    108   VectorContentUnittest.cpp \
    109   vectorunittest.cpp
     74  ListOfBondsUnitTest.cpp \
     75  ../Helpers/unittests/LogUnitTest.cpp \
     76  ../Actions/unittests/ManipulateAtomsUnitTest.cpp \
     77  ../LinearAlgebra/unittests/MatrixContentSymmetricUnitTest.cpp \
     78  ../LinearAlgebra/unittests/MatrixContentUnitTest.cpp \
     79  ../LinearAlgebra/unittests/MatrixUnitTest.cpp \
     80  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
     81  ../Descriptors/unittests/MoleculeDescriptorUnitTest.cpp \
     82  ../Patterns/unittests/ObserverUnitTest.cpp \
     83  ../Parser/unittests/ParserCommonUnitTest.cpp \
     84  ../Parser/unittests/ParserTremoloUnitTest.cpp \
     85  PeriodentafelUnitTest.cpp \
     86  ../LinearAlgebra/unittests/PlaneUnitTest.cpp \
     87  ../Patterns/unittests/RegistryUnitTest.cpp \
     88  ../Shapes/unittests/ShapeUnitTest.cpp \
     89  ../Patterns/unittests/SingletonUnitTest.cpp \
     90  TesselationUnitTest.cpp \
     91  Tesselation_BoundaryTriangleUnitTest.cpp \
     92  Tesselation_InsideOutsideUnitTest.cpp \
     93  ../LinearAlgebra/unittests/VectorContentUnitTest.cpp \
     94  ../LinearAlgebra/unittests/VectorUnitTest.cpp
    11095
    11196TESTHEADERS = \
    112   ActOnAllUnitTest.hpp \
    113   ActionSequenceTest.hpp \
    114   analysisbondsunittest.hpp \
     97  ../Actions/unittests/ActionRegistryUnitTest.hpp \
     98  ../Actions/unittests/ActionSequenceUnitTest.hpp \
     99  AnalysisBondsUnitTest.hpp \
    115100  AnalysisCorrelationToPointUnitTest.hpp \
    116101  AnalysisCorrelationToSurfaceUnitTest.hpp  \
    117102  AnalysisPairCorrelationUnitTest.hpp \
    118   AtomDescriptorTest.hpp \
    119   atomsCalculationTest.hpp \
    120   bondgraphunittest.hpp \
    121   BoxUnittest.hpp \
    122   CacheableTest.hpp \
     103  ../Descriptors/unittests/AtomDescriptorUnitTest.hpp \
     104  ../Actions/unittests/AtomsCalculationUnitTest.hpp \
     105  BondGraphUnitTest.hpp \
     106  BoxUnitTest.hpp \
     107  ../Patterns/unittests/CacheableUnitTest.hpp \
    123108  CountBondsUnitTest.hpp \
    124   FormulaUnittest.hpp \
    125   infounittest.hpp \
    126   linearsystemofequationsunittest.hpp \
    127   LineUnittest.hpp \
     109  FormulaUnitTest.hpp \
     110  ../Helpers/unittests/InfoUnitTest.hpp \
     111  ../LinearAlgebra/unittests/LinearSystemOfEquationsUnitTest.hpp \
     112  ../LinearAlgebra/unittests/LineUnitTest.hpp \
    128113  LinkedCellUnitTest.hpp \
    129   listofbondsunittest.hpp \
    130   logunittest.hpp \
    131   manipulateAtomsTest.hpp \
    132   MatrixContentSymmetricUnittest.hpp \
    133   MatrixContentUnittest.hpp \
    134   MatrixUnittest.hpp \
    135   MenuDescriptionUnitTest.hpp \
    136   MoleculeDescriptorTest.hpp \
    137   ObserverTest.hpp \
    138   periodentafelTest.hpp \
    139   ParserCommonUnitTest.hpp \
    140   ParserTremoloUnitTest.hpp \
    141   PlaneUnittest.hpp \
    142   RegistryUnitTest.hpp \
    143   SingletonTest.hpp \
    144   tesselationunittest.hpp \
    145   tesselation_boundarytriangleunittest.hpp \
    146   tesselation_insideoutsideunittest.hpp \
    147   VectorContentUnittest.hpp \
    148   vectorunittest.hpp
     114  ListOfBondsUnitTest.hpp \
     115  ../Helpers/unittests/LogUnitTest.hpp \
     116  ../Actions/unittests/ManipulateAtomsUnitTest.hpp \
     117  ../LinearAlgebra/unittests/MatrixContentSymmetricUnitTest.hpp \
     118  ../LinearAlgebra/unittests/MatrixContentUnitTest.hpp \
     119  ../LinearAlgebra/unittests/MatrixUnitTest.hpp \
     120  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
     121  ../Descriptors/unittests/MoleculeDescriptorUnitTest.hpp \
     122  ../Patterns/unittests/ObserverUnitTest.hpp \
     123  ../Parser/unittests/ParserCommonUnitTest.hpp \
     124  ../Parser/unittests/ParserTremoloUnitTest.hpp \
     125  PeriodentafelUnitTest.hpp \
     126  ../LinearAlgebra/unittests/PlaneUnitTest.hpp \
     127  ../Patterns/unittests/RegistryUnitTest.hpp \
     128  ../Shapes/unittests/ShapeUnitTest.hpp \
     129  ../Patterns/unittests/SingletonUnitTest.hpp \
     130  TesselationUnitTest.hpp \
     131  Tesselation_BoundaryTriangleUnitTest.hpp \
     132  Tesselation_InsideOutsideUnitTest.hpp \
     133  ../LinearAlgebra/unittests/VectorContentUnitTest.hpp \
     134  ../LinearAlgebra/unittests/VectorUnitTest.hpp
    149135 
    150136
    151 ActionSequenceTest_SOURCES = UnitTestMain.cpp ActionSequenceTest.cpp ActionSequenceTest.hpp
    152 ActionSequenceTest_LDADD = ${UILIBS} ${ALLLIBS}
    153 
    154 ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
    155 ActOnAllUnitTest_LDADD = ${ALLLIBS}
    156 
    157 AnalysisBondsUnitTests_SOURCES = UnitTestMain.cpp analysisbondsunittest.cpp analysisbondsunittest.hpp
    158 AnalysisBondsUnitTests_LDADD = ${ALLLIBS}
    159 
    160 AnalysisCorrelationToPointUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
     137AnalysisBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     138        AnalysisBondsUnitTest.cpp \
     139        AnalysisBondsUnitTest.hpp
     140AnalysisBondsUnitTest_LDADD = ${ALLLIBS}
     141
     142AnalysisCorrelationToPointUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     143        analysis_correlation.hpp \
     144        AnalysisCorrelationToPointUnitTest.cpp \
     145        AnalysisCorrelationToPointUnitTest.hpp
    161146AnalysisCorrelationToPointUnitTest_LDADD = ${ALLLIBS}
    162147
    163 AnalysisCorrelationToSurfaceUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
     148AnalysisCorrelationToSurfaceUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     149        analysis_correlation.hpp \
     150        AnalysisCorrelationToSurfaceUnitTest.cpp \
     151        AnalysisCorrelationToSurfaceUnitTest.hpp
    164152AnalysisCorrelationToSurfaceUnitTest_LDADD = ${ALLLIBS}
    165153
    166 AnalysisPairCorrelationUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
     154AnalysisPairCorrelationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     155        analysis_correlation.hpp \
     156        AnalysisPairCorrelationUnitTest.cpp \
     157        AnalysisPairCorrelationUnitTest.hpp
    167158AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}
    168159
    169 atomsCalculationTest_SOURCES = UnitTestMain.cpp atomsCalculationTest.cpp atomsCalculationTest.hpp
    170 atomsCalculationTest_LDADD = ${ALLLIBS}
    171 
    172 AtomDescriptorTest_SOURCES = UnitTestMain.cpp AtomDescriptorTest.cpp AtomDescriptorTest.hpp
    173 AtomDescriptorTest_LDADD = ${ALLLIBS}
    174 
    175 BondGraphUnitTest_SOURCES = UnitTestMain.cpp bondgraphunittest.cpp bondgraphunittest.hpp
     160BondGraphUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     161        BondGraphUnitTest.cpp \
     162        BondGraphUnitTest.hpp
    176163BondGraphUnitTest_LDADD = ${ALLLIBS}
    177164
    178 BoxUnittest_SOURCES = UnitTestMain.cpp BoxUnittest.cpp BoxUnittest.hpp
    179 BoxUnittest_LDADD = ${ALLLIBS}
    180 
    181 CacheableTest_SOURCES = UnitTestMain.cpp CacheableTest.cpp CacheableTest.hpp
    182 CacheableTest_LDADD = ${ALLLIBS}
    183 
    184 CountBondsUnitTest_SOURCES = UnitTestMain.cpp CountBondsUnitTest.cpp CountBondsUnitTest.hpp
     165BoxUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     166        BoxUnitTest.cpp \
     167        BoxUnitTest.hpp
     168BoxUnitTest_LDADD = ${ALLLIBS}
     169
     170CountBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     171        CountBondsUnitTest.cpp \
     172        CountBondsUnitTest.hpp
    185173CountBondsUnitTest_LDADD = ${ALLLIBS}
    186174
    187 FormulaUnittest_SOURCES = UnitTestMain.cpp FormulaUnittest.cpp FormulaUnittest.hpp
     175FormulaUnittest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     176        FormulaUnitTest.cpp \
     177        FormulaUnitTest.hpp
    188178FormulaUnittest_LDADD = ${ALLLIBS}
    189179
    190 MatrixContentSymmetricUnitTest_SOURCES = UnitTestMain.cpp MatrixContentSymmetricUnittest.cpp MatrixContentSymmetricUnittest
    191 MatrixContentSymmetricUnitTest_LDADD = ${ALLLIBS}
    192 
    193 MatrixContentUnitTest_SOURCES = UnitTestMain.cpp MatrixContentUnittest.cpp MatrixContentUnittest.hpp
    194 MatrixContentUnitTest_LDADD = ${ALLLIBS}
    195 
    196 InfoUnitTest_SOURCES = UnitTestMain.cpp infounittest.cpp infounittest.hpp
    197 InfoUnitTest_LDADD = ${ALLLIBS}
    198 
    199 LinearSystemOfEquationsUnitTest_SOURCES = UnitTestMain.cpp linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
    200 LinearSystemOfEquationsUnitTest_LDADD = ${ALLLIBS}
    201 
    202 LineUnittest_SOURCES = UnitTestMain.cpp LineUnittest.cpp LineUnittest.hpp
    203 LineUnittest_LDADD = ${ALLLIBS}
    204 
    205 LinkedCellUnitTest_SOURCES = UnitTestMain.cpp LinkedCellUnitTest.cpp LinkedCellUnitTest.hpp
     180LinkedCellUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     181        LinkedCellUnitTest.cpp \
     182        LinkedCellUnitTest.hpp
    206183LinkedCellUnitTest_LDADD = ${ALLLIBS}
    207184
    208 ListOfBondsUnitTest_SOURCES = UnitTestMain.cpp listofbondsunittest.cpp listofbondsunittest.hpp
     185ListOfBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     186        ListOfBondsUnitTest.cpp \
     187        ListOfBondsUnitTest.hpp
    209188ListOfBondsUnitTest_LDADD = ${ALLLIBS}
    210189
    211 LogUnitTest_SOURCES = UnitTestMain.cpp logunittest.cpp logunittest.hpp
    212 LogUnitTest_LDADD = ${ALLLIBS}
    213 
    214 manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
    215 manipulateAtomsTest_LDADD = ${UILIBS} ${ALLLIBS}
    216 
    217 MatrixUnittest_SOURCES = UnitTestMain.cpp MatrixUnittest.cpp MatrixUnittest.hpp
    218 MatrixUnittest_LDADD = ${ALLLIBS}
    219 
    220 MenuDescriptionUnitTest_SOURCES = UnitTestMain.cpp MenuDescriptionUnitTest.cpp   MenuDescriptionUnitTest.hpp
    221 MenuDescriptionUnitTest_LDADD = ${ALLLIBS}
    222 
    223 MoleculeDescriptorTest_SOURCES = UnitTestMain.cpp MoleculeDescriptorTest.cpp MoleculeDescriptorTest.hpp
    224 MoleculeDescriptorTest_LDADD = ${ALLLIBS}
    225 
    226 ObserverTest_SOURCES = UnitTestMain.cpp ObserverTest.cpp ObserverTest.hpp
    227 ObserverTest_LDADD = ${ALLLIBS}
    228 
    229 ParserCommonUnitTest_SOURCES = UnitTestMain.cpp ParserCommonUnitTest.cpp ParserCommonUnitTest.hpp
    230 ParserCommonUnitTest_LDADD = ${ALLLIBS}
    231 
    232 ParserTremoloUnitTest_SOURCES = UnitTestMain.cpp ParserTremoloUnitTest.cpp ParserTremoloUnitTest.hpp
    233 ParserTremoloUnitTest_LDADD = ${ALLLIBS}
    234 
    235 periodentafelTest_SOURCES = UnitTestMain.cpp periodentafelTest.cpp periodentafelTest.hpp
    236 periodentafelTest_LDADD = ${ALLLIBS}
    237 
    238 PlaneUnittest_SOURCES = UnitTestMain.cpp PlaneUnittest.cpp PlaneUnittest.hpp
    239 PlaneUnittest_LDADD = ${ALLLIBS}
    240 
    241 Registry_SOURCES = UnitTestMain.cpp RegistryUnitTest.cpp RegistryUnitTest.hpp
    242 Registry_LDADD = ${ALLLIBS}
    243 
    244 ShapeUnittest_SOURCES = UnitTestMain.cpp ShapeUnittest.cpp ShapeUnittest.hpp
    245 ShapeUnittest_LDADD = ${ALLLIBS}
    246 
    247 SingletonTest_SOURCES = UnitTestMain.cpp SingletonTest.cpp SingletonTest.hpp
    248 SingletonTest_LDADD = ${ALLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
    249 
    250 SubspaceFactorizerUnitTest_SOURCES = UnitTestMain.cpp SubspaceFactorizerUnittest.cpp SubspaceFactorizerUnittest.hpp
     190PeriodentafelUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     191        PeriodentafelUnitTest.cpp \
     192        PeriodentafelUnitTest.hpp
     193PeriodentafelUnitTest_LDADD = ${ALLLIBS}
     194
     195SubspaceFactorizerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     196        SubspaceFactorizerUnitTest.cpp \
     197        SubspaceFactorizerUnitTest.hpp
    251198SubspaceFactorizerUnitTest_LDADD = ${GSLLIBS}
    252199
    253 TesselationUnitTest_SOURCES = UnitTestMain.cpp tesselationunittest.cpp tesselationunittest.hpp
     200TesselationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     201        TesselationUnitTest.cpp \
     202        TesselationUnitTest.hpp
    254203TesselationUnitTest_LDADD = ${ALLLIBS}
    255204
    256 Tesselation_BoundaryTriangleUnitTest_SOURCES = UnitTestMain.cpp tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
     205Tesselation_BoundaryTriangleUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     206        Tesselation_BoundaryTriangleUnitTest.cpp \
     207        Tesselation_BoundaryTriangleUnitTest.hpp
    257208Tesselation_BoundaryTriangleUnitTest_LDADD = ${ALLLIBS}
    258209
    259 Tesselation_InOutsideUnitTest_SOURCES = UnitTestMain.cpp tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
     210Tesselation_InOutsideUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     211        Tesselation_InsideOutsideUnitTest.cpp \
     212        Tesselation_InsideOutsideUnitTest.hpp
    260213Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
    261214
    … …  
    263216TestRunner_LDADD = ${UILIBS} ${ALLLIBS}
    264217
    265 VectorContentUnitTest_SOURCES = UnitTestMain.cpp VectorContentUnittest.cpp VectorContentUnittest.hpp
    266 VectorContentUnitTest_LDADD = ${ALLLIBS}
    267 
    268 VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp
    269 VectorUnitTest_LDADD = ${ALLLIBS}
    270 
    271218#AUTOMAKE_OPTIONS = parallel-tests
Note: See TracChangeset for help on using the changeset viewer.