Move trace slime serialization too vespa.

3 files changed, 0 insertions, 119 deletions

diff --git a/staging_vespalib/src/tests/trace/.gitignore b/staging_vespalib/src/tests/trace/.gitignore
deleted file mode 100644
index 14ed55a124e..00000000000
--- a/staging_vespalib/src/tests/trace/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-staging_vespalib_trace_test_app
diff --git a/staging_vespalib/src/tests/trace/CMakeLists.txt b/staging_vespalib/src/tests/trace/CMakeLists.txt
deleted file mode 100644
index 9eeef16e6ea..00000000000
--- a/staging_vespalib/src/tests/trace/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(staging_vespalib_trace_test_app TEST
-    SOURCES
-    trace.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_trace_test_app COMMAND staging_vespalib_trace_test_app)
diff --git a/staging_vespalib/src/tests/trace/trace.cpp b/staging_vespalib/src/tests/trace/trace.cpp
deleted file mode 100644
index a7896d43338..00000000000
--- a/staging_vespalib/src/tests/trace/trace.cpp
+++ /dev/null
@@ -1,110 +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 <vespa/log/log.h>
-LOG_SETUP("trace_test");
-#include <vespa/vespalib/testkit/test_kit.h>
-#include <vespa/vespalib/trace/tracenode.h>
-#include <vespa/vespalib/trace/slime_trace_serializer.h>
-#include <vespa/vespalib/trace/slime_trace_deserializer.h>
-
-using namespace vespalib;
-using namespace vespalib::slime;
-
-TEST("that a single trace node is serialized") {
-    TraceNode node;
-    Slime slime;
-    SlimeTraceSerializer serializer(slime.setObject());
-    node.accept(serializer);
-    Inspector & i(slime.get());
-    EXPECT_TRUE(i["timestamp"].valid());
-    EXPECT_EQUAL(0l, i["timestamp"].asLong());
-    EXPECT_FALSE(i["payload"].valid());
-}
-
-TEST("that a trace node with children is serialized") {
-    TraceNode node;
-    node.addChild("foo", 1234);
-    node.addChild("bar", 1235);
-    Slime slime;
-    SlimeTraceSerializer serializer(slime.setObject());
-    node.accept(serializer);
-    Inspector & i(slime.get());
-    EXPECT_TRUE(i["timestamp"].valid());
-    EXPECT_EQUAL(0l, i["timestamp"].asLong());
-    EXPECT_TRUE(i["children"].valid());
-    Inspector & iBar(i["children"][0]);
-    Inspector & iFoo(i["children"][1]);
-    EXPECT_TRUE(iFoo.valid());
-    EXPECT_TRUE(iBar.valid());
-    EXPECT_EQUAL(1234, iFoo["timestamp"].asLong());
-    EXPECT_EQUAL("foo", iFoo["payload"].asString().make_string());
-    EXPECT_EQUAL(1235, iBar["timestamp"].asLong());
-    EXPECT_EQUAL("bar", iBar["payload"].asString().make_string());
-}
-
-TEST("that an empty root trace node can be deserialized") {
-    Slime slime;
-    Cursor & root(slime.setObject());
-    SlimeTraceDeserializer deserializer(root);
-    TraceNode node(deserializer.deserialize());
-    EXPECT_FALSE(node.hasNote());
-    EXPECT_EQUAL(0, node.getTimestamp());
-}
-
-
-TEST("that a single trace node can be deserialized") {
-    Slime slime;
-    Cursor & root(slime.setObject());
-    root.setLong("timestamp", 1234);
-    root.setString("payload", "hello");
-    SlimeTraceDeserializer deserializer(root);
-    TraceNode node(deserializer.deserialize());
-    EXPECT_EQUAL(1234, node.getTimestamp());
-    EXPECT_TRUE(node.hasNote());
-    EXPECT_EQUAL("hello", node.getNote());
-}
-
-TEST("that a trace node with children can be deserialized") {
-    Slime slime;
-    Cursor & root(slime.setObject());
-    Cursor & rootChildren(root.setArray("children"));
-    Cursor & foo(rootChildren.addObject());
-    foo.setLong("timestamp", 123);
-    Cursor &fooArray(foo.setArray("children"));
-    Cursor &foobar(fooArray.addObject());
-    foobar.setLong("timestamp", 45);
-    foobar.setString("payload", "world");
-    Cursor & bar(rootChildren.addObject());
-    bar.setLong("timestamp", 67);
-    bar.setString("payload", "!");
-
-    vespalib::slime::SimpleBuffer buf;
-    vespalib::slime::JsonFormat::encode(slime, buf, false);
-
-    SlimeTraceDeserializer deserializer(root);
-    TraceNode node(deserializer.deserialize());
-    EXPECT_FALSE(node.hasNote());
-    ASSERT_EQUAL(2u, node.getNumChildren());
-    TraceNode fooNode(node.getChild(0));
-    ASSERT_EQUAL(1u, fooNode.getNumChildren());
-    TraceNode fooBarNode(fooNode.getChild(0));
-    EXPECT_EQUAL("world", fooBarNode.getNote());
-    TraceNode barNode(node.getChild(1));
-    EXPECT_EQUAL("!", barNode.getNote());
-    ASSERT_EQUAL(0u, barNode.getNumChildren());
-}
-
-TEST("test serialization and deserialization") {
-    TraceNode root;
-    root.addChild("foo", 45);
-    root.addChild("bar");
-    root.addChild(TraceNode());
-    Slime slime;
-    SlimeTraceSerializer s(slime.setObject());
-    root.accept(s);
-    SlimeTraceDeserializer d(slime.get());
-    TraceNode root2(d.deserialize());
-    ASSERT_EQUAL(3u, root2.getNumChildren());
-}
-
-TEST_MAIN() { TEST_RUN_ALL(); }