removed StartLibCitadel()
[citadel.git] / libcitadel / tests / stringbuf_test.c
index 48143b8ade57ac4bf0c03c2332b31c894360cde5..2ca5c254fc717b85d6a595f3d2d83bd2b7750706 100644 (file)
@@ -1,9 +1,8 @@
-
 /*
  *  CUnit - A Unit testing framework library for C.
  *  Copyright (C) 2001  Anil Kumar
  *  
- *  This library is free software; you can redistribute it and/or
+ *  This library is open source software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 
 #include "stringbuf_test.h"
+#define SHOW_ME_VAPPEND_PRINTF
 #include "../lib/libcitadel.h"
 
-static int success_init(void) { return 0; }
-static int success_clean(void) { return 0; }
-
-static void testSuccess1(void) { CU_ASSERT(1); }
-static void testSuccess2(void) { CU_ASSERT(1); }
-static void testSuccess3(void) { CU_ASSERT(1); }
-
-static int group_failure_init(void) { return 1;}
-static int group_failure_clean(void) { return 1; }
-
-static void testGroupFailure1(void) { CU_ASSERT(0); }
-static void testGroupFailure2(void) { CU_ASSERT(2); }
-
-static void testfailure1(void) { CU_ASSERT(12 <= 10); }
-static void testfailure2(void) { CU_ASSERT(2); }
-static void testfailure3(void) { CU_ASSERT(3); }
+int Quiet = 0;
 /*
-static void test1(void)
+ * Stolen from wc_printf; we need to test that other printf too... 
+ */
+static void TEST_StrBufAppendPrintf(StrBuf *WBuf, const char *format,...)
 {
-       CU_ASSERT((char *)2 != "THis is positive test.");
-       CU_ASSERT((char *)2 == "THis is negative test. test 1");
+       va_list arg_ptr;
+
+       if (WBuf == NULL)
+               return;
+
+       va_start(arg_ptr, format);
+       StrBufVAppendPrintf(WBuf, format, arg_ptr);
+       va_end(arg_ptr);
 }
 
-static void test2(void)
+static void TestRevalidateStrBuf(StrBuf *Buf)
 {
-       CU_ASSERT((char *)2 != "THis is positive test.");
-       CU_ASSERT((char *)3 == "THis is negative test. test 2");
+       CU_ASSERT(strlen(ChrPtr(Buf)) == StrLength(Buf));
 }
-*/
+
+
 static void TestCreateBuf(void)
 {
        StrBuf *Buf;
@@ -65,8 +55,30 @@ static void TestCreateBuf(void)
        CU_ASSERT(Buf != NULL);
        FreeStrBuf(&Buf);
 
+       Buf = NewStrBufPlain(ChrPtr(NULL), StrLength(NULL));
+       CU_ASSERT(Buf != NULL);
+       FreeStrBuf(&Buf);
+
+       /* make it alloc a bigger buffer... */
+       Buf = NewStrBufPlain(NULL, SIZ);
+       CU_ASSERT(Buf != NULL);
+       FreeStrBuf(&Buf);
+
+
+       Buf = NewStrBufDup(NULL);
+       CU_ASSERT(Buf != NULL);
+       StrBufPlain(Buf, "abc", -1);
+       TestRevalidateStrBuf(Buf);
+       StrBufPlain(Buf, HKEY("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"));
+       TestRevalidateStrBuf(Buf);
+       FreeStrBuf(&Buf);
+
+       FlushStrBuf(NULL);
+       FLUSHStrBuf(NULL);
+
        CU_ASSERT(Buf == NULL);
        Buf = NewStrBufPlain(HKEY("ABC"));
+       TestRevalidateStrBuf(Buf);
        CU_ASSERT(StrLength(Buf) == 3);
        CU_ASSERT_NSTRING_EQUAL("ABC", ChrPtr(Buf), 3);
 
@@ -75,13 +87,18 @@ static void TestCreateBuf(void)
        {
                StrBufAppendBufPlain(Buf, HKEY("ABC"), 0);
                len += 3;
-               CU_ASSERT(StrLength(Buf) == len);               
+               CU_ASSERT(StrLength(Buf) == len);
        }       
        StrBufShrinkToFit(Buf, 1);
+       FlushStrBuf(Buf);
+       CU_ASSERT(StrLength(Buf) == 0);
+       ReAdjustEmptyBuf(Buf, 1, 1);
+       TestRevalidateStrBuf(Buf);
        FreeStrBuf(&Buf);
        CU_ASSERT(Buf == NULL);
        
        Buf = NewStrBufPlain(HKEY("ABC"));
+       TestRevalidateStrBuf(Buf);
        len = StrLength(Buf);
        for (i=0; i< 500; i ++)
        {
@@ -89,7 +106,43 @@ static void TestCreateBuf(void)
                len += 3;
                CU_ASSERT(StrLength(Buf) == len);               
        }
+       TestRevalidateStrBuf(Buf);
        StrBufShrinkToFit(Buf, 1);
+       TestRevalidateStrBuf(Buf);
+       FreeStrBuf(&Buf);
+
+
+       Buf = NewStrBufPlain(HKEY("ABC"));
+       Buf2 = NewStrBufPlain(HKEY("------"));
+       TestRevalidateStrBuf(Buf);
+       len = StrLength(Buf);
+       for (i=0; i< 50; i ++)
+       {
+               StrBufPrintf(Buf, "%s", ChrPtr(Buf2));
+               CU_ASSERT(StrLength(Buf) == StrLength(Buf2));           
+
+               StrBufAppendBufPlain(Buf2, HKEY("ABCDEFG"), 0);
+       }
+       TestRevalidateStrBuf(Buf);
+       StrBufShrinkToFit(Buf, 1);
+       TestRevalidateStrBuf(Buf);
+       FreeStrBuf(&Buf);
+       FreeStrBuf(&Buf2);      
+
+
+       Buf = NewStrBufPlain(HKEY("ABC"));
+       TestRevalidateStrBuf(Buf);
+       len = StrLength(Buf);
+       for (i=0; i< 500; i ++)
+       {
+               TEST_StrBufAppendPrintf(Buf, "%s", "ABC");
+               len += 3;
+               CU_ASSERT(StrLength(Buf) == len);               
+       }
+       TestRevalidateStrBuf(Buf);
+       StrBufShrinkToFit(Buf, 1);
+       TestRevalidateStrBuf(Buf);
+
 
        Buf2 = NewStrBufDup(Buf);
        CU_ASSERT(StrLength(Buf) == StrLength(Buf2));           
@@ -104,217 +157,494 @@ static void TestCreateBuf(void)
        FLUSHStrBuf(Buf);
        CU_ASSERT(StrLength(Buf) == 0);
 
+       HFreeStrBuf(NULL);
+       HFreeStrBuf(Buf2);
+       CU_ASSERT(Buf2 != NULL);
+
        FreeStrBuf(&Buf);
-       FreeStrBuf(&Buf2);
        CU_ASSERT(Buf == NULL);
-       CU_ASSERT(Buf2 == NULL);
+       
+}
+
+
 
 
+static void TestBufNumbers(void)
+{
+       StrBuf *Buf;
+       StrBuf *Buf2;
+       StrBuf *Buf3;
+       char *ch;
+       int i;
+
+       Buf2 = NewStrBuf();
+       Buf3 = NewStrBufPlain(HKEY("abcd"));
        Buf = NewStrBufPlain(HKEY("123456"));
        CU_ASSERT(StrBufIsNumber(Buf) == 1);
-
-       
-       
+       CU_ASSERT(StrBufIsNumber(NULL) == 0);
+       CU_ASSERT(StrBufIsNumber(Buf2) == 0);
+       CU_ASSERT(StrBufIsNumber(Buf3) == 0);
+
+       CU_ASSERT(StrTol(Buf) == 123456);
+       CU_ASSERT(StrTol(NULL) == 0);
+       CU_ASSERT(StrTol(Buf2) == 0);
+
+       CU_ASSERT(StrToi(Buf) == 123456);
+       CU_ASSERT(StrToi(NULL) == 0);
+       CU_ASSERT(StrToi(Buf2) == 0);
+       ch = SmashStrBuf(NULL);
+       CU_ASSERT(ch == NULL);
+       i = StrLength(Buf);
+       ch = SmashStrBuf(&Buf);
+       CU_ASSERT(strlen(ch) == i);
+       free(ch);
+       FreeStrBuf(&Buf2);
+       FreeStrBuf(&Buf3);
 }
 
-static void testSuccessAssertTrue(void)
+static void TestStrBufPeek(void)
 {
-       CU_ASSERT_TRUE(CU_TRUE);
-       CU_ASSERT_TRUE(!CU_FALSE);
+       StrBuf *Buf;
+       const char *pch;
+
+       Buf = NewStrBufPlain(HKEY("0123456"));
+       pch = ChrPtr(Buf);
+
+       CU_ASSERT(StrBufPeek(NULL, pch + 4, -1, 'A') == -1);
+
+       CU_ASSERT(StrBufPeek(Buf, pch + 4, -1, 'A') == 4);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf), "0123A56");
+
+       CU_ASSERT(StrBufPeek(Buf, pch - 1, -1, 'A') == -1);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf), "0123A56");
+
+       CU_ASSERT(StrBufPeek(Buf, pch + 10, -1, 'A') == -1);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf), "0123A56");
+
+       CU_ASSERT(StrBufPeek(Buf, NULL, -1, 'A') == -1);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf), "0123A56");
+
+       CU_ASSERT(StrBufPeek(Buf, NULL, 10, 'A') == -1);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf), "0123A56");
+
+       CU_ASSERT(StrBufPeek(Buf, NULL, 5, 'A') == 5);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf), "0123AA6");
+       FreeStrBuf(&Buf);
 }
 
-static void testSuccessAssertFalse(void)
+static void TestBufStringManipulation(void)
 {
-       CU_ASSERT_FALSE(CU_FALSE);
-       CU_ASSERT_FALSE(!CU_TRUE);
+       long len, i = 0;
+       StrBuf *dest = NewStrBuf ();
+       StrBuf *Buf = NewStrBufPlain(HKEY("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"));
+
+       StrBufSub(dest, Buf, -5, i);
+       len = StrLength(Buf);
+       for (i = 0; i < len + 10; i++)
+       {
+               StrBufSub(dest, Buf, 5, i);
+               if (i + 5 < len)
+               {
+                       CU_ASSERT(StrLength(dest) == i);
+               }
+               else
+               {
+                       CU_ASSERT(StrLength(dest) == len - 5);
+               }
+       }
+       FreeStrBuf(&dest);
+       dest = NewStrBuf ();
+       StrBufSub(dest, Buf, -5, 200);
+
+       StrBufCutLeft(Buf, 5);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf),"67890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
+       CU_ASSERT(StrLength(Buf) == 95);
+
+       StrBufCutRight(Buf, 5);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf),"678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345");
+       CU_ASSERT(StrLength(Buf) == 90);
+
+       StrBufCutAt(Buf, 80, NULL);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf),"67890123456789012345678901234567890123456789012345678901234567890123456789012345");
+       CU_ASSERT(StrLength(Buf) == 80);
+
+       StrBufCutAt(Buf, -1, ChrPtr(Buf) + 70);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf),"6789012345678901234567890123456789012345678901234567890123456789012345");
+       CU_ASSERT(StrLength(Buf) == 70);
+
+
+       StrBufCutAt(Buf, 0, ChrPtr(Buf) + 60);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf),"678901234567890123456789012345678901234567890123456789012345");
+       CU_ASSERT(StrLength(Buf) == 60);
+
+       StrBufCutAt(Buf, 0, ChrPtr(Buf) + 70);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf),"678901234567890123456789012345678901234567890123456789012345");
+       CU_ASSERT(StrLength(Buf) == 60);
+
+       StrBufCutAt(Buf, 70, NULL);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf),"678901234567890123456789012345678901234567890123456789012345");
+       CU_ASSERT(StrLength(Buf) == 60);
+
+
+       StrBufCutLeft(Buf, 70);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf),"");
+       CU_ASSERT(StrLength(Buf) == 0);
+
+       StrBufPlain(Buf, HKEY("678901234567890123456789012345678901234567890123456789012345"));
+       StrBufCutRight(Buf, 70);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf),"");
+       CU_ASSERT(StrLength(Buf) == 0);
+
+       FreeStrBuf(&dest);
+       FreeStrBuf(&Buf);
+
+       Buf = NewStrBufPlain(HKEY(" \tabc\t "));
+       StrBufTrim(Buf);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf),"abc");
+       CU_ASSERT(StrLength(Buf) == 3);
+
+       StrBufUpCase(NULL);
+       FlushStrBuf(Buf);
+       StrBufUpCase(Buf);
+       StrBufPlain(Buf, HKEY("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"));
+       StrBufUpCase(Buf);
+
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf), "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+
+
+       StrBufLowerCase(NULL);
+       FlushStrBuf(Buf);
+       StrBufLowerCase(Buf);
+       StrBufPlain(Buf, HKEY("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"));
+       StrBufLowerCase(Buf);
+
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Buf), "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz0123456789");
+
+
+       FreeStrBuf(&Buf);
+
 }
 
-static void testSuccessAssertEqual(void)
+static void NextTokenizerIterateBuf(StrBuf *Buf, int NTokens)
 {
-       CU_ASSERT_EQUAL(10, 10);
-       CU_ASSERT_EQUAL(0, 0);
-       CU_ASSERT_EQUAL(0, -0);
-       CU_ASSERT_EQUAL(-12, -12);
+       long FoundTokens;
+       const char *pCh = NULL;
+       StrBuf *Buf2;
+       long CountTokens = 0;
+       long HaveNextToken = 0;
+       long HaveNextTokenF = 0;
+
+       TestRevalidateStrBuf(Buf);
+       FoundTokens = StrBufNum_tokens(Buf, ',');
+       if (!Quiet) 
+               printf("\n\nTemplate: >%s< %d, %ld\n", 
+                      ChrPtr(Buf), 
+                      NTokens, 
+                      FoundTokens);
+
+       CU_ASSERT(FoundTokens == NTokens);
+
+       Buf2 = NewStrBuf();
+       while (HaveNextToken = StrBufHaveNextToken(Buf, &pCh),
+              HaveNextTokenF = StrBufExtract_NextToken(Buf2, Buf, &pCh, ','),
+              (HaveNextTokenF>= 0))
+       {
+               CountTokens++;
+               
+               if (!Quiet) printf("Token: >%s< >%s< %ld:%ld\n", 
+                                  ChrPtr(Buf2), 
+                                  ((pCh != NULL) && (pCh != StrBufNOTNULL))? pCh : "N/A", 
+                                  HaveNextToken, 
+                                  HaveNextTokenF);
+               TestRevalidateStrBuf(Buf2);
+
+               CU_ASSERT(HaveNextToken == (HaveNextTokenF >= 0));
+               
+               CU_ASSERT(CountTokens <= NTokens);
+       } 
+       CU_ASSERT(HaveNextToken == (HaveNextTokenF >= 0));
+       FreeStrBuf(&Buf2);
 }
 
-static void testSuccessAssertNotEqual(void)
+
+
+static void TestNextTokenizer_EndWithEmpty(void)
 {
-       CU_ASSERT_NOT_EQUAL(10, 11);
-       CU_ASSERT_NOT_EQUAL(0, -1);
-       CU_ASSERT_NOT_EQUAL(-12, -11);
+       StrBuf *Buf;
+
+       Buf = NewStrBufPlain(HKEY("abc,abc, 1, ,,"));
+       NextTokenizerIterateBuf(Buf, 6);
+       FreeStrBuf(&Buf);
 }
 
-static void testSuccessAssertPtrEqual(void)
+static void TestNextTokenizer_StartWithEmpty(void)
 {
-       CU_ASSERT_PTR_EQUAL((void*)0x100, (void*)0x100);
+       StrBuf *Buf;
+
+       Buf = NewStrBufPlain(HKEY(",cde,abc, 1, ,,bbb"));
+       NextTokenizerIterateBuf(Buf, 7);
+       FreeStrBuf(&Buf);
 }
 
-static void testSuccessAssertPtrNotEqual(void)
+static void TestNextTokenizer_Empty(void)
 {
-       CU_ASSERT_PTR_NOT_EQUAL((void*)0x100, (void*)0x101);
+       StrBuf *Buf;
+
+       Buf = NewStrBufPlain(HKEY(""));
+       NextTokenizerIterateBuf(Buf, 0);
+       FreeStrBuf(&Buf);
 }
 
-static void testSuccessAssertPtrNull(void)
+static void TestNextTokenizer_TwoEmpty(void)
 {
-       CU_ASSERT_PTR_NULL(NULL);
-       CU_ASSERT_PTR_NULL(0x0);
+       StrBuf *Buf;
+
+       Buf = NewStrBufPlain(HKEY(","));
+       NextTokenizerIterateBuf(Buf, 2);
+       FreeStrBuf(&Buf);
 }
 
-static void testSuccessAssertPtrNotNull(void)
+static void TestNextTokenizer_One(void)
 {
-       CU_ASSERT_PTR_NOT_NULL((void*)0x23);
+       StrBuf *Buf;
+
+       Buf = NewStrBufPlain(HKEY("one"));
+       NextTokenizerIterateBuf(Buf, 1);
+       FreeStrBuf(&Buf);
 }
 
-static void testSuccessAssertStringEqual(void)
+static void TestNextTokenizer_Sequence(void)
 {
-       char str1[] = "test" ;
-       char str2[] = "test" ;
-
-       CU_ASSERT_STRING_EQUAL(str1, str2);
+       StrBuf *Buf;
+        char *teststring = "40:24524,24662,24673,27869:27935,28393,28426,31247:31258,31731,31749,31761,31778,31782,31801:31803,31813,31904,31915,33708,33935,34619,34672,34720:34723,34766,34835,37594,38854,39235,39942,40030,40142,40520,40815,40907,41201,41578,41781,41954,42292,43110,43565,43801,43998,44180,44241,44295,44401,44561,44635,44798,44861,44946,45022,45137:45148,45166,45179,45707,47114,47141:47157,47194,47314,47349,47386,47489,47496,47534:47543,54460,54601,54637:54652";
+        Buf = NewStrBufPlain(teststring, -1);
+       NextTokenizerIterateBuf(Buf, 67);
+       FreeStrBuf(&Buf);
 }
 
-static void testSuccessAssertStringNotEqual(void)
+
+
+static void NextLineterateBuf(StrBuf *Buf, int NLines)
 {
-       char str1[] = "test" ;
-       char str2[] = "testtsg" ;
+       int n = 0;
+       const char *pCh = NULL;
+       StrBuf *OneLine;
+       StrBuf *ConcatenatedLines;
+       long CountTokens = 0;
+       
+       TestRevalidateStrBuf(Buf);
+                            
+       OneLine = NewStrBuf();
+       ConcatenatedLines = NewStrBuf();
+
+       if (!Quiet) printf("\n");
+
+       if (StrLength(Buf) > 0) 
+               do 
+               {
+                       n = StrBufSipLine(OneLine, Buf, &pCh);
+                       
+                       CountTokens++;
+                       
+                       if (!Quiet) printf("Line: >%s< >%s<\n", 
+                                          ChrPtr(OneLine), 
+                                          ((pCh != NULL) && (pCh != StrBufNOTNULL))? pCh : "N/A");
+                       TestRevalidateStrBuf(OneLine);
+                       CU_ASSERT(CountTokens <= NLines);
+                       StrBufAppendBuf(ConcatenatedLines, OneLine, 0);
+                       
+                       if ((pCh == StrBufNOTNULL) && 
+                           (*(ChrPtr(Buf) + StrLength(Buf) - 1) != '\n'))
+                       {
+                       }
+                       else 
+                               StrBufAppendBufPlain(ConcatenatedLines, HKEY("\n"), 0);
+                       
+               } 
+               while ((pCh != StrBufNOTNULL) &&
+                      (pCh != NULL));
+       
 
-       CU_ASSERT_STRING_NOT_EQUAL(str1, str2);
+       if (!Quiet) printf("\n\nTemplate: >%s<\n", ChrPtr(Buf));
+       if (!Quiet) printf("\n\nAfter: >%s<\n", ChrPtr(ConcatenatedLines));
+       CU_ASSERT_NSTRING_EQUAL(ChrPtr(ConcatenatedLines), 
+                               ChrPtr(Buf), 
+                               StrLength(Buf));
+
+       FreeStrBuf(&OneLine);
+       FreeStrBuf(&ConcatenatedLines);
 }
 
-static void testSuccessAssertNStringEqual(void)
+
+static void TestNextLine_Empty(void)
 {
-       char str1[] = "test" ;
-       char str2[] = "testgfsg" ;
+       StrBuf *Buf;
 
-       CU_ASSERT_NSTRING_EQUAL(str1, str2, strlen(str1));
-       CU_ASSERT_NSTRING_EQUAL(str1, str1, strlen(str1));
-       CU_ASSERT_NSTRING_EQUAL(str1, str1, strlen(str1) + 1);
+       Buf = NewStrBufPlain(HKEY(""));
+       NextLineterateBuf(Buf, 0);
+       FreeStrBuf(&Buf);
 }
 
-static void testSuccessAssertNStringNotEqual(void)
+
+static void TestNextLine_OneLine(void)
 {
-       char str1[] = "test" ;
-       char str2[] = "teet" ;
-       char str3[] = "testgfsg" ;
+       StrBuf *Buf;
 
-       CU_ASSERT_NSTRING_NOT_EQUAL(str1, str2, 3);
-       CU_ASSERT_NSTRING_NOT_EQUAL(str1, str3, strlen(str1) + 1);
+       Buf = NewStrBufPlain(HKEY("abc\n"));
+       NextLineterateBuf(Buf, 1);
+       FreeStrBuf(&Buf);
 }
 
-static void testSuccessAssertDoubleEqual(void)
+
+static void TestNextLine_TwoLinesMissingCR(void)
 {
-       CU_ASSERT_DOUBLE_EQUAL(10, 10.0001, 0.0001);
-       CU_ASSERT_DOUBLE_EQUAL(10, 10.0001, -0.0001);
-       CU_ASSERT_DOUBLE_EQUAL(-10, -10.0001, 0.0001);
-       CU_ASSERT_DOUBLE_EQUAL(-10, -10.0001, -0.0001);
+       StrBuf *Buf;
+
+       Buf = NewStrBufPlain(HKEY("abc\ncde"));
+       NextLineterateBuf(Buf, 2);
+       FreeStrBuf(&Buf);
 }
 
-static void testSuccessAssertDoubleNotEqual(void)
+
+static void TestNextLine_twolines(void)
 {
-       CU_ASSERT_DOUBLE_NOT_EQUAL(10, 10.001, 0.0001);
-       CU_ASSERT_DOUBLE_NOT_EQUAL(10, 10.001, -0.0001);
-       CU_ASSERT_DOUBLE_NOT_EQUAL(-10, -10.001, 0.0001);
-       CU_ASSERT_DOUBLE_NOT_EQUAL(-10, -10.001, -0.0001);
+       StrBuf *Buf;
+
+       Buf = NewStrBufPlain(HKEY("abc\ncde\n"));
+       NextLineterateBuf(Buf, 2);
+       FreeStrBuf(&Buf);
 }
 
-static void AddTests(void)
+static void TestNextLine_LongLine(void)
 {
-       CU_pSuite pGroup = NULL;
-       CU_pTest pTest = NULL;
+       StrBuf *Buf;
 
-       pGroup = CU_add_suite("Sucess", success_init, success_clean);
-       pTest = CU_add_test(pGroup, "testSuccess1", testSuccess1);
-       pTest = CU_add_test(pGroup, "testSuccess2", testSuccess2);
-       pTest = CU_add_test(pGroup, "testSuccess3", testSuccess3);
-       
-       pGroup = CU_add_suite("failure", NULL, NULL);
-       pTest = CU_add_test(pGroup, "testfailure1", testfailure1);
-       pTest = CU_add_test(pGroup, "testfailure2", testfailure2);
-       pTest = CU_add_test(pGroup, "testfailure3", testfailure3);
-
-       pGroup = CU_add_suite("group_failure", group_failure_init, group_failure_clean);
-       pTest = CU_add_test(pGroup, "testGroupFailure1", testGroupFailure1);
-       pTest = CU_add_test(pGroup, "testGroupFailure2", testGroupFailure2);
+       Buf = NewStrBufPlain(HKEY("abcde\n1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\n"));
+       NextLineterateBuf(Buf, 2);
+       FreeStrBuf(&Buf);
 }
 
-static void AddStrBufSimlpeTests(void)
-{
-       CU_pSuite pGroup = NULL;
-       CU_pTest pTest = NULL;
 
-       pGroup = CU_add_suite("TestStringBufSimpleAppenders", NULL, NULL);
-       pTest = CU_add_test(pGroup, "testCreateBuf", TestCreateBuf);
+static void TestStrBufRemove_token_NotThere(void)
+{
+//     StrBuf *Test = NewStrBufPlain(HKEY(" 127.0.0.1"));
+       StrBuf *Test = NewStrBufPlain(HKEY(" 10.122.44.30, 10.122.44.30"));
+       StrBufRemove_token(Test, 0, ',');
+       TestRevalidateStrBuf(Test);
+       FreeStrBuf(&Test);
+}
 
 
+static void TestStrBufUrlescAppend(void)
+{
+       const char *expect = "%20%2B%23%26%3B%60%27%7C%2A%3F%2D%7E%3C%3E%5E%28%29%5B%5D%7B%7D%2F%24%22%5C";
+       StrBuf *In = NewStrBufPlain(HKEY( " +#&;`'|*?-~<>^()[]{}/$\"\\"));
+       StrBuf *Out = NewStrBuf();
+
+       StrBufUrlescAppend (Out, In, NULL);
+       if (!Quiet) printf ("%s<\n%s<\n%s\n", ChrPtr(In), ChrPtr(Out), expect);
+       CU_ASSERT_STRING_EQUAL(ChrPtr(Out), expect);
+       FreeStrBuf(&In);
+       FreeStrBuf(&Out);
+}
 
 /*
-       pGroup = CU_add_suite("TestBooleanAssert", NULL, NULL);
-       pTest = CU_add_test(pGroup, "testSuccessAssertTrue", testSuccessAssertTrue);
-       pTest = CU_add_test(pGroup, "testSuccessAssertFalse", testSuccessAssertFalse);
+Some samples from the original...
+       CU_ASSERT_EQUAL(10, 10);
+       CU_ASSERT_EQUAL(0, -0);
+       CU_ASSERT_EQUAL(-12, -12);
+       CU_ASSERT_NOT_EQUAL(10, 11);
+       CU_ASSERT_NOT_EQUAL(0, -1);
+       CU_ASSERT_NOT_EQUAL(-12, -11);
+       CU_ASSERT_PTR_EQUAL((void*)0x100, (void*)0x100);
+       CU_ASSERT_PTR_NOT_EQUAL((void*)0x100, (void*)0x101);
+       CU_ASSERT_PTR_NULL(NULL);
+       CU_ASSERT_PTR_NULL(0x0);
+       CU_ASSERT_PTR_NOT_NULL((void*)0x23);
+       CU_ASSERT_STRING_EQUAL(str1, str2);
+       CU_ASSERT_STRING_NOT_EQUAL(str1, str2);
+       CU_ASSERT_NSTRING_EQUAL(str1, str2, strlen(str1));
+       CU_ASSERT_NSTRING_EQUAL(str1, str1, strlen(str1));
+       CU_ASSERT_NSTRING_EQUAL(str1, str1, strlen(str1) + 1);
+       CU_ASSERT_NSTRING_NOT_EQUAL(str1, str2, 3);
+       CU_ASSERT_NSTRING_NOT_EQUAL(str1, str3, strlen(str1) + 1);
+       CU_ASSERT_DOUBLE_EQUAL(10, 10.0001, 0.0001);
+       CU_ASSERT_DOUBLE_EQUAL(10, 10.0001, -0.0001);
+       CU_ASSERT_DOUBLE_EQUAL(-10, -10.0001, 0.0001);
+       CU_ASSERT_DOUBLE_EQUAL(-10, -10.0001, -0.0001);
+       CU_ASSERT_DOUBLE_NOT_EQUAL(10, 10.001, 0.0001);
+       CU_ASSERT_DOUBLE_NOT_EQUAL(10, 10.001, -0.0001);
+       CU_ASSERT_DOUBLE_NOT_EQUAL(-10, -10.001, 0.0001);
+       CU_ASSERT_DOUBLE_NOT_EQUAL(-10, -10.001, -0.0001);
+*/
 
-       pGroup = CU_add_suite("TestEqualityAssert", NULL, NULL);
-       pTest = CU_add_test(pGroup, "testSuccessAssertEqual", testSuccessAssertEqual);
-       pTest = CU_add_test(pGroup, "testSuccessAssertNotEqual", testSuccessAssertNotEqual);
 
-       pGroup = CU_add_suite("TestPointerAssert", NULL, NULL);
-       pTest = CU_add_test(pGroup, "testSuccessAssertPtrEqual", testSuccessAssertPtrEqual);
-       pTest = CU_add_test(pGroup, "testSuccessAssertPtrNotEqual", testSuccessAssertPtrNotEqual);
 
-       pGroup = CU_add_suite("TestNullnessAssert", NULL, NULL);
-       pTest = CU_add_test(pGroup, "testSuccessAssertPtrNull", testSuccessAssertPtrNull);
-       pTest = CU_add_test(pGroup, "testSuccessAssertPtrNotNull", testSuccessAssertPtrNotNull);
 
-       pGroup = CU_add_suite("TestStringAssert", NULL, NULL);
-       pTest = CU_add_test(pGroup, "testSuccessAssertStringEqual", testSuccessAssertStringEqual);
-       pTest = CU_add_test(pGroup, "testSuccessAssertStringNotEqual", testSuccessAssertStringNotEqual);
 
-       pGroup = CU_add_suite("TestNStringAssert", NULL, NULL);
-       pTest = CU_add_test(pGroup, "testSuccessAssertNStringEqual", testSuccessAssertNStringEqual);
-       pTest = CU_add_test(pGroup, "testSuccessAssertNStringNotEqual", testSuccessAssertNStringNotEqual);
+static void AddStrBufSimpleTests(void)
+{
+       CU_pSuite pGroup = NULL;
+       CU_pTest pTest = NULL;
 
-       pGroup = CU_add_suite("TestDoubleAssert", NULL, NULL);
-       pTest = CU_add_test(pGroup, "testSuccessAssertDoubleEqual", testSuccessAssertDoubleEqual);
-       pTest = CU_add_test(pGroup, "testSuccessAssertDoubleNotEqual", testSuccessAssertDoubleNotEqual);
-*/
+       pGroup = CU_add_suite("TestStringBufSimpleAppenders", NULL, NULL);
+       pTest = CU_add_test(pGroup, "testCreateBuf", TestCreateBuf);
+       pTest = CU_add_test(pGroup, "TestBufNumbers", TestBufNumbers);
+       pTest = CU_add_test(pGroup, "TestStrBufPeek", TestStrBufPeek);
+       pTest = CU_add_test(pGroup, "TestBufStringManipulation", TestBufStringManipulation);
+
+
+       pGroup = CU_add_suite("TestStringTokenizer", NULL, NULL);
+       pTest = CU_add_test(pGroup, "testNextTokenizer_EndWithEmpty", TestNextTokenizer_EndWithEmpty);
+       pTest = CU_add_test(pGroup, "testNextTokenizer_StartWithEmpty", TestNextTokenizer_StartWithEmpty);
+       pTest = CU_add_test(pGroup, "testNextTokenizer_StartWithEmpty", TestNextTokenizer_StartWithEmpty);
+       pTest = CU_add_test(pGroup, "testNextTokenizer_Empty", TestNextTokenizer_Empty);
+       pTest = CU_add_test(pGroup, "testNextTokenizer_TwoEmpty", TestNextTokenizer_TwoEmpty);
+       pTest = CU_add_test(pGroup, "testNextTokenizer_One", TestNextTokenizer_One);
+       pTest = CU_add_test(pGroup, "testNextTokenizer_Sequence", TestNextTokenizer_Sequence);
+
+
+       pGroup = CU_add_suite("TestStrBufSipLine", NULL, NULL);
+       pTest = CU_add_test(pGroup, "TestNextLine_Empty", TestNextLine_Empty);
+       pTest = CU_add_test(pGroup, "TestNextLine_OneLine", TestNextLine_OneLine);
+       pTest = CU_add_test(pGroup, "TestNextLine_TwoLinesMissingCR", TestNextLine_TwoLinesMissingCR);
+       pTest = CU_add_test(pGroup, "TestNextLine_twolines", TestNextLine_twolines);
+       pTest = CU_add_test(pGroup, "TestNextLine_LongLine", TestNextLine_LongLine);
+       
+       pGroup = CU_add_suite("TestStrBufRemove_token", NULL, NULL);
+       pTest = CU_add_test(pGroup, "TestStrBufRemove_token_NotThere", TestStrBufRemove_token_NotThere);
+
+       pGroup = CU_add_suite("TestStrBuf_escapers", NULL, NULL);
+       pTest = CU_add_test(pGroup, "TestStrBufUrlescAppend", TestStrBufUrlescAppend);
 }
 
 
 int main(int argc, char* argv[])
 {
+       ///int i;
        setvbuf(stdout, NULL, _IONBF, 0);
 
-       StartLibCitadel(8);
-       if (argc > 1) {
-               CU_BOOL Run = CU_FALSE ;
+       CU_BOOL Run = CU_FALSE ;
 
-               CU_set_output_filename("TestAutomated");
-               if (CU_initialize_registry()) {
-                       printf("\nInitialize of test Registry failed.");
-               }
-
-               if (!strcmp("--test", argv[1])) {
-                       Run = CU_TRUE ;
-                       AddTests();
-               }
-               else if (!strcmp("--atest", argv[1])) {
-                       Run = CU_TRUE ;
-                       AddStrBufSimlpeTests();
-               }
-               else if (!strcmp("--alltest", argv[1])) {
-                       Run = CU_TRUE ;
-                       AddTests();
-//                     AddAssertTests();
-               }
-               
-               if (CU_TRUE == Run) {
-                       //CU_console_run_tests();
-    printf("\nTests completed with return value %d.\n", CU_basic_run_tests());
-
-                       ///CU_automated_run_tests();
-               }
-
-               CU_cleanup_registry();
+       if (argc > 0)
+               Quiet = 1; // todo: -q ;-)
+//     for (i=0; i< 100000; i++) {
+       CU_set_output_filename("TestAutomated");
+       if (CU_initialize_registry()) {
+               printf("\nInitialize of test Registry failed.");
+//     }
+       
+       Run = CU_TRUE ;
+       AddStrBufSimpleTests();
+       
+       if (CU_TRUE == Run) {
+               //CU_console_run_tests();
+               printf("\nTests completed with return value %d.\n", CU_basic_run_tests());
+    
+    ///CU_automated_run_tests();
+       }
+       
+       CU_cleanup_registry();
        }
-
        return 0;
 }