[svn-r9696] Purpose: Clean up tests

Description:
    Replaced cout's with cerr's.
    Replaced macro VERIFY with template function verify_val to
        verify read data/info.
    Cleanup various places in the tests to make them more consistent.

Platforms tested:
    SunOS 5.7 (arabica)
    Linux 2.4 (eirene)

1 files changed, 21 insertions, 0 deletions

diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index b3d7a1b..d67c459 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -25,8 +25,29 @@
 
 #ifndef H5_NO_STD
 int test_report (int, const std::string&);
+using std::cerr;
+using std::endl;
 #else
 int test_report (int, const string&);
 #endif
 
+void issue_fail_msg(const char* where, int line, const char* file_name);
+
+template <class Type1, class Type2>
+    void verify_val(Type1 x, Type2 value, const char* where, int line, const char* file_name)
+{
+    if (GetTestVerbosity()>=VERBO_HI)
+    {
+        cerr << "   Call to routine: " << where << " at line " << line
+	     << " in " << file_name <<  " had value " << x << endl;
+    }
+    if (x != value)
+    {
+        cerr << "*** UNEXPECTED VALUE from " << where << " should be "
+	     << value << ", but is " << x << " at line " << line
+	     << " in " << file_name << endl;
+        H5Eprint (stdout);
+    }
+}
+
 #endif