OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix expected MD5 strings in Eclipse Output test for Linux

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-03-22 13:16:13 +01:00
parent 97e847a9d1
commit e40b3aa6e8
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp
+10 -2
View File
@@ -118,7 +118,7 @@ TEST(RigReservoirTest, BasicTest10kRestart)
unrstAccess.resultNames(&resultNames, &dataItemCount); unrstAccess.resultNames(&resultNames, &dataItemCount);
EXPECT_EQ(resultNames.size(), dataItemCount.size()); EXPECT_EQ(resultNames.size(), (int) dataItemCount.size());
EXPECT_EQ(83, resultNames.size()); EXPECT_EQ(83, resultNames.size());
/* for (int i = 0; i < resultNames.size(); i++) /* for (int i = 0; i < resultNames.size(); i++)
@@ -163,8 +163,16 @@ TEST(RigReservoirTest, BasicTest10k_NativeECL)
fclose(filePtr); fclose(filePtr);
EXPECT_TRUE(QFile::exists(outFilePath)); EXPECT_TRUE(QFile::exists(outFilePath));
QString expectedMd5("\xE9\x93\xB8Q@V\x8F\x13\xF4\xC3\x84\x96\x04p\n\x0F"); #ifdef _WIN32
QString expectedMd5(QByteArray::fromHex("e993b85140568f13f4c3849604700a0f"));
#else
QString expectedMd5(QByteArray::fromHex("274e44fe51299c1f9ca6645c384e237d"));
#endif
QByteArray generatedMd5 = RifEclipseOutputFileTools::md5sum(outFilePath); QByteArray generatedMd5 = RifEclipseOutputFileTools::md5sum(outFilePath);
// Enable to produce text string so expectedMd5 can be updated
// Qt4 doesn't take a parameter for toHex()
//qDebug() << expectedMd5.toLatin1().toHex(0) << " " << generatedMd5.toHex(0);
EXPECT_TRUE(generatedMd5 == expectedMd5); EXPECT_TRUE(generatedMd5 == expectedMd5);
#ifdef _MSC_VER #ifdef _MSC_VER