1 files changed, 2 insertions, 76 deletions

diff --git a/searchlib/src/tests/util/rawbuf_test.cpp b/searchlib/src/tests/util/rawbuf_test.cpp
index ca7221d0240..663dde3ef45 100644
--- a/searchlib/src/tests/util/rawbuf_test.cpp
+++ b/searchlib/src/tests/util/rawbuf_test.cpp
@@ -1,10 +1,8 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-// Unit tests for rawbuf.
 
 #include <vespa/searchlib/util/rawbuf.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/fastos/file.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("rawbuf_test");
@@ -18,40 +16,6 @@ string getString(const RawBuf &buf) {
     return string(buf.GetDrainPos(), buf.GetUsedLen());
 }
 
-TEST("require that rawbuf can append text") {
-    RawBuf buf(10);
-    buf += "foo";
-    buf += "bar";
-    EXPECT_EQUAL("foobar", getString(buf));
-}
-
-TEST("require that rawbuf expands when appended beyond size") {
-    RawBuf buf(4);
-    buf += "foo";
-    EXPECT_EQUAL(1u, buf.GetFreeLen());
-    buf += "bar";
-    EXPECT_EQUAL(2u, buf.GetFreeLen());
-    EXPECT_EQUAL("foobar", getString(buf));
-}
-
-TEST("require that a rawbuf can be appended to another") {
-    RawBuf buf1(10);
-    RawBuf buf2(10);
-    buf1 += "foo";
-    buf2 += "bar";
-    buf1 += buf2;
-    EXPECT_EQUAL("foobar", getString(buf1));
-}
-
-TEST("require that rawbufs can be tested for equality") {
-    RawBuf buf1(10);
-    RawBuf buf2(10);
-    buf1 += "foo";
-    buf2 += "bar";
-    EXPECT_TRUE(buf1 == buf1);
-    EXPECT_FALSE(buf1 == buf2);
-}
-
 template <typename T>
 void checkAddNum(void (RawBuf::*addNum)(T, size_t, char), size_t num,
                  size_t fieldw, char fill, const string &expected) {
@@ -79,18 +43,6 @@ TEST("require that rawbuf can add numbers in decimal") {
     checkAddNum(&RawBuf::addNum64, -1, 4, '0', "00-1");
 }
 
-TEST("require that rawbuf can add hitrank") {
-    RawBuf buf(10);
-    buf.addHitRank(HitRank(4.2));
-    EXPECT_EQUAL("4.2", getString(buf));
-}
-
-TEST("require that rawbuf can add signedhitrank") {
-    RawBuf buf(10);
-    buf.addHitRank(SignedHitRank(-4.213));
-    EXPECT_EQUAL("-4.213", getString(buf));
-}
-
 TEST("require that rawbuf can append data of known length") {
     RawBuf buf(10);
     const string data("foo bar baz qux quux");
@@ -98,33 +50,15 @@ TEST("require that rawbuf can append data of known length") {
     EXPECT_EQUAL(data, getString(buf));
 }
 
-TEST("require that rawbuf can be truncated shorter and longer") {
-    RawBuf buf(10);
-    buf += "foobarbaz";
-    buf.truncate(3);
-    buf += "qux";
-    buf.truncate(9);
-    EXPECT_EQUAL("fooquxbaz", getString(buf));
-}
-
 TEST("require that prealloc makes enough room") {
     RawBuf buf(10);
-    buf += "foo";
+    buf.append("foo");
     EXPECT_EQUAL(7u, buf.GetFreeLen());
     buf.preAlloc(100);
     EXPECT_EQUAL("foo", getString(buf));
     EXPECT_LESS_EQUAL(100u, buf.GetFreeLen());
 }
 
-TEST("require that compact discards drained data") {
-    RawBuf buf(10);
-    buf += "foobar";
-    buf.Drain(3);
-    buf.Compact();
-    buf.Fill(3);
-    EXPECT_EQUAL("barbar", getString(buf));
-}
-
 TEST("require that reusing a buffer that has grown 4x will alloc new buffer") {
     RawBuf buf(10);
     buf.preAlloc(100);
@@ -135,7 +69,7 @@ TEST("require that reusing a buffer that has grown 4x will alloc new buffer") {
 
 TEST("require that various length and position information can be found.") {
     RawBuf buf(30);
-    buf += "foo bar baz qux quux corge";
+    buf.append("foo bar baz qux quux corge");
     buf.Drain(7);
     EXPECT_EQUAL(7u, buf.GetDrainLen());
     EXPECT_EQUAL(19u, buf.GetUsedLen());
@@ -143,14 +77,6 @@ TEST("require that various length and position information can be found.") {
     EXPECT_EQUAL(4u, buf.GetFreeLen());
 }
 
-TEST("require that rawbuf can 'putToInet' 16-bit numbers") {
-    RawBuf buf(1);
-    buf.Put16ToInet(0x1234);
-    EXPECT_EQUAL(2, buf.GetFillPos() - buf.GetDrainPos());
-    EXPECT_EQUAL(0x12, (int) buf.GetDrainPos()[0] & 0xff);
-    EXPECT_EQUAL(0x34, (int) buf.GetDrainPos()[1] & 0xff);
-}
-
 TEST("require that rawbuf can 'putToInet' 32-bit numbers") {
     RawBuf buf(1);
     buf.PutToInet(0x12345678);