OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #642 from bska/no-local-tags

Browse Source 
Move local type tags out of individual tests.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-08-28 15:04:58 +02:00
commit c76d554b69
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_compressedpropertyaccess.cpp
View File

@ -241,14 +241,14 @@ BOOST_FIXTURE_TEST_CASE(CAExtractIntUndefinedAny,
// Construct compressed integer (int) array based on global, fully // Construct compressed integer (int) array based on global, fully
// specified array extracted from input deck. Custom type-check tag. // specified array extracted from input deck. Custom type-check tag.
struct RegionID : public Opm::GridPropertyAccess::Tag::Any {};
BOOST_FIXTURE_TEST_CASE(CAExtractIntDefinedCustom, BOOST_FIXTURE_TEST_CASE(CAExtractIntDefinedCustom,
TestFixture<SetupSimple>) TestFixture<SetupSimple>)
{ {
typedef Opm::GridPropertyAccess::ArrayPolicy typedef Opm::GridPropertyAccess::ArrayPolicy
::ExtractFromDeck<int> ECLGlobalIntArray; ::ExtractFromDeck<int> ECLGlobalIntArray;
struct RegionID : public Opm::GridPropertyAccess::Tag::Any {};
typedef Opm::GridPropertyAccess:: typedef Opm::GridPropertyAccess::
Compressed<ECLGlobalIntArray, RegionID> CompressedArray; Compressed<ECLGlobalIntArray, RegionID> CompressedArray;
@ -283,14 +283,14 @@ BOOST_FIXTURE_TEST_CASE(CAConstantDoubleAny,
// Construct compressed double array based on global constant value // Construct compressed double array based on global constant value
// for all cells. Custom type-check tag. // for all cells. Custom type-check tag.
struct MyTag : public Opm::GridPropertyAccess::Tag::Any {};
BOOST_FIXTURE_TEST_CASE(CAConstantDoubleCustom, BOOST_FIXTURE_TEST_CASE(CAConstantDoubleCustom,
TestFixture<SetupSimple>) TestFixture<SetupSimple>)
{ {
typedef Opm::GridPropertyAccess::ArrayPolicy typedef Opm::GridPropertyAccess::ArrayPolicy
::Constant<double> ConstantDoubleArray; ::Constant<double> ConstantDoubleArray;
struct MyTag : public Opm::GridPropertyAccess::Tag::Any {};
typedef Opm::GridPropertyAccess:: typedef Opm::GridPropertyAccess::
Compressed<ConstantDoubleArray, MyTag> CompressedArray; Compressed<ConstantDoubleArray, MyTag> CompressedArray;
@ -333,8 +333,6 @@ BOOST_FIXTURE_TEST_CASE(CAConstantIntCustom,
typedef Opm::GridPropertyAccess::ArrayPolicy typedef Opm::GridPropertyAccess::ArrayPolicy
::Constant<int> ConstantIntArray; ::Constant<int> ConstantIntArray;
struct MyTag : public Opm::GridPropertyAccess::Tag::Any {};
typedef Opm::GridPropertyAccess:: typedef Opm::GridPropertyAccess::
Compressed<ConstantIntArray, MyTag> CompressedArray; Compressed<ConstantIntArray, MyTag> CompressedArray;