From a4921898743a13e2e15486a84d6a3e90019e7419 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sat, 30 Apr 2016 23:02:28 +0100 Subject: [PATCH] refs #653 Rephrase "uninitialized value" message. --- src/blackmisc/valuecache.cpp | 2 +- tests/blackmisc/testvaluecache.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp index a31db89cb..2f2bdfd0d 100644 --- a/src/blackmisc/valuecache.cpp +++ b/src/blackmisc/valuecache.cpp @@ -597,7 +597,7 @@ namespace BlackMisc { if (! value.isValid()) { - return CStatusMessage(this, invalidSeverity, "Uninitialized value for " + element.m_key, true); + return CStatusMessage(this, invalidSeverity, "Empty cache value " + element.m_key, true); } else if (value.userType() != element.m_metaType) { diff --git a/tests/blackmisc/testvaluecache.cpp b/tests/blackmisc/testvaluecache.cpp index cb5f03f26..f084c835d 100644 --- a/tests/blackmisc/testvaluecache.cpp +++ b/tests/blackmisc/testvaluecache.cpp @@ -109,7 +109,7 @@ namespace BlackMiscTest void CTestValueCache::localOnly() { CValueCache cache(CValueCache::LocalOnly); - for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Uninitialized value")); } + for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Empty cache value")); } CValueCacheUser user1(&cache); CValueCacheUser user2(&cache); testCommon(user1, user2); @@ -118,7 +118,7 @@ namespace BlackMiscTest void CTestValueCache::localOnlyWithThreads() { CValueCache cache(CValueCache::LocalOnly); - for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Uninitialized value")); } + for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Empty cache value")); } CValueCacheUser user1(&cache); CValueCacheUser user2(&cache); CRegularThread thread; @@ -148,7 +148,7 @@ namespace BlackMiscTest QMetaObject::invokeMethod(&otherCache, "changeValuesFromRemote", Q_ARG(BlackMisc::CValueCachePacket, values), Q_ARG(BlackMisc::CIdentifier, thisProcess)); }); - for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Uninitialized value")); } + for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Empty cache value")); } CValueCacheUser thisUser(&thisCache); CValueCacheUser otherUser(&otherCache); @@ -169,7 +169,7 @@ namespace BlackMiscTest void CTestValueCache::batched() { CValueCache cache(CValueCache::LocalOnly); - for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Uninitialized value")); } + for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Empty cache value")); } CValueCacheUser user1(&cache); CValueCacheUser user2(&cache);