OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix clang-format.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-08-18 10:09:52 +02:00
parent 1bd710d0db
commit 67af692f96
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/FileInterface/RifElementPropertyTableReader.cpp
View File

@ -111,9 +111,9 @@ void RifElementPropertyTableReader::readData( const RifElementPropertyMetadata*
if ( file && expectedColumnCount > 0 )
{
QTextStream stream( file );
bool dataBlockFound = false;
bool completeDataLineFound = false;
int lineNo = 0;
bool dataBlockFound = false;
bool completeDataLineFound = false;
int lineNo = 0;
QStringList collectedCols;
// Init data vectors
@ -122,7 +122,7 @@ void RifElementPropertyTableReader::readData( const RifElementPropertyMetadata*
while ( !stream.atEnd() )
{
QString line = stream.readLine();
QString line = stream.readLine();
if ( !line.startsWith( "*" ) )
{
if ( collectedCols.size() > 0 && collectedCols.size() != 8 )
@ -147,8 +147,8 @@ void RifElementPropertyTableReader::readData( const RifElementPropertyMetadata*
{
if ( !line.startsWith( "*" ) && !line.startsWith( "," ) && collectedCols.size() == expectedColumnCount )
{
completeDataLineFound = true;
dataBlockFound = true;
completeDataLineFound = true;
dataBlockFound = true;
}
else if ( collectedCols.size() > expectedColumnCount )
{

5
ApplicationCode/UnitTests/RifElementPropertyTableReader-Test.cpp
View File

@ -43,8 +43,8 @@ TEST( RicElementPropertyTableReaderTest, ParseFailedForTooManyColumns )
{
try
{
RifElementPropertyMetadata metadata =
RifElementPropertyTableReader::readMetadata( ELEM_PROP_TEST_DATA_DIRECTORY + "ELASTIC_TABLE_error_too_many_columns.inp" );
RifElementPropertyMetadata metadata = RifElementPropertyTableReader::readMetadata(
ELEM_PROP_TEST_DATA_DIRECTORY + "ELASTIC_TABLE_error_too_many_columns.inp" );
RifElementPropertyTable table;
RifElementPropertyTableReader::readData( &metadata, &table );
@ -102,7 +102,6 @@ TEST( RicElementPropertyTableReaderTest, MoreThanEightColumns )
EXPECT_STREQ( "MODULUS", metadata.dataColumns[7].toStdString().c_str() );
EXPECT_STREQ( "MODULUS", metadata.dataColumns[8].toStdString().c_str() );
EXPECT_EQ( 9u, table.data.size() );
EXPECT_EQ( 8u, table.elementIds.size() );
EXPECT_EQ( 8u, table.data[0].size() );