X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestHash.cxx;h=e712e355b616065ed8bc5b19810511fbf542ed77;hb=61573d5dba81e5c8a7ce347adebbb941e6583d77;hp=230550ee1fd465d52afecab8565894bceda0b2d0;hpb=46c9c13ea7d5b2a2fec304f12b3db77c8028caea;p=gdcm.git

diff --git a/Testing/TestHash.cxx b/Testing/TestHash.cxx
index 230550ee..e712e355 100644
--- a/Testing/TestHash.cxx
+++ b/Testing/TestHash.cxx
@@ -1,38 +1,51 @@
+#include "gdcmCommon.h" //to shut up warnings
+// Checks the basic functionalities of STL <map>.
 #include <map>
 #include <string>
 #include <iostream>
-#include <stdio.h>
-
-int hashtest( int, char * [] ) {
-
-  typedef std::map<std::string, char*> dict;
-  
-  dict tb1;
-  dict::iterator im = tb1.find("00380010");
-  tb1["00100010"] = "Patient Name";
-  tb1["7fe00010"] = "Pixel Data";
-  tb1["50000010"] = "Number of points";
-  tb1["00380010"] = "Admission ID";
-
-	std::cout << "Traversal of dictionary (note the proper ordering on key)." << std::endl;
-	for ( im = tb1.begin(); im != tb1.end(); ++im )
-		std::cout << "   \"" << im->first << "\" = " << im->second << std::endl;
- 	std::cout << "End of dictionary." << std::endl;
-
- 	std::cout << "Find request on key 00380010" << std::endl;
-	im = tb1.find("00380010");
-	std::cout << "   \"" << im->first << "\" = " << im->second << std::endl;
-	
-	int i = 0x0010;
-	std::cout.setf(std::ios::hex);
-	std::cout << i << std::endl;
-	std::cout.setf(std::ios::dec);
-	std::cout << i << std::endl;	
-	
-	// Voir :
-	//http://www.developer.com/net/cplus/article.php/10919_2119781_3
-	//
-	// dommage que ca ne marche pas ...
-
-  return 0;
+
+int TestHash( int, char * [] )
+{
+   std::cout << "Test::TestHash : " << std::endl;
+   std::cout << "   Checks that the basic STL <map> functionalities required "
+             << std::endl
+             << "   by gdcm are operational. " << std::endl;
+
+   typedef std::map<std::string, char*> dict;
+   dict tb1;
+
+   // Adding entries by key:
+
+   dict::iterator im = tb1.find("00380010");
+   tb1["00100010"] = "Patient Name";
+   tb1["7fe00010"] = "Pixel Data";
+   tb1["50000010"] = "Number of points";
+   tb1["00380010"] = "Admission ID";
+
+   // Travesing the dictionary:
+
+   std::cout << "   Traversal of dictionary (note the proper ordering on key):"
+             << std::endl;
+   for ( im = tb1.begin(); im != tb1.end(); ++im )
+      std::cout << "       \"" << im->first << "\" = " << im->second
+                << std::endl;
+   std::cout << "   End of dictionary." << std::endl;
+
+   // Find request.
+
+   std::cout << "   Find request on key 00380010" << std::endl;
+   im = tb1.find("00380010");
+   std::cout << "       \"" << im->first << "\" = " << im->second << std::endl;
+
+   // The following should print in hexadecimal an in decimal the given
+   // integer as stated by:
+   //   http://www.developer.com/net/cplus/article.php/10919_2119781_3
+   // Alas it doesn't work with g++ (at least)...
+   int i = 0x0010;
+   std::cout.setf(std::ios::hex);
+   std::cout << "Test::TestHash : hexdecimal output : " << i << std::endl;
+   std::cout.setf(std::ios::dec);
+   std::cout << "Test::TestHash : decimal output : "    << i << std::endl;
+
+   return 0;
 }