Docs: Copyright updates for 2018 (#114)

[thirdparty/squid.git] / src / tests / testCacheManager.cc

diff --git a/src/tests/testCacheManager.cc b/src/tests/testCacheManager.cc
index 035e587daad0089b0b9c45a8ca14d42af0469a17..e7e70748b45d9ed922ca2c09d04492719140b993 100644 (file)
--- a/src/tests/testCacheManager.cc
+++ b/src/tests/testCacheManager.cc
@@ -1,27 +1,22 @@
-#define SQUID_UNIT_TEST 1
+/*
+ * Copyright (C) 1996-2018 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
 
 #include "squid.h"
-#include <cppunit/TestAssert.h>
-
-#include "Mem.h"
-#include "testCacheManager.h"
 #include "CacheManager.h"
+#include "mgr/Action.h"
 #include "Store.h"
+#include "testCacheManager.h"
+#include "unitTestMain.h"
 
+#include <cppunit/TestAssert.h>
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testCacheManager );
 
-/* stub functions to link successfully */
-void
-shut_down(int)
-{}
-
-void
-reconfigure(int)
-{}
-
-/* end stubs */
-
 /* init memory pools */
 
 void testCacheManager::setUp()
@@ -52,16 +47,22 @@ void
 testCacheManager::testRegister()
 {
     CacheManager *manager=CacheManager::GetInstance();
+    CPPUNIT_ASSERT(manager != NULL);
 
-    manager->registerAction("sample", "my sample", &dummy_action, false, false);
-    CacheManagerAction *anAction = manager->findAction("sample");
+    manager->registerProfile("sample", "my sample", &dummy_action, false, false);
+    Mgr::Action::Pointer action = manager->createNamedAction("sample");
+    CPPUNIT_ASSERT(action != NULL);
 
-    CPPUNIT_ASSERT_EQUAL(0, (int)anAction->flags.pw_req);
-    CPPUNIT_ASSERT_EQUAL(0, (int)anAction->flags.atomic);
-    CPPUNIT_ASSERT_EQUAL(String("sample"), String(anAction->action));
+    const Mgr::ActionProfile::Pointer profile = action->command().profile;
+    CPPUNIT_ASSERT(profile != NULL);
+    CPPUNIT_ASSERT(profile->creator != NULL);
+    CPPUNIT_ASSERT_EQUAL(false, profile->isPwReq);
+    CPPUNIT_ASSERT_EQUAL(false, profile->isAtomic);
+    CPPUNIT_ASSERT_EQUAL(String("sample"), String(action->name()));
 
     StoreEntry *sentry=new StoreEntry();
     sentry->flags=0x25; //arbitrary test value
-    anAction->run(sentry);
+    action->run(sentry, false);
     CPPUNIT_ASSERT_EQUAL(1,(int)sentry->flags);
 }
+