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

#4683 clang-format on all files in ApplicationCode

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ApplicationCode/UnitTests/RiaTextFileCompare-Test.cpp
View File

@@ -8,79 +8,79 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RiaTextFileCompareTest, BasicCompareWithDiff)
TEST( RiaTextFileCompareTest, BasicCompareWithDiff )
{
RiaRegressionTest regTestConfig;
regTestConfig.readSettingsFromApplicationStore();
QString folderContainingDiff = regTestConfig.folderContainingDiffTool();
QString baseFolder = QString("%1/TextCompare/base").arg(TEST_DATA_DIR);
QString referenceFolder = QString("%1/TextCompare/reference").arg(TEST_DATA_DIR);
QString baseFolder = QString( "%1/TextCompare/base" ).arg( TEST_DATA_DIR );
QString referenceFolder = QString( "%1/TextCompare/reference" ).arg( TEST_DATA_DIR );
RiaTextFileCompare compare(folderContainingDiff);
RiaTextFileCompare compare( folderContainingDiff );
bool noDifference = compare.runComparison(baseFolder, referenceFolder);
EXPECT_FALSE(noDifference);
bool noDifference = compare.runComparison( baseFolder, referenceFolder );
EXPECT_FALSE( noDifference );
QString diffOutput = compare.diffOutput();
EXPECT_FALSE(diffOutput.isEmpty());
EXPECT_FALSE( diffOutput.isEmpty() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RiaTextFileCompareTest, BasicCompareNoDiff)
TEST( RiaTextFileCompareTest, BasicCompareNoDiff )
{
RiaRegressionTest regTestConfig;
regTestConfig.readSettingsFromApplicationStore();
QString folderContainingDiff = regTestConfig.folderContainingDiffTool();
QString baseFolder = QString("%1/TextCompare/base/folderB").arg(TEST_DATA_DIR);
QString referenceFolder = QString("%1/TextCompare/reference/folderB").arg(TEST_DATA_DIR);
QString baseFolder = QString( "%1/TextCompare/base/folderB" ).arg( TEST_DATA_DIR );
QString referenceFolder = QString( "%1/TextCompare/reference/folderB" ).arg( TEST_DATA_DIR );
RiaTextFileCompare compare(folderContainingDiff);
RiaTextFileCompare compare( folderContainingDiff );
bool noDifference = compare.runComparison(baseFolder, referenceFolder);
EXPECT_TRUE(noDifference);
bool noDifference = compare.runComparison( baseFolder, referenceFolder );
EXPECT_TRUE( noDifference );
QString diffOutput = compare.diffOutput();
EXPECT_TRUE(diffOutput.isEmpty());
EXPECT_TRUE( diffOutput.isEmpty() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RiaTextFileCompareTest, BasicCompareError)
TEST( RiaTextFileCompareTest, BasicCompareError )
{
RiaRegressionTest regTestConfig;
regTestConfig.readSettingsFromApplicationStore();
QString folderContainingDiff = regTestConfig.folderContainingDiffTool();
QString baseFolder = QString("%1/TextCompare/baseDoesNotExist").arg(TEST_DATA_DIR);
QString referenceFolder = QString("%1/TextCompare/reference/folderB").arg(TEST_DATA_DIR);
QString baseFolder = QString( "%1/TextCompare/baseDoesNotExist" ).arg( TEST_DATA_DIR );
QString referenceFolder = QString( "%1/TextCompare/reference/folderB" ).arg( TEST_DATA_DIR );
RiaTextFileCompare compare(folderContainingDiff);
RiaTextFileCompare compare( folderContainingDiff );
bool noDifference = compare.runComparison(baseFolder, referenceFolder);
EXPECT_FALSE(noDifference);
bool noDifference = compare.runComparison( baseFolder, referenceFolder );
EXPECT_FALSE( noDifference );
QString error = compare.errorMessage();
EXPECT_FALSE(error.isEmpty());
EXPECT_FALSE( error.isEmpty() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(DISABLED_RiaGitDiffTest, BasicCompare)
TEST( DISABLED_RiaGitDiffTest, BasicCompare )
{
RiaRegressionTest regTestConfig;
regTestConfig.readSettingsFromApplicationStore();
QString folderContainingDiff = regTestConfig.folderContainingGitTool();
RiaGitDiff compare(folderContainingDiff);
RiaGitDiff compare( folderContainingDiff );
QString baseFolder = QString("d:/gitroot-ceesol/ResInsight-regression-test/ProjectFiles/CommandFileTests");
QString baseFolder = QString( "d:/gitroot-ceesol/ResInsight-regression-test/ProjectFiles/CommandFileTests" );
compare.executeDiff(baseFolder);
compare.executeDiff( baseFolder );
compare.diffOutput();
}