moved examples to where they belong

removed some invalid tests
improved a couple of tests

2 files changed, 11 insertions, 66 deletions

diff --git a/tests/cunit/enumeration.c b/tests/cunit/enumeration.c
index 6b9455e..9126b7e 100644
--- a/tests/cunit/enumeration.c
+++ b/tests/cunit/enumeration.c
@@ -266,9 +266,8 @@ static void enumeration_test() {
         goto RETURN;
     }
     check_response_header(enum_response, wsman_get_client_response_code(cl),
-       "http://schemas.xmlsoap.org/ws/2004/09/enumeration/EnumerateResponse");
+       ENUM_ACTION_ENUMERATERESPONSE);
 
-http://schemas.xmlsoap.org/ws/2004/08/addressing/fault
     if (_debug) wsman_output(enum_response);
 
     if (tests[i].filters == NULL) {
diff --git a/tests/cunit/pull.c b/tests/cunit/pull.c
index 282677d..bcef3bb 100644
--- a/tests/cunit/pull.c
+++ b/tests/cunit/pull.c
@@ -49,6 +49,11 @@
 #include "common.h"
 
 
+static char *filters2[] = {
+   "/s:Envelope/s:Body/wsen:PullResponse/wsman:Items/wsa:EndpointReference/wsa:Address",
+    NULL,
+    NULL, NULL,
+};
 
 
 
@@ -80,7 +85,7 @@ static TestData pull_tests[] = {
     NULL, 
     200,
     FLAG_ENUMERATION_OPTIMIZATION,
-    200
+    0
   },
   {
     "Pull. Enumeration (Optimized/EPR/Count)", 
@@ -95,7 +100,7 @@ static TestData pull_tests[] = {
     200,
     FLAG_ENUMERATION_OPTIMIZATION | FLAG_ENUMERATION_ENUM_EPR |
                                          FLAG_ENUMERATION_COUNT_ESTIMATION ,
-    200
+    10
   },
   {
     "Pull. Enumeration (Optimized/EPR)", 
@@ -109,7 +114,7 @@ static TestData pull_tests[] = {
     NULL, 
     200,
     FLAG_ENUMERATION_OPTIMIZATION | FLAG_ENUMERATION_ENUM_EPR,
-    200
+    10
   },
   {
     "Pull. Enumeration (Optimized/ObjEPR)", 
@@ -123,7 +128,7 @@ static TestData pull_tests[] = {
     NULL, 
     200,
     FLAG_ENUMERATION_OPTIMIZATION | FLAG_ENUMERATION_ENUM_OBJ_AND_EPR,
-    200
+    10
   },
   {
     "Pull. Enumeration with valid Resource URI and Items Count Estimation.",
@@ -138,66 +143,7 @@ static TestData pull_tests[] = {
     200,
     FLAG_ENUMERATION_COUNT_ESTIMATION,
     0
-  }, /*
-     {
-     "Enumeration with valid Resource URI.",
-     "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem",
-     NULL, 
-     200,
-     FLAG_NONE,
-     0
-     },
-     {
-     "Enumeration with valid Resource URI and additional invalid selectors.",
-     "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem",
-     NULL, 
-     200,
-     FLAG_NONE,
-     1
-     },	
-     {
-     "Enumeration with valid Resource URI/Count Estimation.",
-     "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem",
-     NULL, 
-     200,
-     FLAG_ENUMERATION_COUNT_ESTIMATION,
-     0
-     },
-     {
-     "Enumeration with valid Resource URI/Optimization.",
-     "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem",
-     NULL, 
-     200,
-     FLAG_ENUMERATION_OPTIMIZATION,
-     0
-     },	
-     {
-     "Enumeration with Count Estimation/Optimzation and get all elements.",
-     "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem",
-     NULL, 
-     200,
-     FLAG_ENUMERATION_OPTIMIZATION | FLAG_ENUMERATION_COUNT_ESTIMATION,
-     10
-
-     },
-     {
-     "Enumeration with Count Estimation/Optimzation/Epr and get all elements.",
-     "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem",
-     NULL, 
-     200,
-     FLAG_ENUMERATION_OPTIMIZATION | FLAG_ENUMERATION_COUNT_ESTIMATION | FLAG_ENUMERATION_ENUM_EPR,
-     10
-
-     },	
-     {
-     "Enumeration with Count Estimation/Optimzation/ObjAndEpr and get all elements.",
-     "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem",
-     NULL, 
-     200,
-     FLAG_ENUMERATION_OPTIMIZATION | FLAG_ENUMERATION_COUNT_ESTIMATION | FLAG_ENUMERATION_ENUM_OBJ_AND_EPR,
-     10
-
-     }	*/
+  }
 };