ITEM test cleaned up

diff --git a/resources/item/fra_item.c b/resources/item/fra_item.c
index 8904e8cf42736318a46e23449d393aae87380ce3..7100cada9bf0b352d556596c129affc5b9555f65 100644 (file)
--- a/resources/item/fra_item.c
+++ b/resources/item/fra_item.c
@@ -89,7 +89,7 @@ int fra_item_init(void)
  * 
  * @return Number of elements returned in @a data array, -1 on error.
  */
-int fra_item_receive(frsh_vres_id_t vres, unsigned *data[])
+int fra_item_receive(frsh_vres_id_t vres, unsigned char *data[])
 {
        fres_item_data_seq *seq;
        fres_block_item_nodes *nodes;

diff --git a/resources/item/item.h b/resources/item/item.h
index bc32400dcc3d26398d3f770d7d661a6e3c92bc87..19dac49039df52252349ac3854668e5100fd0e28 100644 (file)
--- a/resources/item/item.h
+++ b/resources/item/item.h
@@ -9,7 +9,7 @@
 
 int fres_block_register_item();
 int fra_item_init(void);
-int fra_item_receive(frsh_vres_id_t vres, unsigned *data[]);
+int fra_item_receive(frsh_vres_id_t vres, unsigned char *data[]);
 
 /* Define fres_container_(add|get|del)_item_nodes. */
 FRES_CONTAINER_ACCESSOR(ITEM_NODES, item_nodes);

diff --git a/resources/item/tests/test_item.c b/resources/item/tests/test_item.c
index 0f9613d2fc5481f12fc48cd1b711df1dd4fd4131..231266bb33187fec62c17af87614247ae533d871 100644 (file)
--- a/resources/item/tests/test_item.c
+++ b/resources/item/tests/test_item.c
@@ -6,15 +6,15 @@
 //ITEM ADD
 //#include "FWSN.h"
 
+#if 1
 #define N 4
-//#define N 3
-
 int contract_deadline_sec[N] = { 4,4,4,4 };
-//int contract_deadline_sec[N] = {2,2,2};
-//int contract_deadline_sec[N] = { 8*SLOT_TIME, 8*SLOT_TIME, 4*SLOT_TIME }; //ITEM ADD
 int contract_nodes[N] = { 0x04, 0x05, 0x02 ,0x03};
-//int contract_nodes[N] = { 0x02,0x03,0x04};
-
+#else
+#define N 3
+int contract_deadline_sec[N] = {2,2,2};
+int contract_nodes[N] = { 0x02,0x03,0x04};
+#endif
 int main(int argc, char *argv[])
 {
        int ret;
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
 
                /* Negotiate the contract */
                ret = frsh_contract_negotiate(&contract[i], &vres[i]);
-               //if (ret) PERROR_AND_EXIT(ret, "frsh_contract_negotiate");
+               if (ret) PERROR_AND_EXIT(ret, "frsh_contract_negotiate");
                if (ret) printf(" \n frsh_contract_negotiate - NOT ACCEPTED \n");
        }
        printf("Contracts negotiated\n");