[test][discretization] Fix tpfa noncomforming test

* do not inherit from ModelProperties
* use CMAKE_GUARD to skip test if alugrid not found

test/discretization/cellcentered/tpfa/CMakeLists.txt

@@ -5,9 +5,11 @@ dune_add_test(NAME test_tpfafvgeometry
 dune_add_test(NAME test_tpfafvgeometry_nonconforming
               SOURCES test_tpfafvgeometry_nonconforming.cc
               COMPILE_DEFINITIONS TYPETAG=TestFVGeometryNonConforming
+              CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ./test_tpfafvgeometry_nonconforming)
 
 dune_add_test(NAME test_cachedtpfafvgeometry_nonconforming
               SOURCES test_tpfafvgeometry_nonconforming.cc
               COMPILE_DEFINITIONS TYPETAG=TestCachedFVGeometryNonConforming
+              CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ./test_cachedtpfafvgeometry_nonconforming)

test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc

@@ -34,7 +34,6 @@
 #include <dune/grid/common/mcmgmapper.hh>
 
 #include <dumux/common/properties.hh>
-#include <dumux/common/properties/model.hh>
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
 
 //! Dummy flux variables class so that we can update the connectivity map
@@ -53,12 +52,12 @@ public:
 namespace Dumux {
     namespace Properties{
         //! Test without using global caching of the geometries
-        NEW_TYPE_TAG(TestFVGeometryNonConforming, INHERITS_FROM(CCTpfaModel, ModelProperties));
+        NEW_TYPE_TAG(TestFVGeometryNonConforming, INHERITS_FROM(CCTpfaModel));
         SET_TYPE_PROP(TestFVGeometryNonConforming, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
         SET_TYPE_PROP(TestFVGeometryNonConforming, FluxVariables, MockFluxVariables);
 
         //! Test using global geometry caching
-        NEW_TYPE_TAG(TestCachedFVGeometryNonConforming, INHERITS_FROM(CCTpfaModel, ModelProperties));
+        NEW_TYPE_TAG(TestCachedFVGeometryNonConforming, INHERITS_FROM(CCTpfaModel));
         SET_TYPE_PROP(TestCachedFVGeometryNonConforming, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
         SET_BOOL_PROP(TestCachedFVGeometryNonConforming, EnableFVGridGeometryCache, true);
         SET_TYPE_PROP(TestCachedFVGeometryNonConforming, FluxVariables, MockFluxVariables);