diff options
author | Vadim Revyakin <vadimr@intel.com> | 2006-11-23 14:50:46 +0000 |
---|---|---|
committer | Vadim Revyakin <vadimr@intel.com> | 2006-11-23 14:50:46 +0000 |
commit | 0a0e42dd552017b493d9516df0bdf35ecf694eb2 (patch) | |
tree | 63a76d1088cbf33f2aef39294abc917ce3e7a129 /tests | |
parent | 80b30de72d6ac3040cb5f1ba6094abd3f4d53965 (diff) | |
download | wsmancli-0a0e42dd552017b493d9516df0bdf35ecf694eb2.tar.gz wsmancli-0a0e42dd552017b493d9516df0bdf35ecf694eb2.tar.xz wsmancli-0a0e42dd552017b493d9516df0bdf35ecf694eb2.zip |
test improvement
Diffstat (limited to 'tests')
-rw-r--r-- | tests/cunit/common.c | 6 | ||||
-rw-r--r-- | tests/cunit/common.h | 1 | ||||
-rw-r--r-- | tests/cunit/run_tests.c | 10 | ||||
-rwxr-xr-x | tests/cunit/transfer_put.c | 56 |
4 files changed, 54 insertions, 19 deletions
diff --git a/tests/cunit/common.c b/tests/cunit/common.c index dbd07cd..7295fc6 100644 --- a/tests/cunit/common.c +++ b/tests/cunit/common.c @@ -19,16 +19,12 @@ WsManClient *cl; -char *host = "langley.home.planux.com"; - int init_test(void) { wsman_client_transport_init(NULL); - if (getenv("OPENWSMAN_TEST_HOST")) { - host = getenv("OPENWSMAN_TEST_HOST"); - } + ServerData sd[] = { {"localhost", 8889, "/wsman", "http", "wsman", "secret"} }; diff --git a/tests/cunit/common.h b/tests/cunit/common.h index 86b2ff5..beac564 100644 --- a/tests/cunit/common.h +++ b/tests/cunit/common.h @@ -44,6 +44,7 @@ typedef struct { } TestData; extern char *host; +extern int verbose; int init_test(void); int clean_test(void); diff --git a/tests/cunit/run_tests.c b/tests/cunit/run_tests.c index 5f51e9c..b581d78 100644 --- a/tests/cunit/run_tests.c +++ b/tests/cunit/run_tests.c @@ -37,6 +37,9 @@ #define TRUE 1 #define FALSE 0 +int verbose = 0; +char *host = "langley.home.planux.com"; + static CU_pSuite setup_client_suite(void) { @@ -68,6 +71,13 @@ int main(int argc, char** argv) { CU_pSuite pSuite = NULL; + if (getenv("OPENWSMAN_TEST_HOST")) { + host = getenv("OPENWSMAN_TEST_HOST"); + } + if (getenv("OPENWSMAN_TEST_VERBOSE")) { + verbose = atoi(getenv("OPENWSMAN_TEST_VERBOSE")); + } + /* initialize the CUnit test registry */ if (CUE_SUCCESS != CU_initialize_registry()) return CU_get_error(); diff --git a/tests/cunit/transfer_put.c b/tests/cunit/transfer_put.c index 9862e2f..46bfd6c 100755 --- a/tests/cunit/transfer_put.c +++ b/tests/cunit/transfer_put.c @@ -49,12 +49,12 @@ TestData put_tests[] = { { "Transfer Put without any selectors.", - "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem", + "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem", NULL, NULL, NULL, "/s:Envelope/s:Body/s:Fault/s:Code/s:Subcode/s:Value", - "wsman:InvalidSelectors", + "wsman:InvalidSelectors", "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail", "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InsufficientSelectors", 500, @@ -147,6 +147,19 @@ TestData put_tests[] = { 200, 0, }, + { + "Transfer Put with correct selectors and no parameters", + "http://schema.omc-project.org/wbem/wscim/1/cim-schema/2/OMC_TimeZoneSettingData", + NULL, + "InstanceID=omc:timezone", + NULL, + "/s:Envelope/s:Body/p:OMC_TimeZoneSettingData/p:TimeZone", + "US/Eastern", + NULL, + NULL, + 200, + 0, + }, }; static int ntests = sizeof (put_tests) / sizeof (put_tests[0]); @@ -161,30 +174,40 @@ static void transfer_put_test() { char *xpf = NULL; char *xpd = NULL; static int i = 0; // executed test number. - char *old_selectors = put_tests[i].selectors; + char *selectors = NULL; if (put_tests[i].selectors) { - put_tests[i].selectors = + selectors = u_strdup_printf(put_tests[i].selectors, host, host, host); } - reinit_client_connection(cl); initialize_action_options(&options); if (put_tests[i].selectors != NULL) { - wsman_add_selectors_from_query_string (&options, put_tests[i].selectors); + wsman_add_selectors_from_query_string (&options, selectors); } if (put_tests[i].properties != NULL) { - wsman_add_properties_from_query_string (&options, put_tests[i].properties); + wsman_add_properties_from_query_string (&options, + put_tests[i].properties); } options.flags = put_tests[i].flags; doc = ws_transfer_put(cl, (char *)put_tests[i].resource_uri, options); //ws_xml_dump_node_tree(stdout, ws_xml_get_doc_root(doc)); - CU_ASSERT_TRUE(wsman_get_client_response_code(cl) == put_tests[i].final_status); - + CU_ASSERT_TRUE(wsman_get_client_response_code(cl) == + put_tests[i].final_status); + if (wsman_get_client_response_code(cl) != + put_tests[i].final_status) { + if (verbose) { + printf("Expected = %ld, Returned = %ld\n", + put_tests[i].final_status, + wsman_get_client_response_code(cl)); + ws_xml_dump_node_tree(stdout, ws_xml_get_doc_root(doc)); + } + goto RETURN; + } CU_ASSERT_PTR_NOT_NULL(doc); if (!doc) { goto RETURN; @@ -204,8 +227,10 @@ static void transfer_put_test() { CU_ASSERT_STRING_EQUAL(xpf, put_tests[i].value1); if (strcmp(xpf, put_tests[i].value1)) { - //printf("Expected %s; returned %s\n", - // put_tests[i].value1, xpf); + if (verbose) { + printf("Expected %s; returned %s\n", + put_tests[i].value1, xpf); + } goto RETURN; } if (put_tests[i].expr2 == NULL) { @@ -222,7 +247,11 @@ static void transfer_put_test() { } CU_ASSERT_STRING_EQUAL(xpd, put_tests[i].value2 ); if (strcmp(xpd, put_tests[i].value2)) { - goto RETURN; + if (verbose) { + printf("Expected %s; returned %s\n", + put_tests[i].value2, xpd); + } + goto RETURN; } RETURN: u_free(xpf); @@ -230,8 +259,7 @@ RETURN: if (doc) { ws_xml_destroy_doc(doc); } - u_free((char *)put_tests[i].selectors); - put_tests[i].selectors = old_selectors; + u_free(selectors); destroy_action_options(&options); i++; // increase executed test number } |