Changeset 200 for trunk/test/src/RpLibrary_test.cc

Timestamp:

Feb 20, 2006 2:37:44 PM (18 years ago)

Author:

dkearney

Message:

adjusted copy and remove functions in core library.
added a bit of error checking in other core functions.
updated test file accordingly.

File:

• trunk/test/src/RpLibrary_test.cc (modified) (4 diffs)

trunk/test/src/RpLibrary_test.cc

@@ -23 +23 @@
 int test_copy (RpLibrary* fromLib, std::string fromPath,
                RpLibrary* toLib, std::string toPath);
+int test_remove (RpLibrary* lib, std::string path);
 
 int test_element (RpLibrary* lib, std::string path )
@@ -172 +173 @@
     return retVal;
 }
+
+int test_remove (RpLibrary* lib, std::string path)
+{
+    RpLibrary* getRslt = NULL;
+    int retVal = 1;
+    std::cout << "TESTING REMOVE:" << std::endl;
+    // std::cout << "lib's xml:" << std::endl << lib->xml() << std::endl;
+    if (lib) {
+        lib->remove(path);
+        if (lib) {
+            getRslt = lib->element(path);
+            if (getRslt) {
+                std::cout << "FAILURE: " << path << " not removed" << std::endl;
+                std::cout << "lib's xml:" << std::endl << lib->xml() << std::endl;
+            }
+            else {
+                std::cout << "SUCCESS: " << path << " removed" << std::endl;
+                retVal = 0;
+            }
+        }
+    }
+
+    return retVal;
+}
+
 
 /*
@@ -231 +257 @@
     }
 
+    if (!childEle) {
+        std::cout << "No more children" << std::endl;
+    }
+
     return retVal;
 }
@@ -276 +306 @@
     test_children(lib,"input","number");
 
+    std::cout << lib->xml() << std::endl;
+
+    RpLibrary* remEle = lib->element("input.test.(min)");
+    test_remove(remEle,"");
+    remEle->remove();
+    test_remove(lib, "input.test.(min)");
+    test_remove(lib, "input.test.(max)");
     std::cout << lib->xml() << std::endl;