Added the simple test suite suggested in AXIS2C-1412

git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@961590 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 66 insertions, 93 deletions

diff --git a/util/test/duration/Makefile.am b/util/test/duration/Makefile.am
index cab6dcd..fd24b2f 100644
--- a/util/test/duration/Makefile.am
+++ b/util/test/duration/Makefile.am
@@ -7,7 +7,9 @@ duration_test_LDADD   =   \
                     $(top_builddir)/src/libaxutil.la 
 
 INCLUDES = -I$(top_builddir)/include \
+			-I$(CUTEST_HOME)/include \
 			-I ../../../axiom/include \
-			-I ../../../include
+			-I ../../../include \
+		 	-I ../../../cutest/include
 
 
diff --git a/util/test/duration/duration_test.c b/util/test/duration/duration_test.c
index c3fafe3..5de2974 100644
--- a/util/test/duration/duration_test.c
+++ b/util/test/duration/duration_test.c
@@ -1,10 +1,11 @@
 #include <axutil_duration.h>
+#include <cut_defs.h>
 #include "../util/create_env.h"
 
 /** @brief test duration
  *  create duration from values and retrieve values
  */
-axis2_status_t test_duration(axutil_env_t *env)
+void test_duration(axutil_env_t *env)
 { 
     axis2_status_t status = AXIS2_FAILURE;
     axis2_char_t * duration_str = "P3Y12M23DT11H45M45.000000S";
@@ -17,13 +18,18 @@ axis2_status_t test_duration(axutil_env_t *env)
     axutil_duration_t * duration_three;
     axutil_duration_t * duration_four;
     axis2_bool_t is_negative = AXIS2_FALSE;
-    axis2_char_t * neg_str = "";
+    axis2_char_t *serialize, *serialize1;
 
     duration = axutil_duration_create_from_values(env,AXIS2_TRUE,3,12,23,11,45,45.00);
+	CUT_ASSERT(duration != NULL);
     duration_one = axutil_duration_create_from_values(env,AXIS2_FALSE,7,11,2,23,11,50.00);
+	CUT_ASSERT(duration_one != NULL);
     duration_two = axutil_duration_create_from_string(env,duration_str);
+	CUT_ASSERT(duration_two != NULL);
     duration_three = axutil_duration_create(env);
+	CUT_ASSERT(duration_three != NULL);
     duration_four  = axutil_duration_create(env);
+	CUT_ASSERT(duration_four != NULL);
 
     year = axutil_duration_get_years(duration,env);
     month = axutil_duration_get_months(duration,env);
@@ -34,43 +40,38 @@ axis2_status_t test_duration(axutil_env_t *env)
     is_negative = axutil_duration_get_is_negative(duration,env);
 
     status = axutil_duration_deserialize_duration(duration_three,env,duration_str);
-    if (status == AXIS2_SUCCESS)
-        printf("The test 1 is successful\n");
-    else
-        printf("The test 1 failed\n");
+    CUT_ASSERT(status == AXIS2_SUCCESS);
     status = axutil_duration_deserialize_duration(duration_four,env,duration_str1);
-    if (status == AXIS2_SUCCESS)
-        printf("The test 2 is successful\n");
-    else
-        printf("The test 2 failed\n");
-    printf("Duration for test 3: %s\n", axutil_duration_serialize_duration(duration,env));
-    printf("The test 3 is completed\n");
+    CUT_ASSERT(status == AXIS2_SUCCESS);
+    serialize = axutil_duration_serialize_duration(duration_three,env);
+    CUT_ASSERT(serialize != NULL);
+	CUT_ASSERT(strcmp(duration_str, serialize) == 0);
+    serialize1 = axutil_duration_serialize_duration(duration_four,env);
+    CUT_ASSERT(serialize1 != NULL);
+	CUT_ASSERT(strcmp(duration_str1, serialize1) == 0);
     status  = axutil_duration_set_duration(duration,env,AXIS2_TRUE,3,12,23,11,45,56.00);
-    if (status == AXIS2_SUCCESS)
-    {
-        printf("The test 4 is successful\n");
-    }
-    else
-    {
-        printf("The test 4 failed\n");
-    }
+    CUT_ASSERT(status == AXIS2_SUCCESS);
+        
+    /* 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);
+
     axutil_duration_free(duration,env);
     axutil_duration_free(duration_one,env);
     axutil_duration_free(duration_two,env);
     axutil_duration_free(duration_three,env);
     axutil_duration_free(duration_four,env);
-    if (is_negative)
-        neg_str = "(-) ";
-    printf("Duration for test 5: %s%d-%d-%d %d:%d:%.0f\n",neg_str,year,month,day,hour,minute,second);
-    printf("The test 5 is completed\n");
-    return AXIS2_SUCCESS;
 }
 
 /** @brief set values
  *  set values for the duration and get the values 
  */
-axis2_status_t set_values(axutil_env_t *env)
+void set_values(axutil_env_t *env)
 {
+    axis2_status_t status;
     axutil_duration_t * duration;
     axutil_duration_t * duration_one;
     int get_year,get_month,get_day,get_hour,get_minute;
@@ -78,95 +79,65 @@ axis2_status_t set_values(axutil_env_t *env)
     double get_second;
 
     duration  = axutil_duration_create(env);
+	CUT_ASSERT(duration != NULL);
+	if ( duration == NULL ) return;
     duration_one = axutil_duration_create_from_values(env,AXIS2_TRUE,5,9,29,59,21,49);
+	CUT_ASSERT(duration_one != NULL);
 
-    if (axutil_duration_set_is_negative(duration,env,AXIS2_TRUE) != AXIS2_SUCCESS)
+    status = axutil_duration_set_is_negative(duration,env,AXIS2_TRUE);
+	CUT_ASSERT(status == AXIS2_SUCCESS);
+    if (status != AXIS2_SUCCESS)
     {
         axutil_duration_free(duration,env);
         axutil_duration_free(duration_one,env);
-        return AXIS2_FAILURE;
+        return;
     }
     is_negative = axutil_duration_get_is_negative(duration,env);
+	CUT_ASSERT(is_negative == AXIS2_TRUE);
     if (!is_negative)
     {
         axutil_duration_free(duration,env);
         axutil_duration_free(duration_one,env);
-        return AXIS2_FAILURE;
+        return;
     }
 
-    if (axutil_duration_set_years(duration,env,5) != AXIS2_SUCCESS)
-    {
-        axutil_duration_free(duration,env);
-        axutil_duration_free(duration_one,env);
-        return AXIS2_FAILURE;
-    }
+    status = axutil_duration_set_years(duration,env,5);
+    CUT_ASSERT(status == AXIS2_SUCCESS);
     get_year = axutil_duration_get_years(duration,env);
-    if (axutil_duration_set_months(duration,env,9) != AXIS2_SUCCESS)
-    {
-        axutil_duration_free(duration,env);
-        axutil_duration_free(duration_one,env);
-        return AXIS2_FAILURE;
-    }
+	CUT_ASSERT(get_year == 5);
+    status = axutil_duration_set_months(duration,env,9);
+    CUT_ASSERT(status == AXIS2_SUCCESS);
     get_month = axutil_duration_get_months(duration,env);
-    if (axutil_duration_set_days(duration,env,29) != AXIS2_SUCCESS)
-    {
-        axutil_duration_free(duration,env);
-        axutil_duration_free(duration_one,env);
-        return AXIS2_FAILURE;
-    }
+	CUT_ASSERT(get_month == 9);
+    status = axutil_duration_set_days(duration,env,29);
+    CUT_ASSERT(status == AXIS2_SUCCESS);
     get_day = axutil_duration_get_days(duration,env);
-    if (axutil_duration_set_hours(duration,env,59) != AXIS2_SUCCESS)
-    {
-        axutil_duration_free(duration,env);
-        axutil_duration_free(duration_one,env);
-        return AXIS2_FAILURE;
-    }
+	CUT_ASSERT(get_day == 29);
+    status = axutil_duration_set_hours(duration,env,59);
+    CUT_ASSERT(status == AXIS2_SUCCESS);
     get_hour = axutil_duration_get_hours(duration,env);
-    if (axutil_duration_set_mins(duration,env,21) !=  AXIS2_SUCCESS)
-    {
-        axutil_duration_free(duration,env);
-        axutil_duration_free(duration_one,env);
-        return AXIS2_FAILURE;
-    }
+ 	CUT_ASSERT(get_hour == 59);
+    status = axutil_duration_set_mins(duration,env,21);
+    CUT_ASSERT(status == AXIS2_SUCCESS);
     get_minute = axutil_duration_get_mins(duration,env);
-    if (axutil_duration_set_seconds(duration,env,49) != AXIS2_SUCCESS)
-    {
-        axutil_duration_free(duration,env);
-        axutil_duration_free(duration_one,env);
-        return AXIS2_FAILURE;
-    }
+  	CUT_ASSERT(get_minute == 21);
+    status = axutil_duration_set_seconds(duration,env,49);
+    CUT_ASSERT(status == AXIS2_SUCCESS);
     get_second = axutil_duration_get_seconds(duration,env);
-    printf("Duration for test 6: %d-%d-%d %d:%d:%.0f\n",get_year,get_month,get_day,get_hour,get_minute,get_second);
-    printf("The test 6 is completed\n");
-    if (!axutil_duration_compare(duration_one,duration,env))
-    {
-        printf("The test 7 failed\n");
-        axutil_duration_free(duration,env);
-        axutil_duration_free(duration_one,env);
-        return AXIS2_FAILURE;
-    }
-    printf("The test 7 is successful\n");
+  	CUT_ASSERT(get_second == 49);
+    CUT_ASSERT(axutil_duration_compare(duration_one,duration,env));
     axutil_duration_free(duration,env);
     axutil_duration_free(duration_one,env);
-    return AXIS2_SUCCESS;
 }
 int main()
 {
-    int status = AXIS2_SUCCESS;
-
-    axutil_env_t *env = NULL;
-    env = create_environment();
-
-    status = test_duration(env);
-    if(status == AXIS2_FAILURE)
-    {
-        printf("The test test_duration failed\n");
-    }
-    status = set_values(env);
-    if(status == AXIS2_FAILURE)
-    {
-        printf("The test set_values failed\n");
-    }
-    axutil_env_free(env);
+    axutil_env_t *env = cut_setup_env("Duration");
+    CUT_ASSERT(env != NULL);
+	if (env) {
+       test_duration(env);
+       set_values(env);
+       axutil_env_free(env);
+	}
+    CUT_RETURN_ON_FAILURE(-1);
     return 0;
 }