Cotire : Fix duplicate global variables

This commit is contained in:
Magne Sjaastad
2018-12-03 15:22:06 +01:00
parent b06097862f
commit 4026f21a00
4 changed files with 12 additions and 15 deletions

View File

@@ -9,14 +9,14 @@
#include <numeric>
static const QString TEST_DATA_DIRECTORY = QString("%1/RifElementPropertyTableReader/").arg(TEST_DATA_DIR);
static const QString ELEM_PROP_TEST_DATA_DIRECTORY = QString("%1/RifElementPropertyTableReader/").arg(TEST_DATA_DIR);
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RicElementPropertyTableReaderTest, BasicUsage)
{
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata(TEST_DATA_DIRECTORY + "ELASTIC_TABLE.inp");
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata(ELEM_PROP_TEST_DATA_DIRECTORY + "ELASTIC_TABLE.inp");
RifElementPropertyTable table;
RifElementPropertyTableReader::readData(&metadata, &table);
@@ -40,7 +40,7 @@ TEST(RicElementPropertyTableReaderTest, ParseFailed)
{
try
{
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata(TEST_DATA_DIRECTORY + "ELASTIC_TABLE_error.inp");
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata(ELEM_PROP_TEST_DATA_DIRECTORY + "ELASTIC_TABLE_error.inp");
RifElementPropertyTable table;
RifElementPropertyTableReader::readData(&metadata, &table);