use wsenum_enumerate_and_pull

set correct http codes in tests

6 files changed, 36 insertions, 51 deletions

diff --git a/examples/win32_service.c b/examples/win32_service.c
index a972feb..14d2932 100644
--- a/examples/win32_service.c
+++ b/examples/win32_service.c
@@ -153,6 +153,27 @@ static void print_info(CIM_Servie *service) {
         printf("\tDescription: %s\n\n", service->Description );
 }
 
+static int list_services(WsManClient *cl, WsXmlDocH doc, void *data)
+{
+
+  if (doc) {
+    WsXmlNodeH node = ws_xml_get_soap_body(doc);
+    node = ws_xml_get_child(node, 0,  XML_NS_ENUMERATION, WSENUM_PULL_RESP);
+    node = ws_xml_get_child(node, 0,  XML_NS_ENUMERATION, WSENUM_ITEMS);
+    if (ws_xml_get_child(node, 0, RESOURCE_URI , CLASSNAME )) {
+      CIM_Servie *service = ws_deserialize(wsman_client_get_context(cl),
+                                           node,
+                                           CIM_Servie_TypeInfo, CLASSNAME,
+                                           RESOURCE_URI, RESOURCE_URI,
+                                           0, 0);
+      print_info(service);
+    }
+    
+  }
+}
+
+
+
 int main(int argc, char** argv)
 {
 	
@@ -216,44 +237,8 @@ int main(int argc, char** argv)
     initialize_action_options(&options);
 
     if (listall) {
-        char *enumContext;
-        WsXmlDocH enum_response;
-
-        enum_response = wsenum_enumerate(cl, RESOURCE_URI, options);
-        if (enum_response) {
-            if (!wsman_get_client_response_code(cl) == 200 ||
-                    !wsman_get_client_response_code(cl) == 500) {
-                return (1);
-            }
-            enumContext = wsenum_get_enum_context(enum_response);
-            ws_xml_destroy_doc(enum_response);
-        } else {
-            return(1);
-        }
-
-        while (enumContext !=NULL) {
-            doc = wsenum_pull(cl, RESOURCE_URI, enumContext, options);
+      wsenum_enumerate_and_pull(cl, RESOURCE_URI, options, list_services, NULL );
 
-            if (wsman_get_client_response_code(cl) != 200 &&
-                    wsman_get_client_response_code(cl) != 500) {
-                return (1);
-            }
-            enumContext = wsenum_get_enum_context(doc);
-            if (doc) {
-                WsXmlNodeH node = ws_xml_get_soap_body(doc);
-                node = ws_xml_get_child(node, 0,  XML_NS_ENUMERATION, WSENUM_PULL_RESP);
-                node = ws_xml_get_child(node, 0,  XML_NS_ENUMERATION, WSENUM_ITEMS);
-                if (ws_xml_get_child(node, 0, RESOURCE_URI , CLASSNAME )) {
-                    CIM_Servie *service = ws_deserialize(wsman_client_get_context(cl),
-                            node,
-                            CIM_Servie_TypeInfo, CLASSNAME,
-                            RESOURCE_URI, RESOURCE_URI,
-                            0, 0);
-                    print_info(service);
-                }
-                ws_xml_destroy_doc(doc);
-            }
-        }
     } else if (start && argv[1]) {
         //wsman_set_action_option(&options,FLAG_DUMP_REQUEST );
         wsman_add_selectors_from_query_string(&options, u_strdup_printf("Name=%s", argv[1]));
diff --git a/tests/cunit/enumeration.c b/tests/cunit/enumeration.c
index bf94faf..9ae158d 100644
--- a/tests/cunit/enumeration.c
+++ b/tests/cunit/enumeration.c
@@ -105,7 +105,7 @@ static TestData tests[] = {
     NULL,
     NULL,
     NULL,
-    500,
+    400,
     FLAG_NONE,
     0,
     filters1,
diff --git a/tests/cunit/invoke.c b/tests/cunit/invoke.c
index 3eebb02..6732c44 100755
--- a/tests/cunit/invoke.c
+++ b/tests/cunit/invoke.c
@@ -56,7 +56,7 @@ TestData invoke_tests[] = {
     "wsman:InvalidSelectors",	    
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InsufficientSelectors",
-    500, 
+    400, 
     0,
     0
   },
@@ -71,7 +71,7 @@ TestData invoke_tests[] = {
     "wsa:DestinationUnreachable",  
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidResourceURI",
-    500, 
+    400, 
     0,
     0
   },
diff --git a/tests/cunit/pull.c b/tests/cunit/pull.c
index de329d5..98e242e 100644
--- a/tests/cunit/pull.c
+++ b/tests/cunit/pull.c
@@ -68,7 +68,7 @@ static TestData pull_tests[] = {
     "wsa:DestinationUnreachable",
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidResourceURI",
-    500,
+    400,
     FLAG_NONE,
     0
   },
diff --git a/tests/cunit/transfer_get.c b/tests/cunit/transfer_get.c
index 8c1108f..b911149 100644
--- a/tests/cunit/transfer_get.c
+++ b/tests/cunit/transfer_get.c
@@ -56,7 +56,7 @@ TestData get_tests[] = {
     "wsman:InvalidSelectors",	    
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InsufficientSelectors",
-    500, 
+    400, 
     0,
     0
   },
@@ -71,7 +71,7 @@ TestData get_tests[] = {
     "wsa:DestinationUnreachable",  
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidResourceURI",
-    500, 
+    400, 
     0,
     0
   },
@@ -86,7 +86,7 @@ TestData get_tests[] = {
     "wsman:InvalidSelectors",
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InsufficientSelectors",
-    500,
+    400,
     0,
     0
   },
@@ -101,7 +101,7 @@ TestData get_tests[] = {
     "wsman:InvalidSelectors",
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/UnexpectedSelectors",
-    500,
+    400,
     0,
     0
   },
@@ -116,7 +116,7 @@ TestData get_tests[] = {
     "wsa:DestinationUnreachable",
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidResourceURI",
-    500,
+    400,
     0,
     0
   },
diff --git a/tests/cunit/transfer_put.c b/tests/cunit/transfer_put.c
index 5de3b99..193621b 100755
--- a/tests/cunit/transfer_put.c
+++ b/tests/cunit/transfer_put.c
@@ -56,7 +56,7 @@ TestData put_tests[] = {
     "wsman:InvalidSelectors",
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InsufficientSelectors",
-    500, 
+    400, 
     0,
     0
   },
@@ -71,7 +71,7 @@ TestData put_tests[] = {
     "wsa:DestinationUnreachable",  
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidResourceURI",
-    500, 
+    400, 
     0,
     0
   },
@@ -86,7 +86,7 @@ TestData put_tests[] = {
     "wsman:InvalidSelectors",
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InsufficientSelectors",
-    500,
+    400,
     0,
     0
   },
@@ -101,7 +101,7 @@ TestData put_tests[] = {
     "wsman:InvalidSelectors",
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/UnexpectedSelectors",
-    500,
+    400,
     0,
     0
   },
@@ -116,7 +116,7 @@ TestData put_tests[] = {
     "wsa:DestinationUnreachable",
     "/s:Envelope/s:Body/s:Fault/s:Detail/wsman:FaultDetail",
     "http://schemas.dmtf.org/wbem/wsman/1/wsman/faultDetail/InvalidResourceURI",
-    500,
+    400,
     0,
     0
   },