From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 8 Aug 2012 12:14:34 +0000 (+0200)
Subject: implemented STUB_RETVAL_NOP
X-Git-Tag: sourceformat-review-1~126^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd765fdc7d285a14d0ab6aecedf2b73a4800528f;p=thirdparty%2Fsquid.git

implemented STUB_RETVAL_NOP
Converted stub_tools to stup API.
---

diff --git a/src/tests/STUB.h b/src/tests/STUB.h
index 67c433b9c7..368bdb5db2 100644
--- a/src/tests/STUB.h
+++ b/src/tests/STUB.h
@@ -28,11 +28,15 @@
 /// Intended for registration pattern APIs where the function result does not matter to the test
 #define STUB_NOP { std::cerr<<"SKIP: "<<STUB_API<<" "<<__FUNCTION__<<" (not implemented).\n"; }
 
-/** macro to stub a function with return value.
- *  Aborts unit tests requiring its definition with a message about the missing linkage
- */
+/// macro to stub a function with return value.
+/// Aborts unit tests requiring its definition with a message about the missing linkage
 #define STUB_RETVAL(x) { stub_fatal(STUB_API " required"); return x; }
 
+/// macro to stub a void function without a fatal message and with a return value
+/// Intended for registration pattern APIs where the function result does not matter to the test
+#define STUB_RETVAL_NOP(x) { std::cerr<<"SKIP: "<<STUB_API<<" "<<__FUNCTION__<<" (not implemented).\n"; return x; }
+
+
 /** macro to stub a function which returns a reference to dynamic
  *  Aborts unit tests requiring its definition with a message about the missing linkage
  *  This macro uses 'new x' to construct a stack vailable for the reference, may leak.
diff --git a/src/tests/stub_tools.cc b/src/tests/stub_tools.cc
index 422c95b2bd..50f7292fd1 100644
--- a/src/tests/stub_tools.cc
+++ b/src/tests/stub_tools.cc
@@ -49,30 +49,13 @@ IamWorkerProcess()
     return true;
 }
 
-bool
-IamDiskProcess()
-{
-    std::cerr << STUB_API << " IamDiskProcess() Not implemented\n";
-    return false;
-}
-
-bool
-InDaemonMode()
-{
-    std::cerr << STUB_API << " InDaemonMode() Not implemented\n";
-    return false;
-}
-
-bool
-UsingSmp()
-{
-    std::cerr << STUB_API << " UsingSnmp() Not implemented\n";
-    return false;
-}
-
+bool IamDiskProcess() STUB_RETVAL_NOP(false)
+bool InDaemonMode() STUB_RETVAL_NOP(false)
+bool UsingSmp() STUB_RETVAL_NOP(false)
 bool IamCoordinatorProcess() STUB_RETVAL(false)
 bool IamPrimaryProcess() STUB_RETVAL(false)
 int NumberOfKids() STUB_RETVAL(0)
+
 //not yet needed in the Stub, causes dependency on String
 //String ProcessRoles() STUB_RETVAL(String())
 void writePidFile(void) STUB