-#define SQUID_UNIT_TEST 1
-#include "squid.h"
+/*
+ * Copyright (C) 1996-2020 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 "DiskIO/DiskIOModule.h"
#include "fs/ufs/UFSSwapDir.h"
#include "globals.h"
#include "HttpHeader.h"
#include "HttpReply.h"
-#include "Mem.h"
#include "MemObject.h"
#include "RequestFlags.h"
#include "SquidConfig.h"
#include "Store.h"
-#include "SwapDir.h"
+#include "store/Disks.h"
#include "testStoreSupport.h"
#include "testUfs.h"
+#include "unitTestMain.h"
-#if HAVE_STDEXCEPT
#include <stdexcept>
-#endif
-#define TESTDIR "testUfs__testUfsSearch"
+#define TESTDIR "testUfs_Store"
CPPUNIT_TEST_SUITE_REGISTRATION( testUfs );
-typedef RefCount<Fs::Ufs::UFSSwapDir> SwapDirPointer;
-extern REMOVALPOLICYCREATE createRemovalPolicy_lru; /* XXX fails with --enable-removal-policies=heap */
+typedef RefCount<Fs::Ufs::UFSSwapDir> MySwapDirPointer;
+extern REMOVALPOLICYCREATE createRemovalPolicy_lru; /* XXX fails with --enable-removal-policies=heap */
static void
-addSwapDir(SwapDirPointer aStore)
+addSwapDir(MySwapDirPointer aStore)
{
allocate_new_swapdir(&Config.cacheSwap);
Config.cacheSwap.swapDirs[Config.cacheSwap.n_configured] = aStore.getRaw();
return;
Config.Store.avgObjectSize = 1024;
-
Config.Store.objectsPerBucket = 20;
-
Config.Store.maxObjectSize = 2048;
Config.store_dir_select_algorithm = xstrdup("round-robin");
Config.replPolicy = new RemovalPolicySettings;
+ Config.replPolicy->type = xstrdup("lru");
- Config.replPolicy->type = xstrdup ("lru");
+ Config.memShared.defaultTo(false);
/* garh garh */
storeReplAdd("lru", createRemovalPolicy_lru);
comm_init();
- httpHeaderInitModule(); /* must go before any header processing (e.g. the one in errorInitialize) */
-
- httpReplyInitModule(); /* must go before accepting replies */
+ httpHeaderInitModule(); /* must go before any header processing (e.g. the one in errorInitialize) */
inited = true;
}
if (0 > system ("rm -rf " TESTDIR))
throw std::runtime_error("Failed to clean test work directory");
- Store::Root(new StoreController);
+ Store::Init();
- SwapDirPointer aStore (new Fs::Ufs::UFSSwapDir("ufs", "Blocking"));
+ MySwapDirPointer aStore (new Fs::Ufs::UFSSwapDir("ufs", "Blocking"));
aStore->IO = new Fs::Ufs::UFSStrategy(DiskIOModule::Find("Blocking")->createStrategy());
char *path=xstrdup(TESTDIR);
- char *config_line=xstrdup("foo 100 1 1");
+ char *config_line=xstrdup("100 1 1");
visible_appname_string = xstrdup(PACKAGE "/" VERSION);
- strtok(config_line, w_space);
+ ConfigParser::SetCfgLine(config_line);
aStore->parse(0, path);
+ store_maxobjsize = 1024*1024*2;
safe_free(path);
/* rebuild is a scheduled event */
StockEventLoop loop;
- while (StoreController::store_dirs_rebuilding > 1)
+ while (StoreController::store_dirs_rebuilding)
loop.runOnce();
/* cannot use loop.run(); as the loop will never idle: the store-dir
*/
/* nothing left to rebuild */
- CPPUNIT_ASSERT_EQUAL(1, StoreController::store_dirs_rebuilding);
+ CPPUNIT_ASSERT_EQUAL(0, StoreController::store_dirs_rebuilding);
/* add an entry */
{
RequestFlags flags;
flags.cachable = true;
StoreEntry *pe = storeCreateEntry("dummy url", "dummy log url", flags, Http::METHOD_GET);
- HttpReply *rep = (HttpReply *) pe->getReply(); // bypass const
- rep->setHeaders(HTTP_OK, "dummy test object", "x-squid-internal/test", -1, -1, squid_curtime + 100000);
+ auto &reply = pe->mem().adjustableBaseReply();
+ reply.setHeaders(Http::scOkay, "dummy test object", "x-squid-internal/test", 0, -1, squid_curtime + 100000);
pe->setPublicKey();
pe->buffer();
- /* TODO: remove this when the metadata is separated */
- {
- Packer p;
- packerToStoreInit(&p, pe);
- pe->getReply()->packHeadersInto(&p);
- packerClean(&p);
- }
-
+ pe->mem().freshestReply().packHeadersUsingSlowPacker(*pe);
pe->flush();
pe->timestampsSet();
pe->complete();
pe->swapOut();
- CPPUNIT_ASSERT(pe->swap_dirn == 0);
- CPPUNIT_ASSERT(pe->swap_filen == 0);
- pe->unlock();
+ CPPUNIT_ASSERT_EQUAL(0, pe->swap_dirn);
+ CPPUNIT_ASSERT_EQUAL(0, pe->swap_filen);
+ pe->unlock("testUfs::testUfsSearch vary");
}
storeDirWriteCleanLogs(0);
/* here we cheat: we know that UFSSwapDirs search off disk. If we did an init call to a new
* swapdir instance, we'd not be testing a clean build.
*/
- StoreSearchPointer search = aStore->search (NULL, NULL); /* search for everything in the store */
+ StoreSearchPointer search = Store::Root().search(); /* search for everything in the store */
/* nothing should be immediately available */
#if 0
- CPPUNIT_ASSERT(search->next() == false);
+ CPPUNIT_ASSERT_EQUAL(false, search->next());
#endif
- CPPUNIT_ASSERT(search->error() == false);
- CPPUNIT_ASSERT(search->isDone() == false);
- CPPUNIT_ASSERT(search->currentItem() == NULL);
+ CPPUNIT_ASSERT_EQUAL(false, search->error());
+ CPPUNIT_ASSERT_EQUAL(false, search->isDone());
+ CPPUNIT_ASSERT_EQUAL(static_cast<StoreEntry *>(NULL), search->currentItem());
/* trigger a callback */
cbcalled = false;
search->next(searchCallback, NULL);
- CPPUNIT_ASSERT(cbcalled == true);
+ CPPUNIT_ASSERT_EQUAL(true, cbcalled);
/* we should have access to a entry now, that matches the entry we had before */
- //CPPUNIT_ASSERT(search->next() == false);
- CPPUNIT_ASSERT(search->error() == false);
- CPPUNIT_ASSERT(search->isDone() == false);
+ //CPPUNIT_ASSERT_EQUAL(false, search->next());
+ CPPUNIT_ASSERT_EQUAL(false, search->error());
+ CPPUNIT_ASSERT_EQUAL(false, search->isDone());
CPPUNIT_ASSERT(search->currentItem() != NULL);
/* trigger another callback */
cbcalled = false;
search->next(searchCallback, NULL);
- CPPUNIT_ASSERT(cbcalled == true);
+ CPPUNIT_ASSERT_EQUAL(true, cbcalled);
/* now we should have no error, we should have finished and have no current item */
- //CPPUNIT_ASSERT(search->next() == false);
- CPPUNIT_ASSERT(search->error() == false);
- CPPUNIT_ASSERT(search->isDone() == true);
- CPPUNIT_ASSERT(search->currentItem() == NULL);
+ //CPPUNIT_ASSERT_EQUAL(false, search->next());
+ CPPUNIT_ASSERT_EQUAL(false, search->error());
+ CPPUNIT_ASSERT_EQUAL(true, search->isDone());
+ CPPUNIT_ASSERT_EQUAL(static_cast<StoreEntry *>(NULL), search->currentItem());
- Store::Root(NULL);
+ Store::FreeMemory();
free_cachedir(&Config.cacheSwap);
// objects such as "StorePointer aRoot" from being called.
CPPUNIT_ASSERT(!store_table); // or StoreHashIndex ctor will abort below
- Store::Root(new StoreController);
- SwapDirPointer aStore (new Fs::Ufs::UFSSwapDir("ufs", "Blocking"));
+ Store::Init();
+ MySwapDirPointer aStore (new Fs::Ufs::UFSSwapDir("ufs", "Blocking"));
addSwapDir(aStore);
commonInit();
Config.replPolicy = new RemovalPolicySettings;
- Config.replPolicy->type = xstrdup ("lru");
+ Config.replPolicy->type = xstrdup("lru");
mem_policy = createRemovalPolicy(Config.replPolicy);
char *path=xstrdup(TESTDIR);
- char *config_line=xstrdup("foo 100 1 1");
- strtok(config_line, w_space);
+ char *config_line=xstrdup("100 1 1");
+ ConfigParser::SetCfgLine(config_line);
aStore->parse(0, path);
safe_free(path);
safe_free(config_line);
CPPUNIT_ASSERT(aStore->IO->io != NULL);
- Store::Root(NULL);
+ Store::FreeMemory();
free_cachedir(&Config.cacheSwap);
safe_free(Config.replPolicy->type);
delete Config.replPolicy;
if (0 > system ("rm -rf " TESTDIR))
throw std::runtime_error("Failed to clean test work directory");
}
+
projects / thirdparty / squid.git / blobdiff