From d35734dd77149fc96d3a282c16d6eb4c84ec3d66 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 8 Dec 2009 17:52:47 +0000 Subject: 2009-12-08 Joel Sherrill * itronmbf01/init.c, itronsem01/init.c, itronsem01/system.h, itrontask02/dormant.c, itrontask02/init.c, itrontask03/init.c, itrontask03/preempt.c: Use rtems_test_assert() consistently instead of system assert(). rtems_test_assert() is designed to integrate into the RTEMS test suite infrastructure. --- testsuites/itrontests/itronmbf01/init.c | 107 ++++++++++++++++---------------- 1 file changed, 53 insertions(+), 54 deletions(-) (limited to 'testsuites/itrontests/itronmbf01/init.c') diff --git a/testsuites/itrontests/itronmbf01/init.c b/testsuites/itrontests/itronmbf01/init.c index f20e909f2d..b39841385a 100644 --- a/testsuites/itrontests/itronmbf01/init.c +++ b/testsuites/itrontests/itronmbf01/init.c @@ -10,7 +10,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-2007. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -23,7 +23,6 @@ #define CONFIGURE_INIT #include "system.h" #include -#include /* * The following is hopefully temporary. @@ -76,7 +75,7 @@ void TestCre(void) puts( "Init - cre_mbf - NULL pk_cmbf returns E_PAR" ); status = cre_mbf( 1, NULL ); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - cre_mbf - negative values for bufsz returns E_PAR" ); pk_cmbf.bufsz = -1; @@ -84,19 +83,19 @@ void TestCre(void) pk_cmbf.mbfatr = 0; pk_cmbf.exinf = NULL; status = cre_mbf( 1, &pk_cmbf ); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - cre_mbf - negative values for maxmsz returns E_PAR" ); pk_cmbf.bufsz = 100; pk_cmbf.maxmsz = -1; status = cre_mbf( 1, &pk_cmbf ); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - cre_mbf - bufsz < maxmsz returns E_PAR" ); pk_cmbf.bufsz = 100; pk_cmbf.maxmsz = 101; status = cre_mbf( 1, &pk_cmbf ); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); /* * Now run through all the bad ID errors @@ -106,37 +105,37 @@ void TestCre(void) pk_cmbf.maxmsz = 30; puts( "Init - cre_mbf - bad id (less than -4) - E_OACV" ); status = cre_mbf( -5, &pk_cmbf ); - assert( status == E_OACV ); + rtems_test_assert( status == E_OACV ); puts( "Init - cre_mbf - bad id (between 0 and -4) - E_ID" ); status = cre_mbf( -4, &pk_cmbf ); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - cre_mbf - bad id (0) - E_ID" ); status = cre_mbf( 0, &pk_cmbf ); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - cre_mbf - bad id (too great) - E_ID" ); status = cre_mbf( CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1, &pk_cmbf ); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - cre_mbf - create mbf 1 TA_TFIFO - E_OK" ); pk_cmbf.bufsz = 600; pk_cmbf.maxmsz = 200; pk_cmbf.mbfatr = TA_TFIFO; status = cre_mbf( 1, &pk_cmbf ); - assert( status == E_OK ); + rtems_test_assert( status == E_OK ); puts( "Init - cre_mbf - create mbf 1 again - E_OBJ" ); status = cre_mbf( 1, &pk_cmbf ); - assert( status == E_OBJ ); + rtems_test_assert( status == E_OBJ ); puts( "Init - cre_mbf - create mbf 2 TA_TPRI - E_OK" ); pk_cmbf.bufsz = 600; pk_cmbf.maxmsz = 200; pk_cmbf.mbfatr = TA_TPRI; status = cre_mbf( 2, &pk_cmbf ); - assert( status == E_OK ); + rtems_test_assert( status == E_OK ); } void TestDel(void) @@ -149,24 +148,24 @@ void TestDel(void) puts( "Init - del_mbf - bad id (less than -4) - E_OACV" ); status = del_mbf( -5 ); - assert( status == E_OACV ); + rtems_test_assert( status == E_OACV ); puts( "Init - del_mbf - bad id (between 0 and -4) - E_ID" ); status = del_mbf( -4 ); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - del_mbf - bad id (0) - E_ID" ); status = del_mbf( 0 ); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - del_mbf - bad id (too great) - E_ID" ); status = del_mbf( CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1 ); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts("Init - del_mbf - E_OK" ); status = del_mbf(2); - assert(status == E_OK); + rtems_test_assert(status == E_OK); } void TestPsnd(void) @@ -180,36 +179,36 @@ void TestPsnd(void) puts( "Init - psnd_mbf - bad id (less than -4) - E_OACV" ); status = psnd_mbf(-5, msg, sizeof(msg)); - assert( status == E_OACV ); + rtems_test_assert( status == E_OACV ); puts( "Init - psnd_mbf - bad id (between 0 and -4) - E_ID" ); status = psnd_mbf(-4, msg, sizeof(msg)); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - psnd_mbf - bad id (0) - E_ID" ); status = psnd_mbf(0, msg, sizeof(msg)); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - psnd_mbf - bad id (too great) - E_ID" ); status = psnd_mbf(CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1, msg, sizeof(msg)); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - psnd_mbf - msg == 0, E_PAR" ); status = psnd_mbf(1, 0, sizeof(msg)); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - psnd_mbf - msgsz too big - E_PAR" ); status = psnd_mbf(1, msg, 300); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - psnd_mbf - msgsz <0 - E_PAR" ); status = psnd_mbf(1, msg, -10); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - psnd_mbf - E_OK" ); status = psnd_mbf(1, msg, sizeof(msg)); - assert( status == E_OK ); + rtems_test_assert( status == E_OK ); } void TestRef(void) @@ -219,28 +218,28 @@ void TestRef(void) puts( "Init - ref_mbf - bad id (less than -4) - E_OACV" ); status = ref_mbf(&pk_rmbf, -5); - assert( status == E_OACV ); + rtems_test_assert( status == E_OACV ); puts( "Init - ref_mbf - bad id (between 0 and -4) - E_ID" ); status = ref_mbf(&pk_rmbf, -4); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - ref_mbf - bad id (0) - E_ID" ); status = ref_mbf(&pk_rmbf, 0); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - ref_mbf - bad id (too great) - E_ID" ); status = ref_mbf(&pk_rmbf, CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - ref_mbf - NULL pk_mbf returns E_PAR" ); status = ref_mbf( NULL, 1 ); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - ref_mbf - mbf 1 - E_OK" ); status = ref_mbf( &pk_rmbf, 1 ); - assert( status == E_OK ); + rtems_test_assert( status == E_OK ); printf( "Init - mbf 1 msgsz = %" PRId32 "\n", pk_rmbf.msgsz ); printf( "Init - mbf 1 frbufsz = %" PRId32 "\n", pk_rmbf.frbufsz ); @@ -256,31 +255,31 @@ void TestRcv(void) puts( "Init - rcv_mbf - bad id (less than -4) - E_OACV" ); status = rcv_mbf(buffer, &s, -5); - assert( status == E_OACV ); + rtems_test_assert( status == E_OACV ); puts( "Init - rcv_mbf - bad id (between 0 and -4) - E_ID" ); status = rcv_mbf(buffer, &s, -4); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - rcv_mbf - bad id (0) - E_ID" ); status = rcv_mbf(buffer, &s, 0); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - rcv_mbf - bad id (too great) - E_ID" ); status = rcv_mbf(buffer, &s, CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - rcv_mbf - NULL msg returns E_PAR" ); status = rcv_mbf(NULL, &s, 1); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - rcv_mbf - NULL p_msgsz returns E_PAR" ); status = rcv_mbf(buffer, 0, 1); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts("Init - rcv_mbf -- OK"); status = rcv_mbf(buffer, &s, 1); - assert(status == E_OK); + rtems_test_assert(status == E_OK); printf("Message:[%s], length:%" PRId32 "\n", buffer, s); } @@ -293,31 +292,31 @@ void TestPrcv(void) puts( "Init - prcv_mbf - bad id (less than -4) - E_OACV" ); status = prcv_mbf(buffer, &s, -5); - assert( status == E_OACV ); + rtems_test_assert( status == E_OACV ); puts( "Init - prcv_mbf - bad id (between 0 and -4) - E_ID" ); status = prcv_mbf(buffer, &s, -4); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - prcv_mbf - bad id (0) - E_ID" ); status = prcv_mbf(buffer, &s, 0); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - prcv_mbf - bad id (too great) - E_ID" ); status = prcv_mbf(buffer, &s, CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - prcv_mbf - NULL msg returns E_PAR" ); status = prcv_mbf(NULL, &s, 1); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - prcv_mbf - NULL p_msgsz returns E_PAR" ); status = prcv_mbf(buffer, 0, 1); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts("Init - prcv_mbf -- E_TMOUT"); status = prcv_mbf(buffer, &s, 1); - assert(status == E_TMOUT); + rtems_test_assert(status == E_TMOUT); } @@ -329,37 +328,37 @@ void TestTrcv(void) puts( "Init - trcv_mbf - bad id (less than -4) - E_OACV" ); status = trcv_mbf(buffer, &s, -5, 5000); - assert( status == E_OACV ); + rtems_test_assert( status == E_OACV ); puts( "Init - trcv_mbf - bad id (between 0 and -4) - E_ID" ); status = trcv_mbf(buffer, &s, -4, 5000); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - trcv_mbf - bad id (0) - E_ID" ); status = trcv_mbf(buffer, &s, 0, 5000); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - trcv_mbf - bad id (too great) - E_ID" ); status = trcv_mbf(buffer, &s, CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1, 5000); - assert( status == E_ID ); + rtems_test_assert( status == E_ID ); puts( "Init - trcv_mbf - NULL msg returns E_PAR" ); status = trcv_mbf(NULL, &s, 1, 5000); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - trcv_mbf - NULL p_msgsz returns E_PAR" ); status = trcv_mbf(buffer, 0, 1, 5000); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts( "Init - trcv_mbf - tmout <-2 returns E_PAR" ); status = trcv_mbf(buffer, &s, 1, -2); - assert( status == E_PAR ); + rtems_test_assert( status == E_PAR ); puts("\nInit - trcv_mbf -- E_TMOUT"); put_time( "Init - starting to block at "); status = trcv_mbf(buffer, &s, 1, 1000); - assert(status == E_TMOUT); + rtems_test_assert(status == E_TMOUT); put_time( "Init - time out at "); } -- cgit v1.2.3