[discretization][test] Fix box and ccTpfa tests

* use correct includes and inheritance

test/discretization/box/test_boxfvgeometry.cc

@@ -31,7 +31,8 @@
 #include <dune/grid/yaspgrid.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
+#include <dumux/common/properties/model.hh>
 #include <dumux/discretization/box/properties.hh>
 
 namespace Dumux
@@ -39,7 +40,7 @@ namespace Dumux
 
 namespace Properties
 {
-NEW_TYPE_TAG(TestBoxFVGeometry, INHERITS_FROM(BoxModel, NumericModel));
+NEW_TYPE_TAG(TestBoxFVGeometry, INHERITS_FROM(BoxModel, ModelProperties));
 
 SET_TYPE_PROP(TestBoxFVGeometry, Grid, Dune::YaspGrid<3>);
 SET_BOOL_PROP(TestBoxFVGeometry, EnableFVGridGeometryCache, ENABLE_CACHING);

test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc

@@ -31,7 +31,8 @@
 #include <dune/grid/yaspgrid.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 
-#include <dumux/common/basicproperties.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
@@ -49,7 +50,7 @@ public:
 
 namespace Dumux {
     namespace Properties {
-        NEW_TYPE_TAG(TestFVGeometry, INHERITS_FROM(CCTpfaModel, NumericModel));
+        NEW_TYPE_TAG(TestFVGeometry, INHERITS_FROM(CCTpfaModel, ModelProperties));
         SET_TYPE_PROP(TestFVGeometry, Grid, Dune::YaspGrid<2>);
         SET_TYPE_PROP(TestFVGeometry, FluxVariables, MockFluxVariables);
     }

test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc

@@ -33,7 +33,8 @@
 #include <dune/alugrid/grid.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 
-#include <dumux/common/basicproperties.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
@@ -52,12 +53,12 @@ public:
 namespace Dumux {
     namespace Properties{
         //! Test without using global caching of the geometries
-        NEW_TYPE_TAG(TestFVGeometryNonConforming, INHERITS_FROM(CCTpfaModel, NumericModel));
+        NEW_TYPE_TAG(TestFVGeometryNonConforming, INHERITS_FROM(CCTpfaModel, ModelProperties));
         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, NumericModel));
+        NEW_TYPE_TAG(TestCachedFVGeometryNonConforming, INHERITS_FROM(CCTpfaModel, ModelProperties));
         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);