Changeset 329fbd


Ignore:
Timestamp:
Feb 16, 2017, 7:39:33 PM (9 years ago)
Author:
Frederik Heber <heber@…>
Children:
d192f69
Parents:
37becf
git-author:
Frederik Heber <heber@…> (02/16/17 19:39:29)
git-committer:
Frederik Heber <heber@…> (02/16/17 19:39:33)
Message:

Split the testsuite into single tests that may run in parallel.

  • also split up file smoother_test.cpp that contained two tests.
Location:
test/unit_test
Files:
3 added
2 edited
1 moved

Legend:

Unmodified
Added
Removed

  • test/unit_test/Makefile.am

    r37becf r329fbd  
    11if COND_HAVE_BOOST_UNIT_TEST
    22
    3 noinst_PROGRAMS += \
    4         boost_test
    5 
    6 check_PROGRAMS += \
    7         boost_test
    8 
    9 TESTS += \
    10         boost_test
    11 
    12 boost_test_SOURCES = \
    13         unit_test/boost_test.cpp \
    14         unit_test/library/dirichlet_cs.cpp \
    15         unit_test/library/dirichlet_cs_mpi.cpp \
    16         unit_test/library/dirichlet_fas.cpp \
    17         unit_test/library/dirichlet_fas_lr.cpp \
    18         unit_test/library/dirichlet_fas_lr_mpi.cpp \
    19         unit_test/library/dirichlet_fas_mpi.cpp \
    20         unit_test/library/force_sinus.cpp \
    21         unit_test/library/open_fas_mpi.cpp \
    22         unit_test/library/periodic_cs.cpp \
    23         unit_test/library/periodic_cs_mpi.cpp \
    24         unit_test/library/periodic_fas.cpp \
    25         unit_test/library/periodic_fas_mpi.cpp \
    26         unit_test/unit_test/interpolate_test.cpp \
    27         unit_test/unit_test/polynomial_test.cpp \
    28         unit_test/unit_test/smoother_test.cpp \
    29         unit_test/unit_test/solver_test.cpp
    30 
    31 boost_test_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/boost_unit_test -I$(top_srcdir)/test/interfaces $(VTK_CXXFLAGS) $(BOOST_CPPFLAGS)
    32 boost_test_LDFLAGS = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
    33 boost_test_LDADD = \
     3AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/unit_test -I$(top_srcdir)/test/interfaces $(VTK_CXXFLAGS) $(BOOST_CPPFLAGS)
     4AM_LDFLAGS = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
     5TESTLIBS = \
    346        $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) \
    357        $(LIBVMG) \
    … …  
    3911
    4012if HAVE_LAPACK
    41 boost_test_LDADD += \
     13TESTLIBS += \
    4214        $(LAPACK_LIBS) \
    4315        $(BLAS_LIBS) \
    … …  
    4517endif
    4618
     19noinst_LTLIBRARIES = libvmg_testhelper.la
     20libvmg_testhelper_la_SOURCES = \
     21        unit_test/unit_test/smoother_fixture.cpp \
     22        unit_test/unit_test/smoother_fixture.hpp
     23libvmg_testhelper_la_CPPFLAGS = $(AM_CPPFLAGS)
     24libvmg_testhelper_la_LDFLAGS = $(AM_LDFLAGS)
     25
     26BOOSTTESTS = \
     27        LibraryDirichletFASLRTest \
     28        LibraryDirichletCSTest \
     29        LibraryPeriodicCSTest \
     30        LibraryPeriodicFASTest \
     31        LibraryForceSinusTest \
     32        LibraryDirichletCSMPITest \
     33        LibraryPeriodicFASMPITest \
     34        LibraryPeriodicCSMPITest \
     35        LibraryDirichletFASTest \
     36        LibraryDirichletFASLRMPITest \
     37        LibraryOpenFASMPITest \
     38        LibraryDirichletFASMPITest \
     39        InterpolateSuite \
     40        LibraryForceSinusUnitTest \
     41        SmootherGSLexTest \
     42        SmootherGSRBTest
     43
     44noinst_PROGRAMS += $(BOOSTTESTS)
     45
     46check_PROGRAMS += $(BOOSTTESTS)
     47
     48TESTS += $(BOOSTTESTS)
     49
     50LibraryDirichletFASLRTest_SOURCES = \
     51        unit_test/boost_test.cpp \
     52        unit_test/library/dirichlet_fas_lr.cpp
     53LibraryDirichletFASLRTest_CPPFLAGS=$(AM_CPPFLAGS)
     54LibraryDirichletFASLRTest_LDFLAGS = $(AM_LDFLAGS)
     55LibraryDirichletFASLRTest_LDADD = $(TESTLIBS)
     56LibraryDirichletCSTest_SOURCES = \
     57        unit_test/boost_test.cpp \
     58        unit_test/library/dirichlet_cs.cpp
     59LibraryDirichletCSTest_CPPFLAGS=$(AM_CPPFLAGS)
     60LibraryDirichletCSTest_LDFLAGS = $(AM_LDFLAGS)
     61LibraryDirichletCSTest_LDADD = $(TESTLIBS)
     62LibraryPeriodicCSTest_SOURCES = \
     63        unit_test/boost_test.cpp \
     64        unit_test/library/periodic_cs.cpp
     65LibraryPeriodicCSTest_CPPFLAGS=$(AM_CPPFLAGS)
     66LibraryPeriodicCSTest_LDFLAGS = $(AM_LDFLAGS)
     67LibraryPeriodicCSTest_LDADD = $(TESTLIBS)
     68LibraryPeriodicFASTest_SOURCES = \
     69        unit_test/boost_test.cpp \
     70        unit_test/library/periodic_fas.cpp
     71LibraryPeriodicFASTest_CPPFLAGS=$(AM_CPPFLAGS)
     72LibraryPeriodicFASTest_LDFLAGS = $(AM_LDFLAGS)
     73LibraryPeriodicFASTest_LDADD = $(TESTLIBS)
     74LibraryForceSinusTest_SOURCES = \
     75        unit_test/boost_test.cpp \
     76        unit_test/library/force_sinus.cpp
     77LibraryForceSinusTest_CPPFLAGS=$(AM_CPPFLAGS)
     78LibraryForceSinusTest_LDFLAGS = $(AM_LDFLAGS)
     79LibraryForceSinusTest_LDADD = $(TESTLIBS)
     80LibraryDirichletCSMPITest_SOURCES = \
     81        unit_test/boost_test.cpp \
     82        unit_test/library/dirichlet_cs_mpi.cpp
     83LibraryDirichletCSMPITest_CPPFLAGS=$(AM_CPPFLAGS)
     84LibraryDirichletCSMPITest_LDFLAGS = $(AM_LDFLAGS)
     85LibraryDirichletCSMPITest_LDADD = $(TESTLIBS)
     86LibraryPeriodicFASMPITest_SOURCES = \
     87        unit_test/boost_test.cpp \
     88        unit_test/library/periodic_fas_mpi.cpp
     89LibraryPeriodicFASMPITest_CPPFLAGS=$(AM_CPPFLAGS)
     90LibraryPeriodicFASMPITest_LDFLAGS = $(AM_LDFLAGS)
     91LibraryPeriodicFASMPITest_LDADD = $(TESTLIBS)
     92LibraryPeriodicCSMPITest_SOURCES = \
     93        unit_test/boost_test.cpp \
     94        unit_test/library/periodic_cs_mpi.cpp
     95LibraryPeriodicCSMPITest_CPPFLAGS=$(AM_CPPFLAGS)
     96LibraryPeriodicCSMPITest_LDFLAGS = $(AM_LDFLAGS)
     97LibraryPeriodicCSMPITest_LDADD = $(TESTLIBS)
     98LibraryDirichletFASTest_SOURCES = \
     99        unit_test/boost_test.cpp \
     100        unit_test/library/dirichlet_fas.cpp
     101LibraryDirichletFASTest_CPPFLAGS=$(AM_CPPFLAGS)
     102LibraryDirichletFASTest_LDFLAGS = $(AM_LDFLAGS)
     103LibraryDirichletFASTest_LDADD = $(TESTLIBS)
     104LibraryDirichletFASLRMPITest_SOURCES = \
     105        unit_test/boost_test.cpp \
     106        unit_test/library/dirichlet_fas_lr_mpi.cpp
     107LibraryDirichletFASLRMPITest_CPPFLAGS=$(AM_CPPFLAGS)
     108LibraryDirichletFASLRMPITest_LDFLAGS = $(AM_LDFLAGS)
     109LibraryDirichletFASLRMPITest_LDADD = $(TESTLIBS)
     110LibraryOpenFASMPITest_SOURCES = \
     111        unit_test/boost_test.cpp \
     112        unit_test/library/open_fas_mpi.cpp
     113LibraryOpenFASMPITest_CPPFLAGS=$(AM_CPPFLAGS)
     114LibraryOpenFASMPITest_LDFLAGS = $(AM_LDFLAGS)
     115LibraryOpenFASMPITest_LDADD = $(TESTLIBS)
     116LibraryDirichletFASMPITest_SOURCES = \
     117        unit_test/boost_test.cpp \
     118        unit_test/library/dirichlet_fas_mpi.cpp
     119LibraryDirichletFASMPITest_CPPFLAGS=$(AM_CPPFLAGS)
     120LibraryDirichletFASMPITest_LDFLAGS = $(AM_LDFLAGS)
     121LibraryDirichletFASMPITest_LDADD = $(TESTLIBS)
     122InterpolateSuite_SOURCES = \
     123        unit_test/boost_test.cpp \
     124        unit_test/unit_test/interpolate_test.cpp
     125InterpolateSuite_CPPFLAGS=$(AM_CPPFLAGS)
     126InterpolateSuite_LDFLAGS = $(AM_LDFLAGS)
     127InterpolateSuite_LDADD = $(TESTLIBS)
     128LibraryForceSinusUnitTest_SOURCES = \
     129        unit_test/boost_test.cpp \
     130        unit_test/unit_test/force_sinus_unit_test.cpp
     131LibraryForceSinusUnitTest_CPPFLAGS=$(AM_CPPFLAGS)
     132LibraryForceSinusUnitTest_LDFLAGS = $(AM_LDFLAGS)
     133LibraryForceSinusUnitTest_LDADD = $(TESTLIBS)
     134SmootherGSLexTest_SOURCES = \
     135        unit_test/boost_test.cpp \
     136        unit_test/unit_test/smoother_lex_test.cpp
     137SmootherGSLexTest_CPPFLAGS=$(AM_CPPFLAGS)
     138SmootherGSLexTest_LDFLAGS = $(AM_LDFLAGS)
     139SmootherGSLexTest_LDADD = \
     140        libvmg_testhelper.la \
     141        $(TESTLIBS)
     142SmootherGSRBTest_SOURCES = \
     143        unit_test/boost_test.cpp \
     144        unit_test/unit_test/smoother_rb_test.cpp
     145SmootherGSRBTest_CPPFLAGS=$(AM_CPPFLAGS)
     146SmootherGSRBTest_LDFLAGS = $(AM_LDFLAGS)
     147SmootherGSRBTest_LDADD = \
     148        libvmg_testhelper.la \
     149        $(TESTLIBS)
     150
    47151endif
     152

  • test/unit_test/unit_test/force_sinus_unit_test.cpp

    r37becf r329fbd  
    3838#endif
    3939
    40 #include "grid/temp_grid.hpp"
     40#include "base/math.hpp"
     41#include "grid/tempgrid.hpp"
    4142#include "units/particle/interpolation.hpp"
    4243#include "units/particle/particle.hpp"
     44#include "mg.hpp"
    4345
    4446#include "interface_sinus.hpp"
    … …  
    6365};
    6466
    65 BOOST_FIXTURE_TEST_CASE(LibraryForceSinusTest, LibraryForceSinusFixture)
     67BOOST_FIXTURE_TEST_CASE(LibraryForceSinusUnitTest, LibraryForceSinusFixture)
    6668{
    6769  Particle::Interpolation ip(5);
    … …  
    8688        p.Pos() = pos;
    8789
    88         const Index index = (p.Pos()-grid->.Extent().Begin())/grid->.Extent().MeshWidth()-sol.Global().LocalBegin()+sol.Local().Begin();
     90        const Index index = (p.Pos()-grid->Extent().Begin())/grid->Extent().MeshWidth()-grid->Global().LocalBegin()+grid->Local().Begin();
    8991
    9092        ip.ComputeCoefficients(*grid, index);
    … …  
    106108        p.Pos() = pos;
    107109
    108         const Index index = (p.Pos()-sol.Extent().Begin())/sol.Extent().MeshWidth()-sol.Global().LocalBegin()+sol.Local().Begin();
     110        const Index index = (p.Pos()-grid->Extent().Begin())/grid->Extent().MeshWidth()-grid->Global().LocalBegin()+grid->Local().Begin();
    109111
    110         ip.ComputeCoefficients(sol, index);
     112        ip.ComputeCoefficients(*grid, index);
    111113        ip.Evaluate(p);
    112114

  • test/unit_test/unit_test/smoother_lex_test.cpp

    r37becf r329fbd  
    1818
    1919/*
    20  * smoother_test.cpp
     20 * smoother_lex_test.cpp
    2121 *
    22  *  Created on: 20.09.2010
     22 *  Created on: 16.02.2017
    2323 *      Author: Julian Iseringhausen
    2424 */
    … …  
    4040
    4141#include "interface_sinus.hpp"
     42#include "unit_test/smoother_fixture.hpp"
    4243
    4344using namespace VMG;
    4445
    45 struct SmootherFixture
    46 {
    47   SmootherFixture()
    48   {
    49     const Boundary boundary(Dirichlet, Dirichlet, Dirichlet);
    50 
    51     new CommSerial(boundary);
    52     new DiscretizationPoissonFD(2);
    53     new VMGInterfaces::InterfaceSinus(2.0*Math::pi, boundary, 4, 4, 0.0, 1.0);
    54 
    55     MG::PostInit();
    56 
    57     MG::GetInterface()->ImportRightHandSide(*MG::GetRhs());
    58 
    59     gs = new GaussSeidel(false);
    60     gsrb = new GaussSeidelRB(false);
    61   }
    62 
    63   ~SmootherFixture()
    64   {
    65     MG::Destroy();
    66 
    67     delete gs;
    68     delete gsrb;
    69   }
    70 
    71   Smoother* gs;
    72   Smoother* gsrb;
    73 };
    7446
    7547BOOST_FIXTURE_TEST_CASE(SmootherGSLexTest, SmootherFixture)
    … …  
    9466}
    9567
    96 BOOST_FIXTURE_TEST_CASE(SmootherGSRBTest, SmootherFixture)
    97 {
    98   double norm;
    99 
    100   MG::GetSol()->ClearAll();
    101 
    102   for (int i=0; i<20; ++i) {
    103     gsrb->Run(*MG::GetSol(), *MG::GetRhs(), 50);
    104     norm = MG::GetComm()->ComputeResidualNorm(*MG::GetSol(), *MG::GetRhs());
    105     if (norm < 1e-10)
    106       break;
    107   }
    108 
    109   BOOST_CHECK_SMALL(norm, 1e-10);
    110 }
Note: See TracChangeset for help on using the changeset viewer.