Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/test
Modified Files:
test.c test.h
Log Message:
Wed Feb 4 17:24:56 2004 Michael Jennings (mej)
Some test improvements.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/test/test.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- test.c 4 Feb 2004 17:51:26 -0000 1.37
+++ test.c 4 Feb 2004 22:23:01 -0000 1.38
@@ -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.37 2004/02/04 17:51:26 mej Exp $";
+static const char cvs_ident[] = "$Id: test.c,v 1.38 2004/02/04 22:23:01 mej Exp $";
#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
# include <config.h>
@@ -54,33 +54,46 @@
char sc1 = 'X', sc2 = 'K';
int si1 = 472, si2 = 8786345;
unsigned long sl1 = 0x98765432, sl2 = 0xffeeddff;
+ void *vp1 = &sc1, *vp2 = &sc2;
TEST_BEGIN("MEMSET() macro");
MEMSET(memset_test, '!', CONST_STRLEN(memset_test));
- TEST_EXPECT(!strcmp(memset_test, "!!!!!!!!!!!!!!!!!!!!!!!!!!"));
+ TEST_FAIL_IF(strcmp(memset_test, "!!!!!!!!!!!!!!!!!!!!!!!!!!"));
+ MEMSET(memset_test + 3, '*', 14);
+ TEST_FAIL_IF(strcmp(memset_test, "!!!**************!!!!!!!!!"));
+ MEMSET(memset_test, '&', 0 );
+ TEST_FAIL_IF(strcmp(memset_test, "!!!**************!!!!!!!!!"));
+ MEMSET(SPIF_NULL_TYPE(charptr), '_', CONST_STRLEN(memset_test));
+ TEST_PASS();
TEST_BEGIN("SWAP() macro");
SWAP(sc1, sc2);
SWAP(si1, si2);
SWAP(sl1, sl2);
+ SWAP(vp1, vp2);
TEST_FAIL_IF(sc1 != 'K');
TEST_FAIL_IF(sc2 != 'X');
TEST_FAIL_IF(si1 != 8786345);
TEST_FAIL_IF(si2 != 472);
TEST_FAIL_IF(sl1 != 0xffeeddff);
TEST_FAIL_IF(sl2 != 0x98765432);
+ TEST_FAIL_IF(vp1 != &sc2);
+ TEST_FAIL_IF(vp2 != &sc1);
TEST_PASS();
TEST_BEGIN("BINSWAP() macro");
BINSWAP(sc1, sc2);
BINSWAP(si1, si2);
BINSWAP(sl1, sl2);
+ BINSWAP(vp1, vp2);
TEST_FAIL_IF(sc1 != 'X');
TEST_FAIL_IF(sc2 != 'K');
TEST_FAIL_IF(si1 != 472);
TEST_FAIL_IF(si2 != 8786345);
TEST_FAIL_IF(sl1 != 0x98765432);
TEST_FAIL_IF(sl2 != 0xffeeddff);
+ TEST_FAIL_IF(vp1 != &sc1);
+ TEST_FAIL_IF(vp2 != &sc2);
TEST_PASS();
TEST_BEGIN("BEG_STRCASECMP() macro");
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/test/test.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- test.h 4 Feb 2004 17:51:26 -0000 1.9
+++ test.h 4 Feb 2004 22:23:01 -0000 1.10
@@ -25,15 +25,16 @@
# define _LIBAST_TEST_H_
# define TEST_NOTICE(s) do {printf("%s\n", s);
fflush(stdout);} while (0)
-# define TEST_BEGIN(s) do {tnum = 1; printf("Testing " s
"...");} while (0)
+# define TEST_BEGIN(s) do {tnum = 1; printf("Testing %s...",
s); fflush(stdout);} while (0)
# define TEST_PASS() do {printf("passed (%hu).\n", tnum -
1); fflush(stdout);} while (0)
# define TEST_FAIL(t) do { \
printf("failed at %s:%d (test
#%hu): Test \"%s\" returned %d.\n", \
__FILE__, __LINE__, tnum,
#t, (t)); \
+ fflush(stdout); \
return 1; \
} while (0)
# define TEST_FAIL_IF(t) do {if (t) {TEST_FAIL(t);} tnum++;}
while (0)
-# define TEST_EXPECT(t) do {if (t) {TEST_PASS();} else
{TEST_FAIL(t);}} while (0)
-# define TEST_PASSED(s) do {printf("All " s " tests
passed.\n\n"); fflush(stdout); return 0;} while (0)
+# define TEST_EXPECT(t) do {if (t) {tnum++; TEST_PASS();} else
{TEST_FAIL(t);}} while (0)
+# define TEST_PASSED(s) do {printf("All %s tests passed.\n\n",
s); fflush(stdout); return 0;} while (0)
#endif
-------------------------------------------------------
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
