OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 22:50:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix clang issues

Browse Source 
* Remove unnecessary message parameter from PdmFieldScriptingCapabilityIOHandler readFromField calls
* Add checks for QFile open operations in BaseTest ReadWrite tests
* Fix integer size assertions in AppEnum and PdmLogging tests
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2026-04-10 06:57:52 +02:00
1 parent 20c8888cba
commit 52329d567d
4 files changed
+43 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmFieldSerializationTest.cpp
+6 -11
View File
@@ -157,10 +157,7 @@ TEST( PdmFieldSerialization, ValueList )
caf::PdmScriptIOMessages messages;
bool stringsAreQuoted = true;
caf::PdmFieldScriptingCapabilityIOHandler<std::vector<float>>::readFromField( floatValues,
stream,
&messages,
stringsAreQuoted );
caf::PdmFieldScriptingCapabilityIOHandler<std::vector<float>>::readFromField( floatValues, stream, stringsAreQuoted );
const QString expected = "[1.5, 0.0001, 1.77e+10]";
EXPECT_STREQ( expected.toStdString().c_str(), text.toStdString().c_str() );
@@ -234,7 +231,6 @@ TEST( PdmFieldSerialization, OptionalValues )
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<QString>>::readFromField( optionalString,
stream,
&messages,
stringsAreQuoted );
const QString expected = "";
@@ -261,7 +257,6 @@ TEST( PdmFieldSerialization, OptionalValues )
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<QString>>::readFromField( optionalString,
stream,
&messages,
stringsAreQuoted );
const QString expected = "\"Test string with spaces\"";
@@ -286,7 +281,7 @@ TEST( PdmFieldSerialization, OptionalValues )
caf::PdmScriptIOMessages messages;
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<float>>::readFromField( optionalString, stream, &messages );
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<float>>::readFromField( optionalString, stream );
const QString expected = "23.45";
EXPECT_STREQ( expected.toStdString().c_str(), text.toStdString().c_str() );
@@ -308,7 +303,7 @@ TEST( PdmFieldSerialization, OptionalValues )
caf::PdmScriptIOMessages messages;
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<double>>::readFromField( optionalString, stream, &messages );
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<double>>::readFromField( optionalString, stream );
const QString expected = "2.345000000000000e+01";
EXPECT_STREQ( expected.toStdString().c_str(), text.toStdString().c_str() );
@@ -327,7 +322,7 @@ TEST( PdmFieldSerialization, OptionalValues )
QString text;
QTextStream stream( &text );
caf::PdmScriptIOMessages messages;
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<bool>>::readFromField( optionalString, stream, &messages );
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<bool>>::readFromField( optionalString, stream );
const QString expected = "true";
EXPECT_STREQ( expected.toStdString().c_str(), text.toStdString().c_str() );
@@ -345,7 +340,7 @@ TEST( PdmFieldSerialization, OptionalValues )
QString text;
QTextStream stream( &text );
caf::PdmScriptIOMessages messages;
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<int>>::readFromField( optionalString, stream, &messages );
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<int>>::readFromField( optionalString, stream );
const QString expected = "2345";
EXPECT_STREQ( expected.toStdString().c_str(), text.toStdString().c_str() );
@@ -362,7 +357,7 @@ TEST( PdmFieldSerialization, OptionalValues )
QString text;
QTextStream stream( &text );
caf::PdmScriptIOMessages messages;
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<int>>::readFromField( optionalInt, stream, &messages );
caf::PdmFieldScriptingCapabilityIOHandler<std::optional<int>>::readFromField( optionalInt, stream );
const QString expected = "";
EXPECT_STREQ( expected.toStdString().c_str(), text.toStdString().c_str() );
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafAppEnumTest.cpp
+4 -4
View File
@@ -90,11 +90,11 @@ TEST( AppEnumTest, EnumSubsetNoCollision )
auto retrievedSubset2 = caf::AppEnum<TestEnumType>::enumSubset( &obj2.m_enumField );
// Verify that the subsets are correct and independent
ASSERT_EQ( 2, retrievedSubset1.size() );
ASSERT_EQ( 2u, retrievedSubset1.size() );
EXPECT_EQ( TestEnumType::VALUE_A, retrievedSubset1[0] );
EXPECT_EQ( TestEnumType::VALUE_B, retrievedSubset1[1] );
ASSERT_EQ( 3, retrievedSubset2.size() );
ASSERT_EQ( 3u, retrievedSubset2.size() );
EXPECT_EQ( TestEnumType::VALUE_C, retrievedSubset2[0] );
EXPECT_EQ( TestEnumType::VALUE_D, retrievedSubset2[1] );
EXPECT_EQ( TestEnumType::VALUE_E, retrievedSubset2[2] );
@@ -116,8 +116,8 @@ TEST( AppEnumTest, EnumSubsetSameClass )
auto retrievedSubset1 = caf::AppEnum<TestEnumType>::enumSubset( &obj1a.m_enumField );
auto retrievedSubset2 = caf::AppEnum<TestEnumType>::enumSubset( &obj1b.m_enumField );
ASSERT_EQ( 2, retrievedSubset1.size() );
ASSERT_EQ( 2, retrievedSubset2.size() );
ASSERT_EQ( 2u, retrievedSubset1.size() );
ASSERT_EQ( 2u, retrievedSubset2.size() );
EXPECT_EQ( TestEnumType::VALUE_A, retrievedSubset1[0] );
EXPECT_EQ( TestEnumType::VALUE_C, retrievedSubset1[1] );
EXPECT_EQ( TestEnumType::VALUE_A, retrievedSubset2[0] );
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmLoggingTest.cpp
+30 -30
View File
@@ -156,7 +156,7 @@ TEST_F( PdmLoggingTest, DuplicateRegistration )
// Should still be registered only once
caf::PdmLogging::error( "Test message" );
EXPECT_EQ( 1, m_testLogger1->errorCount() );
EXPECT_EQ( 1u, m_testLogger1->errorCount() );
}
//--------------------------------------------------------------------------------------------------
@@ -187,10 +187,10 @@ TEST_F( PdmLoggingTest, BasicMessageLogging )
caf::PdmLogging::debug( "Debug message" );
// Verify messages were captured
EXPECT_EQ( 1, m_testLogger1->errorCount() );
EXPECT_EQ( 1, m_testLogger1->warningCount() );
EXPECT_EQ( 1, m_testLogger1->infoCount() );
EXPECT_EQ( 1, m_testLogger1->debugCount() );
EXPECT_EQ( 1u, m_testLogger1->errorCount() );
EXPECT_EQ( 1u, m_testLogger1->warningCount() );
EXPECT_EQ( 1u, m_testLogger1->infoCount() );
EXPECT_EQ( 1u, m_testLogger1->debugCount() );
EXPECT_EQ( "Error message", m_testLogger1->errorMessages()[0] );
EXPECT_EQ( "Warning message", m_testLogger1->warningMessages()[0] );
@@ -212,10 +212,10 @@ TEST_F( PdmLoggingTest, LogLevelFiltering )
caf::PdmLogging::debug( "Debug message" );
// Should receive error, warning, info but not debug
EXPECT_EQ( 1, m_testLogger2->errorCount() );
EXPECT_EQ( 1, m_testLogger2->warningCount() );
EXPECT_EQ( 1, m_testLogger2->infoCount() );
EXPECT_EQ( 0, m_testLogger2->debugCount() );
EXPECT_EQ( 1u, m_testLogger2->errorCount() );
EXPECT_EQ( 1u, m_testLogger2->warningCount() );
EXPECT_EQ( 1u, m_testLogger2->infoCount() );
EXPECT_EQ( 0u, m_testLogger2->debugCount() );
}
//--------------------------------------------------------------------------------------------------
@@ -234,19 +234,19 @@ TEST_F( PdmLoggingTest, MultipleLoggers )
caf::PdmLogging::debug( "Debug message" );
// Error message should reach all loggers
EXPECT_EQ( 1, m_testLogger1->errorCount() );
EXPECT_EQ( 1, m_testLogger2->errorCount() );
EXPECT_EQ( 1, m_testLogger3->errorCount() );
EXPECT_EQ( 1u, m_testLogger1->errorCount() );
EXPECT_EQ( 1u, m_testLogger2->errorCount() );
EXPECT_EQ( 1u, m_testLogger3->errorCount() );
// Warning should reach debug and info loggers, but not error-only logger
EXPECT_EQ( 1, m_testLogger1->warningCount() );
EXPECT_EQ( 1, m_testLogger2->warningCount() );
EXPECT_EQ( 0, m_testLogger3->warningCount() );
EXPECT_EQ( 1u, m_testLogger1->warningCount() );
EXPECT_EQ( 1u, m_testLogger2->warningCount() );
EXPECT_EQ( 0u, m_testLogger3->warningCount() );
// Debug should only reach debug logger
EXPECT_EQ( 1, m_testLogger1->debugCount() );
EXPECT_EQ( 0, m_testLogger2->debugCount() );
EXPECT_EQ( 0, m_testLogger3->debugCount() );
EXPECT_EQ( 1u, m_testLogger1->debugCount() );
EXPECT_EQ( 0u, m_testLogger2->debugCount() );
EXPECT_EQ( 0u, m_testLogger3->debugCount() );
}
//--------------------------------------------------------------------------------------------------
@@ -265,8 +265,8 @@ TEST_F( PdmLoggingTest, ClearAllLoggers )
// Logging should not reach any logger now
caf::PdmLogging::error( "Error message" );
EXPECT_EQ( 0, m_testLogger1->errorCount() );
EXPECT_EQ( 0, m_testLogger2->errorCount() );
EXPECT_EQ( 0u, m_testLogger1->errorCount() );
EXPECT_EQ( 0u, m_testLogger2->errorCount() );
}
//--------------------------------------------------------------------------------------------------
@@ -282,10 +282,10 @@ TEST_F( PdmLoggingTest, LoggingMacros )
CAF_PDM_LOG_INFO( "Macro info" );
CAF_PDM_LOG_DEBUG( "Macro debug" );
EXPECT_EQ( 1, m_testLogger1->errorCount() );
EXPECT_EQ( 1, m_testLogger1->warningCount() );
EXPECT_EQ( 1, m_testLogger1->infoCount() );
EXPECT_EQ( 1, m_testLogger1->debugCount() );
EXPECT_EQ( 1u, m_testLogger1->errorCount() );
EXPECT_EQ( 1u, m_testLogger1->warningCount() );
EXPECT_EQ( 1u, m_testLogger1->infoCount() );
EXPECT_EQ( 1u, m_testLogger1->debugCount() );
EXPECT_EQ( "Macro error", m_testLogger1->errorMessages()[0] );
EXPECT_EQ( "Macro warning", m_testLogger1->warningMessages()[0] );
@@ -305,7 +305,7 @@ TEST_F( PdmLoggingTest, ConditionalLoggingMacros )
CAF_PDM_LOG_DEBUG_IF( "Conditional debug" );
// No messages should be logged since no loggers registered
EXPECT_EQ( 0, m_testLogger1->errorCount() );
EXPECT_EQ( 0u, m_testLogger1->errorCount() );
// Register logger and test again
caf::PdmLogging::registerLogger( m_testLogger1 );
@@ -316,10 +316,10 @@ TEST_F( PdmLoggingTest, ConditionalLoggingMacros )
CAF_PDM_LOG_DEBUG_IF( "Conditional debug" );
// Now messages should be logged
EXPECT_EQ( 1, m_testLogger1->errorCount() );
EXPECT_EQ( 1, m_testLogger1->warningCount() );
EXPECT_EQ( 1, m_testLogger1->infoCount() );
EXPECT_EQ( 1, m_testLogger1->debugCount() );
EXPECT_EQ( 1u, m_testLogger1->errorCount() );
EXPECT_EQ( 1u, m_testLogger1->warningCount() );
EXPECT_EQ( 1u, m_testLogger1->infoCount() );
EXPECT_EQ( 1u, m_testLogger1->debugCount() );
}
//--------------------------------------------------------------------------------------------------
@@ -338,6 +338,6 @@ TEST_F( PdmLoggingTest, ThreadSafety )
caf::PdmLogging::unregisterLogger( m_testLogger2 );
}
EXPECT_EQ( 100, m_testLogger1->errorCount() );
EXPECT_EQ( 100u, m_testLogger1->errorCount() );
EXPECT_TRUE( caf::PdmLogging::hasLoggers() );
}
Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp
+3 -3
View File
@@ -620,8 +620,8 @@ TEST( BaseTest, ReadWrite )
{
QFile f1( fileName );
QFile f2( fileNameCopy );
f1.open( QIODevice::ReadOnly | QIODevice::Text );
f2.open( QIODevice::ReadOnly | QIODevice::Text );
EXPECT_TRUE( f1.open( QIODevice::ReadOnly | QIODevice::Text ) );
EXPECT_TRUE( f2.open( QIODevice::ReadOnly | QIODevice::Text ) );
QByteArray ba1 = f1.readAll();
QByteArray ba2 = f2.readAll();
bool equal = ba1 == ba2;
@@ -702,7 +702,7 @@ TEST( BaseTest, ReadWrite )
// Write the edited document
QFile f3( "PdmTestFilWithError.xml" );
f3.open( QIODevice::WriteOnly | QIODevice::Text );
EXPECT_TRUE( f3.open( QIODevice::WriteOnly | QIODevice::Text ) );
f3.write( ba1 );
f3.close();