Add default constructor for node_ram_cache for testing

joto · joto · commit 2464d283282e · 2020-04-10T10:06:25.000+02:00
diff --git a/src/node-ram-cache.hpp b/src/node-ram-cache.hpp
@@ -48,6 +48,12 @@ class node_ram_cache
     };
 
 public:
+    /**
+     * The default constructor creates a "dummy" cache which will never
+     * cache anything. It is used for testing.
+     */
+    node_ram_cache() = default;
+
     node_ram_cache(int strategy, int cacheSizeMB);
 
     node_ram_cache(node_ram_cache const &) = delete;
@@ -96,7 +102,7 @@ class node_ram_cache
     osmium::Location get_sparse(osmid_t id) const;
     osmium::Location get_dense(osmid_t id) const;
 
-    int allocStrategy;
+    int allocStrategy = 0;
 
     ramNodeBlock *blocks = nullptr;
     int usedBlocks = 0;
@@ -113,7 +119,7 @@ class node_ram_cache
     osmid_t maxSparseId = 0;
 
     int64_t cacheUsed = 0;
-    int64_t cacheSize;
+    int64_t cacheSize = 0;
     osmid_t storedNodes = 0;
     osmid_t totalNodes = 0;
     long nodesCacheHits = 0;
diff --git a/tests/test-persistent-cache.cpp b/tests/test-persistent-cache.cpp
@@ -29,7 +29,7 @@ TEST_CASE("Persistent cache", "[NoDB]")
 {
     options_t const options = testing::opt_t().flatnodes();
     testing::cleanup::file_t flatnode_cleaner{options.flat_node_file.get()};
-    auto ram_cache = std::make_shared<node_ram_cache>(0, 0); // empty cache
+    auto ram_cache = std::make_shared<node_ram_cache>(); // dummy cache
 
     // create a new cache
     {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ TEST_CASE("Persistent cache", "[NoDB]")`
`29`	`29`	`{`
`30`	`30`	`options_t const options = testing::opt_t().flatnodes();`
`31`	`31`	`testing::cleanup::file_t flatnode_cleaner{options.flat_node_file.get()};`
`32`		`- auto ram_cache = std::make_shared<node_ram_cache>(0, 0); // empty cache`
	`32`	`+ auto ram_cache = std::make_shared<node_ram_cache>(); // dummy cache`
`33`	`33`
`34`	`34`	`// create a new cache`
`35`	`35`	`{`