From 1dffcf0564c3ee40d711f676d7e6fb6d51e63a45 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 28 Oct 2013 11:04:48 +0100 Subject: [PATCH] Moved more unit tests to stub libauth --- src/Makefile.am | 6 ++---- src/tests/stub_libauth.cc | 13 ++++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7dc2dfd90e..0b630934e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1372,7 +1372,6 @@ tests_testBoilerplate_DEPENDENCIES = \ ## Tests of the CacheManager module. tests_testCacheManager_SOURCES = \ AccessLogEntry.cc \ - $(ACL_REGISTRATION_SOURCES) \ debug.cc \ HttpParser.cc \ HttpParser.h \ @@ -1725,7 +1724,7 @@ tests_testDiskIO_SOURCES = \ tests/stub_internal.cc \ tests/stub_ipc.cc \ tests/stub_ipcache.cc \ - tests/stub_libauth.cc \ + tests/stub_libauth.cc \ tests/stub_libeui.cc \ tests/stub_libformat.cc \ tests/stub_libicmp.cc \ @@ -1800,7 +1799,6 @@ tests_testDiskIO_DEPENDENCIES = \ ## Tests of the Even module. tests_testEvent_SOURCES = \ AccessLogEntry.cc \ - $(ACL_REGISTRATION_SOURCES) \ BodyPipe.cc \ CacheDigest.h \ CacheDigest.cc \ @@ -1984,7 +1982,7 @@ tests_testEvent_SOURCES = \ tests/testMain.cc \ tests/stub_main_cc.cc \ tests/stub_ipc_Forwarder.cc \ - tests/stub_libauth.cc \ + tests/stub_libauth.cc \ tests/stub_libeui.cc \ tests/stub_store_stats.cc \ time.cc \ diff --git a/src/tests/stub_libauth.cc b/src/tests/stub_libauth.cc index 7342306a4c..7040e88bdf 100644 --- a/src/tests/stub_libauth.cc +++ b/src/tests/stub_libauth.cc @@ -1,12 +1,13 @@ -#define STUB_API "auth/libauth.la" +#include "squid.h" +#define STUB_API "auth/libauth.la" #include "STUB.h" -#include "squid.h" #include "auth/Config.h" Auth::UserRequest::Pointer Auth::Config::CreateAuthUser(const char *) STUB Auth::Config * Auth::Config::Find(const char *) STUB void Auth::Config::registerWithCacheManager(void) STUB_NOP +Auth::ConfigVector Auth::TheConfig; #include "auth/Gadgets.h" int authenticateActiveSchemeCount(void) STUB @@ -19,7 +20,10 @@ AuthUserHashPointer::AuthUserHashPointer(Auth::User::Pointer anAuth_user) STUB Auth::User::Pointer AuthUserHashPointer::user() const STUB #include "auth/Scheme.h" -/* TODO: Fill in */ +void Auth::Scheme::AddScheme(Auth::Scheme::Pointer) STUB +Auth::Scheme::Pointer Auth::Scheme::Find(const char *) STUB +Vector & Auth::Scheme::GetSchemes() STUB +void Auth::Scheme::FreeAll() STUB #include "auth/User.h" Auth::User::User(Auth::Config *) STUB @@ -37,6 +41,7 @@ void Auth::User::addToNameCache() STUB void Auth::User::UsernameCacheStats(StoreEntry *) STUB #include "auth/UserRequest.h" +char const * Auth::UserRequest::username() const STUB_RETVAL("stub_username") void Auth::UserRequest::start(AUTHCB *, void *) STUB bool Auth::UserRequest::valid() const STUB void * Auth::UserRequest::operator new (size_t) STUB @@ -62,3 +67,5 @@ void authenticateFixHeader(HttpReply *, Auth::UserRequest::Pointer, HttpRequest void authenticateAddTrailer(HttpReply *, Auth::UserRequest::Pointer, HttpRequest *, int) STUB Auth::Scheme::Pointer Auth::UserRequest::scheme() const STUB +#include "AuthReg.h" +void Auth::Init() STUB_NOP -- 2.47.3