Enlightenment CVS committal

Author  : mej
Project : eterm
Module  : libast

Dir     : eterm/libast/test


Modified Files:
        test.c 


Log Message:
Tue Feb  3 18:18:32 2004                        Michael Jennings (mej)

Cleanups are done.  Almost done with the NULL handling for lists too.

===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/test/test.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- test.c      2 Feb 2004 22:21:23 -0000       1.35
+++ test.c      3 Feb 2004 23:17:00 -0000       1.36
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-static const char cvs_ident[] = "$Id: test.c,v 1.35 2004/02/02 22:21:23 mej Exp $";
+static const char cvs_ident[] = "$Id: test.c,v 1.36 2004/02/03 23:17:00 mej Exp $";
 
 #if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
 # include <config.h>
@@ -810,7 +810,7 @@
     teststr = spif_str_new_from_ptr(tmp);
     test2str = spif_str_new_from_ptr("lots of fun");
     spif_str_splice(teststr, 8, 6, test2str);
-    TEST_FAIL_IF(spif_str_cmp_with_ptr(teststr, "this is lots of fun"));
+    TEST_FAIL_IF(!SPIF_CMP_IS_EQUAL(spif_str_cmp_with_ptr(teststr, "this is lots of 
fun")));
     TEST_FAIL_IF(spif_str_get_size(teststr) != 20);
     TEST_FAIL_IF(spif_str_get_len(teststr) != 19);
     spif_str_del(test2str);
@@ -1203,7 +1203,11 @@
         TEST_BEGIN("SPIF_LIST_REMOVE_AT() macro");
         s2 = SPIF_CAST(str) SPIF_LIST_REMOVE_AT(testlist, 11);
         TEST_FAIL_IF(!SPIF_STR_ISNULL(s2));
-        s2 = SPIF_CAST(str) SPIF_LIST_REMOVE_AT(testlist, 11);
+        s2 = SPIF_CAST(str) SPIF_LIST_REMOVE_AT(testlist, 10);
+        TEST_FAIL_IF(!SPIF_STR_ISNULL(s2));
+        s2 = SPIF_CAST(str) SPIF_LIST_REMOVE_AT(testlist, 9);
+        TEST_FAIL_IF(!SPIF_STR_ISNULL(s2));
+        s2 = SPIF_CAST(str) SPIF_LIST_REMOVE_AT(testlist, 8);
         TEST_FAIL_IF(!SPIF_STR_ISNULL(s2));
         s2 = SPIF_CAST(str) SPIF_LIST_REMOVE_AT(testlist, 6);
         TEST_FAIL_IF(SPIF_STR_ISNULL(s2));
@@ -1869,9 +1873,6 @@
     if ((ret = test_strings()) != 0) {
         return ret;
     }
-    if ((ret = test_hash_functions()) != 0) {
-        return ret;
-    }
     if ((ret = test_snprintf()) != 0) {
         return ret;
     }
@@ -1902,6 +1903,9 @@
     if ((ret = test_regexp()) != 0) {
         return ret;
     }
+    if ((ret = test_hash_functions()) != 0) {
+        return ret;
+    }
 
     printf("All tests passed.\n\n");
 




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to