1 files changed, 4 insertions, 34 deletions
diff --git a/searchcore/src/tests/proton/metrics/metrics_engine/metrics_engine_test.cpp b/searchcore/src/tests/proton/metrics/metrics_engine/metrics_engine_test.cpp
index e10fd41ffed..c798de01804 100644
--- a/searchcore/src/tests/proton/metrics/metrics_engine/metrics_engine_test.cpp
+++ b/searchcore/src/tests/proton/metrics/metrics_engine/metrics_engine_test.cpp
@@ -1,12 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-// Unit tests for metrics_engine.
 
 #include <vespa/metrics/metricset.h>
-#include <vespa/searchcore/proton/metrics/attribute_metrics_collection.h>
 #include <vespa/searchcore/proton/metrics/attribute_metrics.h>
-#include <vespa/searchcore/proton/metrics/documentdb_metrics_collection.h>
-
-
 #include <vespa/searchcore/proton/metrics/metrics_engine.h>
 #include <vespa/vespalib/testkit/testapp.h>
 
@@ -23,56 +18,31 @@ struct AttributeMetricsFixture {
     MetricsEngine engine;
     DummyMetricSet parent;
     AttributeMetrics metrics;
-    LegacyAttributeMetrics legacyMetrics;
-    LegacyAttributeMetrics totalLegacyMetrics;
     AttributeMetricsFixture()
         : engine(),
           parent("parent"),
-          metrics(&parent),
-          legacyMetrics(nullptr),
-          totalLegacyMetrics(nullptr)
+          metrics(&parent)
     {}
     void addAttribute(const vespalib::string &attrName) {
-        engine.addAttribute(AttributeMetricsCollection(metrics, legacyMetrics), &totalLegacyMetrics, attrName);
+        engine.addAttribute(metrics, attrName);
     }
     void removeAttribute(const vespalib::string &attrName) {
-        engine.removeAttribute(AttributeMetricsCollection(metrics, legacyMetrics), &totalLegacyMetrics, attrName);
+        engine.removeAttribute(metrics, attrName);
     }
     void cleanAttributes() {
-        engine.cleanAttributes(AttributeMetricsCollection(metrics, legacyMetrics), &totalLegacyMetrics);
+        engine.cleanAttributes(metrics);
     }
     void assertRegisteredMetrics(size_t expNumMetrics) const {
         EXPECT_EQUAL(expNumMetrics, parent.getRegisteredMetrics().size());
-        EXPECT_EQUAL(expNumMetrics, legacyMetrics.list.getRegisteredMetrics().size());
-        EXPECT_EQUAL(expNumMetrics, totalLegacyMetrics.list.getRegisteredMetrics().size());
     }
     void assertMetricsExists(const vespalib::string &attrName) {
         EXPECT_TRUE(metrics.get(attrName) != nullptr);
-        EXPECT_TRUE(legacyMetrics.list.get(attrName) != nullptr);
-        EXPECT_TRUE(totalLegacyMetrics.list.get(attrName) != nullptr);
     }
     void assertMetricsNotExists(const vespalib::string &attrName) {
         EXPECT_TRUE(metrics.get(attrName) == nullptr);
-        EXPECT_TRUE(legacyMetrics.list.get(attrName) == nullptr);
-        EXPECT_TRUE(totalLegacyMetrics.list.get(attrName) == nullptr);
     }
 };
 
-TEST("require that the metric proton.diskusage is the sum of the documentDB diskusage metrics")
-{
-    MetricsEngine metrics_engine;
-
-    DocumentDBMetricsCollection metrics1("type1", 1);
-    DocumentDBMetricsCollection metrics2("type2", 1);
-    metrics1.getLegacyMetrics().index.diskUsage.addValue(100);
-    metrics2.getLegacyMetrics().index.diskUsage.addValue(1000);
-
-    metrics_engine.addDocumentDBMetrics(metrics1);
-    metrics_engine.addDocumentDBMetrics(metrics2);
-
-    EXPECT_EQUAL(1100, metrics_engine.legacyRoot().diskUsage.getLongValue("value"));
-}
-
 TEST_F("require that attribute metrics can be added", AttributeMetricsFixture)
 {
     TEST_DO(f.assertRegisteredMetrics(0));