From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 12 Dec 2013 21:54:03 +0000 (+0100)
Subject: Fix tokenizer unit tests scaffolding
X-Git-Tag: merge-candidate-3-v1~506^2~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0550f20b0184001431273f0eacea0f941d56e89;p=thirdparty%2Fsquid.git

Fix tokenizer unit tests scaffolding
---

diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index 29eae51869..9679cb0993 100644
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -33,11 +33,17 @@ testTokenizer_SOURCES = \
 	testTokenizer.h \
 	testTokenizer.cc \
 	Tokenizer.h \
-	Tokenizer.cc
+	$(top_srcdir)/src/tests/stub_mem.cc \
+	$(top_srcdir)/src/tests/stub_debug.cc \
+	$(top_srcdir)/src/tests/stub_time.cc \
+	$(top_srcdir)/src/tests/stub_SBufDetailedStats.cc
 nodist_testTokenizer_SOURCES = \
 	$(top_srcdir)/src/tests/testMain.cc
-testIcmp_LDFLAGS = $(LIBADD_DL)
-testIcmp_LDADD = \
+testTokenizer_LDFLAGS = $(LIBADD_DL)
+testTokenizer_LDADD = \
+	libsquid-parser.la \
+	$(top_builddir)/lib/libmiscutil.la \
 	$(SQUID_CPPUNIT_LIBS) \
 	$(SQUID_CPPUNIT_LA) \
-testIcmp_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
+	$(COMPAT_LIB)
+testTokenizer_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
diff --git a/src/parser/Tokenizer.cc b/src/parser/Tokenizer.cc
index 2774a94d26..13c5f5059f 100644
--- a/src/parser/Tokenizer.cc
+++ b/src/parser/Tokenizer.cc
@@ -16,7 +16,8 @@ Tokenizer::prefix(SBuf &returnedToken, const CharacterSet &tokenChars)
     const SBuf::size_type pos=find_first_not_in(tokenChars);
     if (pos == SBuf::npos)
         return false;
-
+    //finish
+    return true;
 }
 
 bool
diff --git a/src/parser/testTokenizer.cc b/src/parser/testTokenizer.cc
index 2a6e193f58..949779666f 100644
--- a/src/parser/testTokenizer.cc
+++ b/src/parser/testTokenizer.cc
@@ -1,10 +1,14 @@
+#include "squid.h"
+
 #include "testTokenizer.h"
 #include "Tokenizer.h"
 
+CPPUNIT_TEST_SUITE_REGISTRATION( testTokenizer );
+
+
 void
 testTokenizer::testTokenizerPrefix()
 {
-
 }
 
 void