Remove unused files.

2 files changed, 0 insertions, 233 deletions

diff --git a/storage/src/tests/testhelper.cpp b/storage/src/tests/testhelper.cpp
deleted file mode 100644
index 55690b2382b..00000000000
--- a/storage/src/tests/testhelper.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <tests/testhelper.h>
-
-#include <vespa/log/log.h>
-#include <vespa/vespalib/io/fileutil.h>
-
-LOG_SETUP(".testhelper");
-
-namespace storage {
-
-namespace {
-    bool useNewStorageCore() {
-        if (  // Unit test directory
-            vespalib::fileExists("use_new_storage_core") ||
-              // src/cpp directory
-            vespalib::fileExists("../use_new_storage_core") ||
-              // Top build directory where storage-HEAD remains
-            vespalib::fileExists("../../../../use_new_storage_core"))
-        {
-            std::cerr << "Using new storage core for unit tests\n";
-            return true;
-        }
-        return false;
-    }
-    bool newStorageCore(useNewStorageCore());
-}
-
-void addStorageDistributionConfig(vdstestlib::DirConfig& dc)
-{
-    vdstestlib::DirConfig::Config* config;
-    config = &dc.getConfig("stor-distribution", true);
-    config->clear();
-    config->set("group[1]");
-    config->set("group[0].name", "invalid");
-    config->set("group[0].index", "invalid");
-    config->set("group[0].nodes[50]");
-    config->set("redundancy", "2");
-
-    for (uint32_t i = 0; i < 50; i++) {
-        std::ostringstream key; key << "group[0].nodes[" << i << "].index";
-        std::ostringstream val; val << i;
-        config->set(key.str(), val.str());
-    }
-}
-
-vdstestlib::DirConfig getStandardConfig(bool storagenode) {
-    std::string clusterName("storage");
-    vdstestlib::DirConfig dc;
-    vdstestlib::DirConfig::Config* config;
-    config = &dc.addConfig("fleetcontroller");
-    config->set("cluster_name", clusterName);
-    config->set("index", "0");
-    config->set("zookeeper_server", "\"\"");
-    config->set("total_distributor_count", "10");
-    config->set("total_storage_count", "10");
-    config = &dc.addConfig("upgrading");
-    config = &dc.addConfig("load-type");
-    config = &dc.addConfig("bucket");
-    config = &dc.addConfig("messagebus");
-    config = &dc.addConfig("stor-prioritymapping");
-    config = &dc.addConfig("stor-bucketdbupdater");
-    config = &dc.addConfig("stor-bucket-init");
-    config = &dc.addConfig("metricsmanager");
-    config->set("consumer[1]");
-    config->set("consumer[0].name", "\"status\"");
-    config->set("consumer[0].addedmetrics[1]");
-    config->set("consumer[0].addedmetrics[0]", "\"*\"");
-    config = &dc.addConfig("stor-communicationmanager");
-    config->set("rpcport", "0");
-    config->set("mbusport", "0");
-    config = &dc.addConfig("stor-bucketdb");
-    config->set("chunklevel", "0");
-    config = &dc.addConfig("stor-distributormanager");
-    config->set("splitcount", "1000000");
-    config->set("splitsize", "1000000");
-    config->set("joincount", "0");
-    config->set("joinsize", "0");
-    config = &dc.addConfig("stor-opslogger");
-    config = &dc.addConfig("persistence");
-    config->set("abort_operations_with_changed_bucket_ownership", "true");
-    config = &dc.addConfig("stor-filestor");
-    // Easier to see what goes wrong with only 1 thread per disk.
-    config->set("minimum_file_meta_slots", "2");
-    config->set("minimum_file_header_block_size", "368");
-    config->set("minimum_file_size", "4096");
-    config->set("threads[1]");
-    config->set("threads[0].lowestpri 255");
-    config->set("dir_spread", "4");
-    config->set("dir_levels", "0");
-    config->set("use_new_core", newStorageCore ? "true" : "false");
-    config->set("maximum_versions_of_single_document_stored", "0");
-    //config->set("enable_slotfile_cache", "false");
-    // Unit tests typically use fake low time values, so don't complain
-    // about them or compact/delete them by default. Override in tests testing that
-    // behavior
-    config->set("time_future_limit", "5");
-    config->set("time_past_limit", "2000000000");
-    config->set("keep_remove_time_period", "2000000000");
-    config->set("revert_time_period", "2000000000");
-    // Don't want test to call exit()
-    config->set("fail_disk_after_error_count", "0");
-    config = &dc.addConfig("stor-bouncer");
-    config = &dc.addConfig("stor-integritychecker");
-    config = &dc.addConfig("stor-bucketmover");
-    config = &dc.addConfig("stor-messageforwarder");
-    config = &dc.addConfig("stor-server");
-    config->set("cluster_name", clusterName);
-    config->set("enable_dead_lock_detector", "false");
-    config->set("enable_dead_lock_detector_warnings", "false");
-    config->set("max_merges_per_node", "25");
-    config->set("max_merge_queue_size", "20");
-    config->set("root_folder",
-                    (storagenode ? "vdsroot" : "vdsroot.distributor"));
-    config->set("is_distributor",
-                    (storagenode ? "false" : "true"));
-    config = &dc.addConfig("stor-devices");
-    config->set("root_folder",
-                    (storagenode ? "vdsroot" : "vdsroot.distributor"));
-    config = &dc.addConfig("stor-status");
-    config->set("httpport", "0");
-    config = &dc.addConfig("stor-visitor");
-    config->set("defaultdocblocksize", "8192");
-    // By default, need "old" behaviour of maxconcurrent
-    config->set("maxconcurrentvisitors_fixed", "4");
-    config->set("maxconcurrentvisitors_variable", "0");
-    config = &dc.addConfig("stor-visitordispatcher");
-    addFileConfig(dc, "documenttypes",
-                  vespalib::TestApp::GetSourceDirectory() + "config-doctypes.cfg");
-    addStorageDistributionConfig(dc);
-    return dc;
-}
-
-void addSlobrokConfig(vdstestlib::DirConfig& dc,
-                          const mbus::Slobrok& slobrok)
-{
-    std::ostringstream ost;
-    ost << "tcp/localhost:" << slobrok.port();
-    vdstestlib::DirConfig::Config* config;
-    config = &dc.getConfig("slobroks", true);
-    config->clear();
-    config->set("slobrok[1]");
-    config->set("slobrok[0].connectionspec", ost.str());
-}
-
-void addFileConfig(vdstestlib::DirConfig& dc,
-                       const std::string& configDefName,
-                       const std::string& fileName)
-{
-    vdstestlib::DirConfig::Config* config;
-    config = &dc.getConfig(configDefName, true);
-    config->clear();
-    std::ifstream in(fileName.c_str());
-    std::string line;
-    while (std::getline(in, line, '\n')) {
-        std::string::size_type pos = line.find(' ');
-        if (pos == std::string::npos) {
-            config->set(line);
-        } else {
-            config->set(line.substr(0, pos), line.substr(pos + 1));
-        }
-    }
-    in.close();
-}
-
-TestName::TestName(const std::string& n)
-    : name(n)
-{
-    LOG(debug, "Starting test %s", name.c_str());
-}
-
-TestName::~TestName() {
-    LOG(debug, "Done with test %s", name.c_str());
-}
-
-} // storage
diff --git a/storage/src/tests/testhelper.h b/storage/src/tests/testhelper.h
deleted file mode 100644
index 988ebee2798..00000000000
--- a/storage/src/tests/testhelper.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-#include <vespa/vdstestlib/cppunit/dirconfig.h>
-#include <vespa/vdstestlib/cppunit/macros.h>
-
-
-#include <fstream>
-#include <vespa/messagebus/testlib/slobrok.h>
-#include <sstream>
-
-#define ASSERT_REPLY_COUNT(count, dummylink) \
-    { \
-        std::ostringstream msgost; \
-        if ((dummylink).getNumReplies() != count) { \
-            for (uint32_t ijx=0; ijx<(dummylink).getNumReplies(); ++ijx) { \
-                msgost << (dummylink).getReply(ijx)->toString(true) << "\n"; \
-            } \
-        } \
-        CPPUNIT_ASSERT_EQUAL_MSG(msgost.str(), size_t(count), \
-                                 (dummylink).getNumReplies()); \
-    }
-#define ASSERT_COMMAND_COUNT(count, dummylink) \
-    { \
-        std::ostringstream msgost; \
-        if ((dummylink).getNumCommands() != count) { \
-            for (uint32_t ijx=0; ijx<(dummylink).getNumCommands(); ++ijx) { \
-                msgost << (dummylink).getCommand(ijx)->toString(true) << "\n"; \
-            } \
-        } \
-        CPPUNIT_ASSERT_EQUAL_MSG(msgost.str(), size_t(count), \
-                                 (dummylink).getNumCommands()); \
-    }
-
-namespace storage {
-
-void addFileConfig(vdstestlib::DirConfig& dc,
-                   const std::string& configDefName,
-                   const std::string& fileName);
-
-
-void addStorageDistributionConfig(vdstestlib::DirConfig& dc);
-
-vdstestlib::DirConfig getStandardConfig(bool storagenode);
-
-void addSlobrokConfig(vdstestlib::DirConfig& dc,
-                      const mbus::Slobrok& slobrok);
-
-// Class used to print start and end of test. Enable debug when you want to see
-// which test creates what output or where we get stuck
-struct TestName {
-    std::string name;
-    TestName(const std::string& n);
-    ~TestName();
-};
-
-} // storage
-