Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/test
Modified Files:
test.c
Log Message:
Fri Jan 30 17:55:47 2004 Michael Jennings (mej)
Working on adding assertions/requires for NULL object checks.
Also making sure list elements can be NULL so insert_at() can resize
a list.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/test/test.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- test.c 23 Jan 2004 01:44:51 -0000 1.33
+++ test.c 30 Jan 2004 22:55:19 -0000 1.34
@@ -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.33 2004/01/23 01:44:51 mej Exp $";
+static const char cvs_ident[] = "$Id: test.c,v 1.34 2004/01/30 22:55:19 mej Exp $";
#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
# include <config.h>
@@ -1132,7 +1132,8 @@
TEST_BEGIN("SPIF_LIST_INSERT_AT() macro");
SPIF_LIST_INSERT_AT(testlist, spif_str_new_from_ptr("MOO"), 0);
SPIF_LIST_INSERT_AT(testlist, spif_str_new_from_ptr("GRIN"), 4);
- TEST_FAIL_IF(SPIF_LIST_COUNT(testlist) != 10);
+ SPIF_LIST_INSERT_AT(testlist, spif_str_new_from_ptr("BOB"), 12);
+ TEST_FAIL_IF(SPIF_LIST_COUNT(testlist) != 13);
s = spif_str_new_from_ptr("MOO");
TEST_FAIL_IF(SPIF_LIST_INDEX(testlist, s) != 0);
spif_str_done(s);
@@ -1147,6 +1148,11 @@
spif_str_done(s);
spif_str_init_from_ptr(s, "5");
TEST_FAIL_IF(SPIF_LIST_INDEX(testlist, s) != 9);
+ spif_str_done(s);
+ TEST_FAIL_IF(!SPIF_OBJ_ISNULL(SPIF_LIST_GET(testlist, 10)));
+ TEST_FAIL_IF(!SPIF_OBJ_ISNULL(SPIF_LIST_GET(testlist, 11)));
+ spif_str_init_from_ptr(s, "BOB");
+ TEST_FAIL_IF(SPIF_LIST_INDEX(testlist, s) != 12);
spif_str_del(s);
TEST_PASS();
@@ -1155,9 +1161,8 @@
spif_str_t tmp;
tmp = SPIF_CAST(str) SPIF_ITERATOR_NEXT(it);
- TEST_FAIL_IF(SPIF_STR_ISNULL(tmp));
}
- TEST_FAIL_IF(j != 10);
+ TEST_FAIL_IF(j != 13);
TEST_FAIL_IF(SPIF_ITERATOR_HAS_NEXT(it));
TEST_FAIL_IF(!SPIF_OBJ_ISNULL(SPIF_ITERATOR_NEXT(it)));
TEST_PASS();
@@ -1172,6 +1177,11 @@
s2 = SPIF_CAST(str) SPIF_LIST_REMOVE(testlist, s);
TEST_FAIL_IF(SPIF_OBJ_ISNULL(s2));
spif_str_del(s2);
+ spif_str_done(s);
+ spif_str_init_from_ptr(s, "BOB");
+ s2 = SPIF_CAST(str) SPIF_LIST_REMOVE(testlist, s);
+ TEST_FAIL_IF(SPIF_OBJ_ISNULL(s2));
+ spif_str_del(s2);
spif_str_del(s);
s = spif_str_new_from_ptr("0");
@@ -1192,9 +1202,15 @@
TEST_PASS();
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);
+ TEST_FAIL_IF(!SPIF_STR_ISNULL(s2));
s2 = SPIF_CAST(str) SPIF_LIST_REMOVE_AT(testlist, 6);
+ TEST_FAIL_IF(SPIF_STR_ISNULL(s2));
spif_str_del(s2);
s2 = SPIF_CAST(str) SPIF_LIST_REMOVE_AT(testlist, 3);
+ TEST_FAIL_IF(SPIF_STR_ISNULL(s2));
spif_str_del(s2);
s = spif_str_new_from_ptr("0");
-------------------------------------------------------
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
