Changeset 952f38 for src/unittests


Ignore:
Timestamp:
Aug 5, 2010, 7:41:21 PM (15 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
b37436
Parents:
57f243
Message:

created LibMolecuilderHelpers.

  • is shared
  • renamed log.[ch]pp -> Log.[ch]pp
  • renamed verbose.[ch]pp -> Verbose.[ch]pp
  • renamed info.[ch]pp -> Info.[ch]pp
  • contains: Assert, MemDebug, Log, logger, errorlogger, Verbose, Info
  • had to change includes practically everywhere.
Location:
src/unittests
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    r57f243 r952f38  
    4949noinst_PROGRAMS = $(TESTS) TestRunner
    5050
    51 GSLLIBS = ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la $(BOOST_LIB) ${BOOST_THREAD_LIB}
     51GSLLIBS = \
     52        ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
     53        ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     54        ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
     55        $(BOOST_LIB) \
     56        ${BOOST_THREAD_LIB}
    5257ALLLIBS = \
    5358        ../UIElements/libMolecuilderUI.a \
    5459        ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
     60        ${PARSERLIBS} \
    5561        ../libmolecuilder.a \
    56         ../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la \
    5762        ${GSLLIBS} \
    5863        ${BOOST_PROGRAM_OPTIONS_LIB}
    59 
    60 PARSERLIBS = ${ALLLIBS}
     64PARSERLIBS = ../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
    6165
    6266TESTSOURCES = \
    … …  
    136140
    137141ActionSequenceTest_SOURCES = UnitTestMain.cpp ActionSequenceTest.cpp ActionSequenceTest.hpp
    138 ActionSequenceTest_LDADD = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la ../libmolecuilder.a ../libparser.a ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
     142ActionSequenceTest_LDADD = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la ../libmolecuilder.a ../libparser.a ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
    139143
    140144ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
    … …  
    202206
    203207manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
    204 manipulateAtomsTest_LDADD = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la ../libmolecuilder.a ../libparser.a ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
     208manipulateAtomsTest_LDADD = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la ../libmolecuilder.a ../libparser.a ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
    205209
    206210MatrixUnittest_SOURCES = UnitTestMain.cpp MatrixUnittest.cpp MatrixUnittest.hpp
    … …  
    214218
    215219ParserUnitTest_SOURCES = UnitTestMain.cpp ParserUnitTest.cpp ParserUnitTest.hpp
    216 ParserUnitTest_LDADD = ${PARSERLIBS}
     220ParserUnitTest_LDADD = ${ALLLIBS}
    217221
    218222periodentafelTest_SOURCES = UnitTestMain.cpp periodentafelTest.cpp periodentafelTest.hpp
    … …  
    241245
    242246TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
    243 TestRunner_LDADD = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la ../libmolecuilder.a ../libparser.a ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
     247TestRunner_LDADD = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la ../libmolecuilder.a ../libparser.a ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la$(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
    244248
    245249VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp

  • src/unittests/bondgraphunittest.cpp

    r57f243 r952f38  
    2323#include "bondgraph.hpp"
    2424#include "element.hpp"
    25 #include "log.hpp"
     25#include "Helpers/Log.hpp"
    2626#include "molecule.hpp"
    2727#include "periodentafel.hpp"

  • src/unittests/infounittest.cpp

    r57f243 r952f38  
    1515#include <stdio.h>
    1616
    17 #include "info.hpp"
     17#include "Helpers/Info.hpp"
    1818#include "infounittest.hpp"
    19 #include "log.hpp"
     19#include "Helpers/Log.hpp"
    2020
    2121#ifdef HAVE_TESTRUNNER

  • src/unittests/logunittest.cpp

    r57f243 r952f38  
    1111
    1212#include "logunittest.hpp"
    13 #include "log.hpp"
     13#include "Helpers/Log.hpp"
    1414#include "defs.hpp"
    15 #include "verbose.hpp"
     15#include "Helpers/Verbose.hpp"
    1616
    1717#ifdef HAVE_TESTRUNNER

  • src/unittests/memoryallocatorunittest.cpp

    r57f243 r952f38  
    1313#include "memoryallocatorunittest.hpp"
    1414#include "memoryusageobserver.hpp"
    15 #include "helpers.hpp"
    16 #include "log.hpp"
     15#include "Helpers/helpers.hpp"
     16#include "Helpers/Log.hpp"
    1717#include "defs.hpp"
    1818

  • src/unittests/stackclassunittest.cpp

    r57f243 r952f38  
    1313
    1414#include "stackclassunittest.hpp"
    15 #include "log.hpp"
     15#include "Helpers/Log.hpp"
    1616
    1717#ifdef HAVE_TESTRUNNER

  • src/unittests/tesselation_insideoutsideunittest.cpp

    r57f243 r952f38  
    1717#include "tesselation.hpp"
    1818#include "tesselation_insideoutsideunittest.hpp"
    19 #include "verbose.hpp"
     19#include "Helpers/Verbose.hpp"
    2020
    2121#ifdef HAVE_TESTRUNNER

  • src/unittests/vectorunittest.cpp

    r57f243 r952f38  
    1414
    1515#include "defs.hpp"
    16 #include "log.hpp"
     16#include "Helpers/Log.hpp"
    1717#include "LinearAlgebra/Vector.hpp"
    1818#include "vector_ops.hpp"
Note: See TracChangeset for help on using the changeset viewer.