Changeset 738:d666051658bd in freeDiameter for tests/testostr.c

Timestamp:

Mar 2, 2011, 6:21:59 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix broken 'almostcasecmp' logic

File:

• tests/testostr.c (modified) (2 diffs)

tests/testostr.c

@@ -99 +99 @@
                 CHECK( 0, strcasecmp(res, TEST_IDN_UTF8) );
                 CHECK( 0, fd_os_cmp(res, len, TEST_IDN_UTF8, CONSTSTRLEN(TEST_IDN_UTF8)) );
-                CHECK( 0, fd_os_almostcasecmp(res, len, TEST_IDN_UTF8, CONSTSTRLEN(TEST_IDN_UTF8)) );
+                CHECK( 0, fd_os_almostcasesrch(res, len, TEST_IDN_UTF8, CONSTSTRLEN(TEST_IDN_UTF8), NULL) );
                 CHECK( 0, fd_os_validate_DiameterIdentity(&res, &len, 0) );
                 CHECK( 0, strcasecmp(res, TEST_IDN_UTF8) );
@@ -128 +128 @@
         }
         
+        {
+                /* test fd_os_cmp and fd_os_almostcasesrch and that they are compatible */
+                char *t1 = "a";
+                char *t2 = "b";
+                char *t3 = "C";
+                char *t4 = "d";
+                char *t5 = "aa";
+                char *t6 = "aB";
+                char *t7 = "Ac";
+                char *t8 = "aD";
+                char *t9 = "AAA";
+                
+                char *t5b = "Aa";
+                char *t6b = "ab";
+                
+                /* First, create a list with all the elements in order given by fd_os_cmp */
+                char *t[] = { t1, t2, t3, t4, t5, t6,t7, t8, t9 };
+                int i;
+                struct fd_list *li, l = FD_LIST_INITIALIZER(l);
+                for (i = 0; i < sizeof(t) / sizeof(t[0]); i++) {
+                        /* insert t[i] */
+                        struct fd_list *n = malloc(sizeof(struct fd_list));
+                        CHECK( 1, n ? 1 : 0 );
+                        fd_list_init(n, t[i]);
+                        for (li = l.next; li != &l; li = li->next) {
+                                if ( fd_os_cmp(t[i], strlen(t[i]), li->o, strlen(li->o)) < 0 )
+                                        break;
+                        } 
+                        fd_list_insert_before(li, n);
+                }
+                /* in principle the result is: [ "C", "a", "b", "d", "Ac", "aB", "aD", "aa", "AAA" ] */
+                
+                /* Since there is no equal value in the list (even case-insensitive), check that the order is valid also for the caseinsensitive variant */
+                for (li = l.next; li != l.prev; li = li->next) {
+                        CHECK( 1, fd_os_almostcasesrch(li->o, strlen(li->o), li->next->o, strlen(li->next->o), NULL) < 0 ? 1 : 0 );
+                }
+                
+                /* Now check that we can case-insentively find t5b and t6b to be equal to t5 and t6 resp. (this is how we use it in the daemon) */
+                for (li = l.next; li != &l; li = li->next) {
+                        int cont, cmp;
+                        cmp = fd_os_almostcasesrch(t5b, strlen(t5b), li->o, strlen(li->o), &cont);
+                        TRACE_DEBUG(FULL, "Comp '%s' : %d, %d", (char *)li->o, cmp, cont);
+                        if (cmp == 0)
+                                break;
+                        if (!cont)
+                                break;
+                }
+                CHECK( li->o, t5 );
+                
+                for (li = l.next; li != &l; li = li->next) {
+                        int cont, cmp;
+                        cmp = fd_os_almostcasesrch(t6b, strlen(t6b), li->o, strlen(li->o), &cont);
+                        TRACE_DEBUG(FULL, "Comp '%s' : %d, %d", (char *)li->o, cmp, cont);
+                        if (cmp == 0)
+                                break;
+                        if (!cont)
+                                break;
+                }
+                CHECK( li->o, t6 );
+                
+                
+                /* done */
+                while (!FD_IS_LIST_EMPTY(&l)) {
+                        li = l.next;
+                        fd_list_unlink(li);
+                        free(li);
+                }
+        }
+        
         /* That's all for the tests yet */
         PASSTEST();