[svn-r7012] Purpose:

    Text cleanup

Description:
    Re-worded some informative and error messages.
    Remove/Updated outdated comments.

Platforms:
    Linux 2.4 (eirene)
    IRIX 6.5.11 (modi4)

1 files changed, 5 insertions, 18 deletions

diff --git a/c++/test/testhdf5.cpp b/c++/test/testhdf5.cpp
index 630a0e4..fbe28a0 100644
--- a/c++/test/testhdf5.cpp
+++ b/c++/test/testhdf5.cpp
@@ -66,6 +66,8 @@ int             Verbosity;
 using namespace H5;
 #endif  /* !H5_NO_NAMESPACE */
 
+#include "h5cpputil.h"
+
 struct TestStruct {
     int    NumErrors;
     char   Description[64];
@@ -142,11 +144,6 @@ print_func(const char *format,...)
     return ret_value;
 }
 
-void
-test_tbbt(void)
-{
-}
-
 int 
 main(int argc, char *argv[])
 {
@@ -173,14 +170,9 @@ main(int argc, char *argv[])
      */
     Exception::dontPrint();
 
-    // Tests are generally arranged from least to most complexity... 
-    //InitTest("metadata", test_metadata, cleanup_metadata, "Encode/decode metadata code");
-
-    // C++ API doesn't need this test */
-    InitTest("tbbt", test_tbbt, NULL,  "Threaded, Balanced, Binary Trees - not tested");
-
     // testing file creation and opening in tfile.cpp
-    InitTest("file", test_file, cleanup_file, "Low-Level File I/O");
+    InitTest("file", test_file, cleanup_file, "File I/O Operations");
+    // testing dataspace functionalities in th5s.cpp
     InitTest("h5s",  test_h5s,  cleanup_h5s,  "Dataspaces");
 
     /* Comment out tests that are not done yet. - BMR, Feb 2001
@@ -300,12 +292,7 @@ Comment out tests that are not done yet */
     }
 
     MESSAGE(2, ("\n\n"))
-
-    if (num_errs)
-        print_func("!!! %d Error(s) were detected !!!\n\n", (int) num_errs);
-    else
-        print_func("All tests were successful. \n\n");
-
+    test_report(num_errs, string(" HDF5 Base"));
     if (Summary) {
         print_func("Summary of Test Results:\n");
         print_func("Name of Test     Errors Description of Test\n");