Add CPPUnit Testing Framework

.travis.yml

@@ -4,9 +4,9 @@ compiler:
   - clang
 before_script:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq libeigen3-dev libgsl0-dev
+  - sudo apt-get install -qq libeigen3-dev libgsl0-dev libcppunit-1.12-1 libcppunit-dev
 script:
-  - echo apt-get install -qq libeigen3-dev libgsl0-dev fglrx=2:8.960-0ubuntu1 opencl-headers libboost-chrono1.48-dev libboost-date-time1.48-dev libboost-filesystem1.48-dev libboost-system1.48-dev libboost-thread1.48-dev libboost-program-options1.48-dev libboost-test1.48-dev
+  - echo apt-get install -qq libeigen3-dev libgsl0-dev libcppunit-1.12-1 libcppunit-dev fglrx=2:8.960-0ubuntu1 opencl-headers libboost-chrono1.48-dev libboost-date-time1.48-dev libboost-filesystem1.48-dev libboost-system1.48-dev libboost-thread1.48-dev libboost-program-options1.48-dev libboost-test1.48-dev
   - echo git clone https://github.com/ddemidov/vexcl
   - ./bootstrap
   - echo ./configure --with-vexcl=${PWD}/vexcl "takes too much RAM to compile"

configure.ac

@@ -133,6 +133,21 @@ if (test x$HAVE_GSL = x1); then
 fi
 AM_CONDITIONAL(ANTIOCH_ENABLE_GSL, test x$HAVE_GSL = x1)
 
+# -------------------------------------------------------------
+# cppunit C++ unit testing -- enabled by default
+# -------------------------------------------------------------
+AC_ARG_ENABLE(cppunit,
+              AS_HELP_STRING([--disable-cppunit],
+                             [Build without cppunit C++ unit testing support]))
+AS_IF([test "x$enable_cppunit" != "xno"], [
+   AM_PATH_CPPUNIT([1.10.0],[enablecppunit=yes],[enablecppunit=no])
+])
+
+if (test x$HAVE_CPPUNIT = x1); then
+  antioch_optional_test_INCLUDES="$CPPUNIT_CPPFLAGS $antioch_optional_test_INCLUDES"
+  antioch_optional_test_LDFLAGS="$CPPUNIT_LIBS $antioch_optional_test_LDFLAGS"
+fi
+AM_CONDITIONAL(ANTIOCH_ENABLE_CPPUNIT, test x$enablecppunit = xyes)
 
 AC_SUBST(antioch_optional_INCLUDES)
 AC_SUBST(antioch_optional_test_INCLUDES)

m4/common/cppunit.m4

@@ -0,0 +1,98 @@
+dnl
+dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+AC_DEFUN([AM_PATH_CPPUNIT],
+[
+
+AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
+            cppunit_config_prefix="$withval", cppunit_config_prefix="")
+AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
+            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
+
+  if test x$cppunit_config_exec_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
+     fi
+  fi
+  if test x$cppunit_config_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
+     fi
+  fi
+
+  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
+  cppunit_version_min=$1
+
+  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
+  no_cppunit=""
+  if test "$CPPUNIT_CONFIG" = "no" ; then
+    AC_MSG_RESULT(no)
+    no_cppunit=yes
+  else
+    CPPUNIT_CPPFLAGS=`$CPPUNIT_CONFIG --cflags`
+    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+    CPPUNIT_VERSION=`$CPPUNIT_CONFIG --version`
+    CPPUNIT_PREFIX=`$CPPUNIT_CONFIG --prefix`
+    cppunit_version=`$CPPUNIT_CONFIG --version`
+
+    cppunit_major_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    cppunit_minor_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    cppunit_micro_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    cppunit_major_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    if test "x${cppunit_major_min}" = "x" ; then
+       cppunit_major_min=0
+    fi
+
+    cppunit_minor_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    if test "x${cppunit_minor_min}" = "x" ; then
+       cppunit_minor_min=0
+    fi
+
+    cppunit_micro_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x${cppunit_micro_min}" = "x" ; then
+       cppunit_micro_min=0
+    fi
+
+    cppunit_version_proper=`expr \
+        $cppunit_major_version \> $cppunit_major_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \> $cppunit_minor_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \= $cppunit_minor_min \& \
+        $cppunit_micro_version \>= $cppunit_micro_min `
+
+    if test "$cppunit_version_proper" = "1" ; then
+      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
+    else
+      AC_MSG_RESULT(no)
+      no_cppunit=yes
+    fi
+  fi
+
+  if test "x$no_cppunit" = x ; then
+     ifelse([$2], , :, [$2])
+     AC_SUBST(HAVE_CPPUNIT,[1])
+     AC_DEFINE([HAVE_CPPUNIT], [1], [Enable CPPUnit Tests])
+  else
+     CPPUNIT_CPPFLAGS=""
+     CPPUNIT_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+
+  AC_SUBST(CPPUNIT_VERSION)
+  AC_SUBST(CPPUNIT_PREFIX)
+  AC_SUBST(CPPUNIT_CPPFLAGS)
+  AC_SUBST(CPPUNIT_LIBS)
+])
+
+
+

m4/config_summary.m4

@@ -32,6 +32,16 @@ echo Revision id................... : $BUILD_VERSION
 echo
 echo Testing Options:
 echo '  'Number of tuples............ : $n_tuples
+if test "x$HAVE_CPPUNIT" = "x1"; then
+  echo '  'CPPUnit..................... : yes
+  echo '    'CPPUNIT_VERSION........... : $CPPUNIT_VERSION
+  echo '    'CPPUNIT_CPPFLAGS.......... : $CPPUNIT_CPPFLAGS
+  echo '    'CPPUNIT_LIBS.............. : $CPPUNIT_LIBS
+else
+  echo '  'CPPUnit..................... : no
+fi
+echo
+echo Optional Libraries:
 if test "x$HAVE_EIGEN" = "x1"; then
   echo '  'Eigen....................... : yes
 else

test/Makefile.am

@@ -1,6 +1,10 @@
 EXTRA_DIST = input_files
 
 check_PROGRAMS  =
+check_PROGRAMS += standard_unit_tests
+check_PROGRAMS += eigen_unit_tests
+check_PROGRAMS += vexcl_unit_tests
+check_PROGRAMS += metaphysicl_unit_tests
 check_PROGRAMS += chem_mixture_unit
 check_PROGRAMS += chem_mixture_vec_unit
 check_PROGRAMS += nasa_evaluator_unit
@@ -14,8 +18,6 @@ check_PROGRAMS += hercourtessen_rate_vec_unit
 check_PROGRAMS += berthelot_rate_unit
 check_PROGRAMS += berthelot_rate_vec_unit
 check_PROGRAMS += arrhenius_rate_deriv
-check_PROGRAMS += arrhenius_rate_unit
-check_PROGRAMS += arrhenius_rate_vec_unit
 check_PROGRAMS += kooij_rate_unit
 check_PROGRAMS += kooij_rate_vec_unit
 check_PROGRAMS += berthelothercourtessen_rate_unit
@@ -86,13 +88,32 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/thermal_conduction/include
 AM_CPPFLAGS += -I$(top_srcdir)/src/transport/include
 AM_CPPFLAGS += -I$(top_srcdir)/src/utilities/include
 AM_CPPFLAGS += -I$(top_builddir)/src/utilities/include #antioch_version.h
+AM_CPPFLAGS += -I$(top_srcdir)/test/standard_unit
 AM_CPPFLAGS +=  $(antioch_optional_test_INCLUDES)
 
 AM_LDFLAGS = $(antioch_optional_test_LDFLAGS)
 LIBS = $(antioch_optional_test_LIBS)
 
 LDADD = $(top_builddir)/src/libantioch.la
 
+pkginclude_HEADERS =
+
+standard_unit_tests_SOURCES = standard_unit/arrhenius_rate_test.C        \
+                              standard_unit/arrhenius_rate_valarray_test.C \
+                              standard_unit/standard_unit_tests.C
+
+eigen_unit_tests_SOURCES = eigen_unit/arrhenius_rate_eigen_test.C \
+                           eigen_unit/eigen_unit_tests.C
+
+vexcl_unit_tests_SOURCES = vexcl_unit/arrhenius_rate_vexcl_test.C \
+                           vexcl_unit/vexcl_unit_tests.C
+
+metaphysicl_unit_tests_SOURCES = metaphysicl_unit/arrhenius_rate_metaphysicl_test.C \
+                                 metaphysicl_unit/metaphysicl_unit_tests.C
+
+pkginclude_HEADERS += standard_unit/reaction_rate_test_base.h
+pkginclude_HEADERS += standard_unit/arrhenius_rate_test_helper.h
+
 # Sources for these tests
 chem_mixture_unit_SOURCES = chem_mixture_unit.C
 chem_mixture_vec_unit_SOURCES = chem_mixture_vec_unit.C
@@ -107,8 +128,6 @@ hercourtessen_rate_vec_unit_SOURCES = hercourtessen_rate_vec_unit.C
 berthelot_rate_unit_SOURCES = berthelot_rate_unit.C
 berthelot_rate_vec_unit_SOURCES = berthelot_rate_vec_unit.C
 arrhenius_rate_deriv_SOURCES = arrhenius_rate_deriv.C
-arrhenius_rate_unit_SOURCES = arrhenius_rate_unit.C
-arrhenius_rate_vec_unit_SOURCES = arrhenius_rate_vec_unit.C
 berthelothercourtessen_rate_unit_SOURCES = berthelothercourtessen_rate_unit.C
 berthelothercourtessen_rate_vec_unit_SOURCES = berthelothercourtessen_rate_vec_unit.C
 kooij_rate_unit_SOURCES = kooij_rate_unit.C
@@ -170,6 +189,10 @@ stat_mech_thermo_unit_eigen_SOURCES = stat_mech_thermo_unit_eigen.C
 
 #Define tests to actually be run
 TESTS  =
+TESTS += standard_unit_tests
+TESTS += eigen_unit_tests
+TESTS += vexcl_unit_tests
+TESTS += metaphysicl_unit_tests
 TESTS += chem_mixture_unit
 TESTS += chem_mixture_vec_unit
 TESTS += nasa_evaluator_unit.sh
@@ -183,8 +206,6 @@ TESTS += hercourtessen_rate_unit
 TESTS += berthelot_rate_vec_unit
 TESTS += berthelot_rate_vec_unit
 TESTS += arrhenius_rate_deriv
-TESTS += arrhenius_rate_unit
-TESTS += arrhenius_rate_vec_unit
 TESTS += berthelothercourtessen_rate_unit
 TESTS += berthelothercourtessen_rate_vec_unit
 TESTS += kooij_rate_unit