GC unused functionality.

1 files changed, 3 insertions, 50 deletions

diff --git a/searchlib/src/tests/util/rawbuf_test.cpp b/searchlib/src/tests/util/rawbuf_test.cpp
index 663dde3ef45..cae197b6661 100644
--- a/searchlib/src/tests/util/rawbuf_test.cpp
+++ b/searchlib/src/tests/util/rawbuf_test.cpp
@@ -13,7 +13,7 @@ using namespace search;
 namespace {
 
 string getString(const RawBuf &buf) {
-    return string(buf.GetDrainPos(), buf.GetUsedLen());
+    return {buf.GetDrainPos(), buf.GetUsedLen()};
 }
 
 template <typename T>
@@ -24,25 +24,6 @@ void checkAddNum(void (RawBuf::*addNum)(T, size_t, char), size_t num,
     EXPECT_EQUAL(expected, getString(buf));
 }
 
-TEST("require that rawbuf can add numbers in decimal") {
-    checkAddNum(&RawBuf::addNum, 0, 4, 'x', "xxx0");
-    checkAddNum(&RawBuf::addNum, 42, 4, '0', "0042");
-    checkAddNum(&RawBuf::addNum, 12345678901234, 4, '0', "12345678901234");
-    checkAddNum(&RawBuf::addNum, -1, 4, '0', "18446744073709551615");
-
-    checkAddNum(&RawBuf::addNum32, 0, 4, 'x', "xxx0");
-    checkAddNum(&RawBuf::addNum32, 42, 4, '0', "0042");
-    checkAddNum(&RawBuf::addNum32, 1234567890, 4, '0', "1234567890");
-    checkAddNum(&RawBuf::addNum32, -1, 0, '0', "-1");
-    checkAddNum(&RawBuf::addNum32, -1, 4, '0', "00-1");
-
-    checkAddNum(&RawBuf::addNum64, 0, 4, 'x', "xxx0");
-    checkAddNum(&RawBuf::addNum64, 42, 4, '0', "0042");
-    checkAddNum(&RawBuf::addNum64, 12345678901234, 4, '0', "12345678901234");
-    checkAddNum(&RawBuf::addNum64, -1, 0, '0', "-1");
-    checkAddNum(&RawBuf::addNum64, -1, 4, '0', "00-1");
-}
-
 TEST("require that rawbuf can append data of known length") {
     RawBuf buf(10);
     const string data("foo bar baz qux quux");
@@ -52,45 +33,17 @@ TEST("require that rawbuf can append data of known length") {
 
 TEST("require that prealloc makes enough room") {
     RawBuf buf(10);
-    buf.append("foo");
+    buf.append("foo", 3);
     EXPECT_EQUAL(7u, buf.GetFreeLen());
     buf.preAlloc(100);
     EXPECT_EQUAL("foo", getString(buf));
     EXPECT_LESS_EQUAL(100u, buf.GetFreeLen());
 }
 
-TEST("require that reusing a buffer that has grown 4x will alloc new buffer") {
-    RawBuf buf(10);
-    buf.preAlloc(100);
-    EXPECT_LESS_EQUAL(100u, buf.GetFreeLen());
-    buf.Reuse();
-    EXPECT_EQUAL(10u, buf.GetFreeLen());
-}
-
-TEST("require that various length and position information can be found.") {
-    RawBuf buf(30);
-    buf.append("foo bar baz qux quux corge");
-    buf.Drain(7);
-    EXPECT_EQUAL(7u, buf.GetDrainLen());
-    EXPECT_EQUAL(19u, buf.GetUsedLen());
-    EXPECT_EQUAL(26u, buf.GetUsedAndDrainLen());
-    EXPECT_EQUAL(4u, buf.GetFreeLen());
-}
-
-TEST("require that rawbuf can 'putToInet' 32-bit numbers") {
-    RawBuf buf(1);
-    buf.PutToInet(0x12345678);
-    EXPECT_EQUAL(4, buf.GetFillPos() - buf.GetDrainPos());
-    EXPECT_EQUAL(0x12, (int) buf.GetDrainPos()[0] & 0xff);
-    EXPECT_EQUAL(0x34, (int) buf.GetDrainPos()[1] & 0xff);
-    EXPECT_EQUAL(0x56, (int) buf.GetDrainPos()[2] & 0xff);
-    EXPECT_EQUAL(0x78, (int) buf.GetDrainPos()[3] & 0xff);
-}
-
 TEST("require that rawbuf can 'putToInet' 64-bit numbers") {
     RawBuf buf(1);
     buf.Put64ToInet(0x123456789abcdef0ULL);
-    EXPECT_EQUAL(8, buf.GetFillPos() - buf.GetDrainPos());
+    EXPECT_EQUAL(8ul, buf.GetUsedLen());
     EXPECT_EQUAL(0x12, (int) buf.GetDrainPos()[0] & 0xff);
     EXPECT_EQUAL(0x34, (int) buf.GetDrainPos()[1] & 0xff);
     EXPECT_EQUAL(0x56, (int) buf.GetDrainPos()[2] & 0xff);