Cleaned SBuf unit test from non-core tests

diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index 15ad95dc1ddccf48081fc4314e133f965fc08c01..559209a83767a59dbaae64ea3bffee61052c6a52 100644 (file)
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -1,10 +1,7 @@
 #include "squid.h"
 #include "Mem.h"
 #include "SBuf.h"
-#include "SBufList.h"
 #include "SBufStream.h"
-#include "SBufTokenizer.h"
-#include "SBufUtil.h"
 #include "SquidString.h"
 #include "testSBuf.h"
 #include "SBufFindTest.h"
@@ -596,28 +593,6 @@ void testSBuf::testCopy()
     CPPUNIT_ASSERT(s==s2);
 }
 
-// XXX: please split each class into a separate unit-test .cc / even if they share a binary.
-//  rule-of-thumb guideline for layering is 'one class Foo -> one Foo.cc,  one Foo.cc -> one testFoo.cc'
-
-static int sbuf_tokens_number=9;
-static SBuf tokens[]={
-    SBuf("The",0,3), SBuf("quick",0,5), SBuf("brown",0,5), SBuf("fox",0,3),
-    SBuf("jumped",0,6), SBuf("over",0,4), SBuf("the",0,3), SBuf("lazy",0,4),
-    SBuf("dog",0,3)
-};
-
-void testSBuf::testSBufTokenizer()
-{
-    int j=0;
-    SBuf s;
-    for (SBufTokenizer st(literal,SBuf(" ",0,1)); !st.atEnd(); st.next()) {
-        s=st.token();
-        CPPUNIT_ASSERT(s==tokens[j]);
-        j++;
-    }
-    CPPUNIT_ASSERT(j==9);
-}
-
 void testSBuf::testStringOps()
 {
     SBuf sng(literal),
@@ -657,26 +632,6 @@ void testSBuf::testStartsWith()
     CPPUNIT_ASSERT(!literal.startsWith(casebuf,caseInsensitive));
 }
 
-void testSBuf::testSBufList()
-{
-    SBufList foo;
-    for (int j=0; j<sbuf_tokens_number; ++j)
-        foo.add(tokens[j]);
-    CPPUNIT_ASSERT(foo.isMember(SBuf("fox")));
-    CPPUNIT_ASSERT(foo.isMember(SBuf("Fox"),caseInsensitive));
-    CPPUNIT_ASSERT(!foo.isMember(SBuf("garble")));
-    CPPUNIT_ASSERT(foo.isPrefix(SBuf("qui")));
-    CPPUNIT_ASSERT(foo.isPrefix(SBuf("qUi"),caseInsensitive));
-    CPPUNIT_ASSERT(!foo.isPrefix(SBuf("qUa"),caseInsensitive));
-}
-
-void testSBuf::testBaseName()
-{
-    SBuf totest("/foo/bar/gazonk");
-    CPPUNIT_ASSERT_EQUAL(BaseName(totest),SBuf("gazonk"));
-    CPPUNIT_ASSERT_EQUAL(BaseName(totest,'.'),totest);
-}
-
 void testSBuf::testSBufStream()
 {
     SBuf b("const.string, int 10 and a float 10.5");

diff --git a/src/tests/testSBuf.h b/src/tests/testSBuf.h
index b3c4374ce5447618192255f06b26d7ac31fa20e5..de599736bcff73cba54792cef29275b080a9080b 100644 (file)
--- a/src/tests/testSBuf.h
+++ b/src/tests/testSBuf.h
@@ -3,12 +3,6 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#if 0 // guideline violation: only #include into .h when used by the .h
-#include "SBuf.h"
-#include "SBufExceptions.h"
-#include "SBufList.h"
-#include "SBufUtil.h"
-#endif
 #include "OutOfBoundsException.h"
 
 /*
@@ -44,11 +38,8 @@ class testSBuf : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST( testPrintf );
     CPPUNIT_TEST( testScanf );
     CPPUNIT_TEST( testCopy );
-    CPPUNIT_TEST( testSBufTokenizer );
     CPPUNIT_TEST( testStringOps );
     CPPUNIT_TEST( testGrow );
-    CPPUNIT_TEST( testSBufList );
-    CPPUNIT_TEST( testBaseName );
     CPPUNIT_TEST( testSBufStream );
     CPPUNIT_TEST( testAutoFind );
 
@@ -84,12 +75,9 @@ protected:
     void testRFindSBuf();
     void testSearchFail();
     void testCopy();
-    void testSBufTokenizer();
     void testStringOps();
     void testGrow();
     void testStartsWith();
-    void testSBufList();
-    void testBaseName();
     void testSBufStream();
     void testFindFirstOf();
     void testAutoFind();