Ignore:
Timestamp:
Jan 2, 2012, 1:34:58 PM (13 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:
69459d
Parents:
b1c5ddb
git-author:
Frederik Heber <heber@…> (12/22/11 09:26:45)
git-committer:
Frederik Heber <heber@…> (01/02/12 13:34:58)
Message:

Replaced Molecuilder library dependencies by stubs in LinkedCell_...UnitTests.

  • Implemented stubs for World and AtomObserver.
  • Renamed BoxStub to ObserverBoxStub.
  • Enhanced stub for TesselPoint, defines its own class to get around all those virtual inheritances.
  • LinkedCell_ControllerUnitTest uses molecuilderLinkedCell lib but no other, everything else is stubbed.
  • LinkedCellUnitTest is now the same.
Location:
src/LinkedCell/unittests
Files:
4 added
2 deleted
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • src/LinkedCell/unittests/Makefile.am

    rb1c5ddb r2ced6b  
    2929
    3030LINKEDCELLLIBS = \
    31         ../libMolecuilderUI.la \
    32         ../libMolecuilder.la \
    3331        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3432        ${CodePatterns_LIBS} \
     
    3836        ../LinkedCell/unittests/linkedcellUnitTest.cpp \
    3937        ../LinkedCell/unittests/linkedcellUnitTest.hpp
    40 linkedcellUnitTest_LDADD = $(LINKEDCELLLIBS)
     38linkedcellUnitTest_LDADD = \
     39        ../libMolecuilderUI.la \
     40        ../libMolecuilder.la \
     41        $(LINKEDCELLLIBS)
    4142
    4243LinkedCellUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    4344        ../LinkedCell/unittests/LinkedCellUnitTest.cpp \
    44         ../LinkedCell/unittests/LinkedCellUnitTest.hpp
     45        ../LinkedCell/unittests/LinkedCellUnitTest.hpp \
     46        ../LinkedCell/unittests/stubs/TesselPointStub.cpp
    4547LinkedCellUnitTest_LDADD = \
     48        ../libMolecuilderLinkedCell.la \
    4649        $(LINKEDCELLLIBS)
    4750
     
    4952        ../LinkedCell/unittests/LinkedCell_ControllerUnitTest.cpp \
    5053        ../LinkedCell/unittests/LinkedCell_ControllerUnitTest.hpp \
    51         ../LinkedCell/unittests/stubs/LinkedCell_ModelStub.cpp \
    52         ../LinkedCell/unittests/stubs/LinkedCell_ViewStub.cpp \
    53         ../LinkedCell/unittests/stubs/LinkedCellStub.cpp \
    54   ../LinkedCell/LinkedCell_Controller.cpp \
    55   ../LinkedCell/LinkedCell.hpp \
    56   ../LinkedCell/LinkedCell_Controller.hpp \
    57   ../LinkedCell/LinkedCell_Model.hpp \
    58   ../LinkedCell/LinkedCell_View.hpp \
     54        ../LinkedCell/unittests/stubs/AtomStub.cpp \
     55        ../LinkedCell/unittests/stubs/AtomObserverStub.cpp \
     56        ../LinkedCell/unittests/stubs/ObserverBoxStub.cpp \
     57        ../LinkedCell/unittests/stubs/TesselPointStub.cpp \
     58        ../LinkedCell/unittests/stubs/WorldStub.cpp \
    5959        ../LinkedCell/PointCloudAdaptor.hpp
    6060LinkedCell_ControllerUnitTest_LDADD = \
     61        ../libMolecuilderLinkedCell.la \
    6162        $(LINKEDCELLLIBS)
    6263
     
    6566        ../LinkedCell/unittests/LinkedCell_ModelUnitTest.hpp
    6667LinkedCell_ModelUnitTest_LDADD = \
     68        ../libMolecuilderUI.la \
     69        ../libMolecuilder.la \
    6770        $(LINKEDCELLLIBS)
    6871
     
    7275        ../LinkedCell/PointCloudAdaptor.hpp
    7376LinkedCell_ViewUnitTest_LDADD = \
     77        ../libMolecuilderUI.la \
     78        ../libMolecuilder.la \
    7479        $(LINKEDCELLLIBS)
    7580
  • src/LinkedCell/unittests/stubs/AtomStub.cpp

    rb1c5ddb r2ced6b  
    77
    88/*
    9  * LinkedCellStub.cpp
     9 * AtomStub.cpp
    1010 *
    11  *  Created on: Nov 29, 2011
     11 *  Created on: Dec 22, 2011
    1212 *      Author: heber
    1313 */
     
    2020#include "CodePatterns/MemDebug.hpp"
    2121
    22 #include "LinkedCell/LinkedCell.hpp"
    23 #include "LinkedCell/types.hpp"
     22#include "Atom/atom.hpp"
    2423
    25 
    26 
    27 LinkedCell::LinkedCell::LinkedCell(const tripleIndex &_indices) :
    28     indices(_indices)
    29 {}
    30 
    31 LinkedCell::LinkedCell::~LinkedCell()
    32 {
     24int atom::getNr() const {
     25  return 0;
    3326}
Note: See TracChangeset for help on using the changeset viewer.