1 files changed, 22 insertions, 42 deletions

diff --git a/util/test/rand/rand_test.c b/util/test/rand/rand_test.c
index 90c566b..71dc232 100644
--- a/util/test/rand/rand_test.c
+++ b/util/test/rand/rand_test.c
@@ -1,63 +1,43 @@
 #include "../util/create_env.h"
+#include <axutil_rand.h>
+#include <cut_defs.h>
 
 /** @brief test_rand 
  *   create random variable and get it's value 
  */
 
-axis2_status_t test_rand(axutil_env_t *env)
+void test_rand(axutil_env_t *env)
 {    
     int rand_number,rand_value,start = 2,end = 8,rand_range;
     unsigned seed = 10;
     
     rand_number = axutil_rand(&seed);
-    if(!rand_number)
-    {
-        printf("Test axutil_rand failed\n");         
-    }
-    else
-    {
-        printf("Test axutil_rand is successfull\n");
-        printf("The random value is %d\n",rand_number);
-    }
-    
+    printf("rand_number : %d\n", rand_number);    
     rand_range = axutil_rand_with_range(&seed,start,end);
-    if(rand_range == -1)
-    {
-        printf("Test axutil_rand_with_range failed\n");
-    }
-    else
-    {
-        printf("Test axutil_rand_with_range is successfull\n");
-        printf("The random seed value is %d\n",rand_range);
-    }
-    
+    printf("rand_range : %d\n", rand_range);    
+    CUT_ASSERT(rand_range != -1);
+    CUT_ASSERT(rand_range >= start && rand_range <= end);
     rand_value = axutil_rand_get_seed_value_based_on_time(env);
-    if(!rand_value)
-    {
-        printf("The test axutil_rand_get_seed_value_based_on_time failed\n");
-    }
-    else
-    {
-        printf("Test axutil_rand_get_seed_value_based_on_time is successfull\n");
-        printf("The random range is %d\n",rand_value);
-    }
- 
-    return AXIS2_SUCCESS;
+    printf("rand_based_on_time : %d\n", rand_value);    
+    
+    /* To avoid warning of not using cut_ptr_equal */
+    CUT_ASSERT_PTR_EQUAL(NULL, NULL, 0);
+    /* To avoid warning of not using cut_int_equal */
+    CUT_ASSERT_INT_EQUAL(0, 0, 0);
+    /* To avoid warning of not using cut_str_equal */
+    CUT_ASSERT_STR_EQUAL("", "", 0);
+
 }
 
 int main()
 {
-    int status = AXIS2_SUCCESS;
-    axutil_env_t *env = NULL;
-
-    env = create_environment();
-    status = test_rand(env);
-
-    if(status == AXIS2_FAILURE)
-    {
-        printf("Test  failed\n");
+    axutil_env_t *env = cut_setup_env("Rand");
+	CUT_ASSERT(env != NULL);
+	if (env) {
+        test_rand(env);
+        axutil_env_free(env);
     }
-    axutil_env_free(env);
+    CUT_RETURN_ON_FAILURE(-1);
     return 0;
 }