removed StartLibCitadel()

[citadel.git] / libcitadel / tests / hashlist_test.c

diff --git a/libcitadel/tests/hashlist_test.c b/libcitadel/tests/hashlist_test.c
index e7b929b6bad4afca10e57448865d4deb41147d6c..69ee47d27aec64beb247ee0ca1dc44abfa7d10fa 100644 (file)
--- a/libcitadel/tests/hashlist_test.c
+++ b/libcitadel/tests/hashlist_test.c
@@ -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.
@@ -12,10 +11,6 @@
  *  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>
@@ -111,6 +106,7 @@ static void TestHashlistAddDelete (void)
 
        printf("Remove first\n");
        DeleteEntryFromHash(H, at);
+       DeleteHashPos(&at);
 
        ValidateBackAndForth(H);
 
@@ -139,7 +135,7 @@ static void TestHashlistAddDelete (void)
 
        ValidateBackAndForth(H);
 
-
+       DeleteHashPos(&at);
        DeleteHash(&H);
 }
 
@@ -176,6 +172,7 @@ Some samples from the original...
 
 
 const char *MSetStrings[] = {
+       "11:63",
        "65",
        "1,65,77",
        "1:65,77,80:*",
@@ -184,8 +181,12 @@ const char *MSetStrings[] = {
 
 #define InMSet 0
 #define NotInMSet 1
-const long MessageNumbers[4][2][10] = {
+const long MessageNumbers[5][2][10] = {
 /* First MSet */
+       {
+               {11, 59, 63, 0, 0, 0, 0, 0, 0, 0}, /* In */
+               {2, 10, 64, 65, 0, 0, 0, 0, 0, 0} /* NotIn */
+       },
        {
                {65, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* In */
                {1, 64, 66, 0, 0, 0, 0, 0, 0, 0} /* NotIn */
@@ -223,7 +224,7 @@ static void TestMSetHashlist (void)
                StrBufPlain(MSetStr, MSetStrings[nTest], -1);
                ParseMSet(&OneMSet, MSetStr);
 
-#ifdef VERBOSE_TEST
+//#ifdef VERBOSE_TEST
                printf("---%s---\n", ChrPtr(MSetStr));
                {
                        const char *HashKey;
@@ -241,7 +242,7 @@ static void TestMSetHashlist (void)
                        }
                        DeleteHashPos(&at);
                }
-#endif
+//#endif
 
                j = 0;
                while (MessageNumbers[nTest][InMSet][j] != 0)
@@ -252,6 +253,7 @@ static void TestMSetHashlist (void)
                                             ChrPtr(MSetStr), 
                                             MessageNumbers[nTest][InMSet][j]);
                                CU_FAIL(ChrPtr(Assert));
+                               printf("%s", ChrPtr(Assert));
                        }
                        else
                        {
@@ -271,6 +273,7 @@ static void TestMSetHashlist (void)
                                             ChrPtr(MSetStr), 
                                             MessageNumbers[nTest][NotInMSet][j]);
                                CU_FAIL(ChrPtr(Assert));
+                               printf("%s", ChrPtr(Assert));
                        }
                        else
                        {
@@ -309,7 +312,6 @@ int main(int argc, char* argv[])
 {
        setvbuf(stdout, NULL, _IONBF, 0);
 
-       StartLibCitadel(8);
        CU_BOOL Run = CU_FALSE ;
        
        CU_set_output_filename("TestAutomated");