Changeset 125 for trunk/test

Timestamp:

Nov 4, 2005 3:19:11 PM (18 years ago)

Author:

dkearney

Message:

1) removed "as" string from c++'s element() function because
the function does not have the capacity to return anything
other than RpLibrary? Instances
2) changed get() functions in library module to return strings.
this change was propagated to matlab, octave, c, fortran, c++
bindings.
3) fixed rpFreeLibrary inside of c interface, now function accepts
a pointer to a pointer to RpLibrary? (lib) and sets *lib equal to
null
4) added doxygen target to makefile. (make docs), to get graphics
you need the program named dot (debian: apt-get install graphviz)
otherwise you will get errors for the portion of the proceedure
where it is trying to create the graphics.

Location:

trunk/test/src

Files:

• RpLibraryF_test.f (modified) (4 diffs)
• RpLibrary_test.cc (modified) (4 diffs)

trunk/test/src/RpLibraryF_test.f

@@ -32 +32 @@
       END SUBROUTINE  test_element
 
+      SUBROUTINE  test_get(lib,path)
+        integer lib
+        character*100 path, retText
+
+        print *,"TESTING GET       : path = ",path
+
+        call rp_lib_get(lib, path, retText)
+
+        print *,"retText = ",retText
+      END SUBROUTINE  test_get
+
       SUBROUTINE  test_get_str(lib,path)
         integer lib
         character*100 path, retText
 
-        print *,"TESTING GET: path = ",path
+        print *,"TESTING GET STRING: path = ",path
 
-        call rp_lib_get(lib, path, retText)
+        call rp_lib_get_str(lib, path, retText)
 
         print *,"retText = ",retText
@@ -46 +57 @@
         integer lib
         double precision rslt, rp_lib_get_double
-        character*100 path, retText
+        character*100 path
 
-        print *,"TESTING GET: path = ",path
+        print *,"TESTING GET DOUBLE: path = ",path
 
         rslt = rp_lib_get_double(lib, path)
@@ -58 +69 @@
         IMPLICIT NONE
 
-        integer rp_lib, rp_units_convert_dbl, rp_units_add_presets
-        integer rp_lib_element_obj
+        integer rp_lib
 
-        integer driver, ok
-        double precision T, Ef, kT, Emin, Emax, dE, f, E
-        CHARACTER*100 inFile, strVal, path
-        character*40 xy
+        integer driver
+        CHARACTER*100 inFile, path
 
         call getarg(1,inFile)
@@ -70 +78 @@
         ! print *,"dict key = ",driver
 
-        ok = rp_units_add_presets("all")
-
         ! TESTING ELEMENT
-        !call test_element(driver, "input.number(min)")
         path = "input.number(min)"
         call test_element(driver, path)
-        !call rp_lib_get(driver, path, strVal)
-        !print *,"strVal = ",strVal
+
+        ! TESTING GET
+        path = "input.number(min).current"
+        call test_get(driver, path)
 
         ! TESTING GET STRING

trunk/test/src/RpLibrary_test.cc

@@ -16 +16 @@
 int test_element (RpLibrary* lib, std::string path );
 int test_get (RpLibrary* lib, std::string path );
+int test_getString (RpLibrary* lib, std::string path );
+int test_getDouble (RpLibrary* lib, std::string path );
 
 int test_element (RpLibrary* lib, std::string path )
@@ -32 +34 @@
         std::cout << "searchEle   id = :" << searchEle->nodeId()   << ":" << std::endl;
         std::cout << "searchEle type = :" << searchEle->nodeType() << ":" << std::endl;
+        retVal = 0;
+    }
+
+    return retVal;
+}
+
+int test_get (RpLibrary* lib, std::string path )
+{
+    int retVal = 1;
+    std::string searchVal = lib->get(path);
+
+    std::cout << "TESTING GET       : path = " << path << std::endl;
+
+    if (searchVal.empty()) {
+        std::cout << "searchVal is EMPTY STRING" << std::endl;
+        retVal = 1;
+    }
+    else {
+        std::cout << "searchVal = :" << searchVal << ":" << std::endl;
         retVal = 0;
     }
@@ -135 +156 @@
     RpLibrary lib2;
 
-    if (argc < 3)
+    if (argc < 2)
     {
-        printf("usage: RpLibrary_test infile.xml outfile.xml\n");
+        printf("usage: RpLibrary_test infile.xml\n");
         return EXIT_FAILURE;
     }
@@ -152 +173 @@
     test_getString(lib, "output.curve.about.label");
 
+    lib->put("input.number(test_one).default", "3000");
+    test_get(lib, "input.number(test_one).default");
     lib->put("input.number(test).default", "1000");
     test_getString(lib, "input.number(test).default");