*** empty log message ***

1 files changed, 30 insertions, 81 deletions

diff --git a/ace/UUIDTest.cpp b/ace/UUIDTest.cpp
index 94264cd04d5..816574f67e8 100755
--- a/ace/UUIDTest.cpp
+++ b/ace/UUIDTest.cpp
@@ -3,120 +3,69 @@
 // $Revision$ $Date$
 
 #include <string>
-//#include "JCAFCore/src/Common/Exception.h"
 #include "ace/UUID.h"
 
 class Tester
 {
 public:
-  Tester();
-  ~Tester();
-
   int init( int argc, char* argv[]);
-  void fini();
   int test();
-
-private:
-  int test1( void);
-  int test2( void);
-  int test3( void);
-  int test4( void);
-  void test5( void*& d);
 };
 
-Tester::Tester()
-{
-}
-
-Tester::~Tester()
-{
-}
 
 int Tester::init( int, char*[])
 {
+  ACE_UUID_GENERATOR::instance ()->init ();
   return 0;
 }
 
-void Tester::fini( void)
-{
-}
-
 int Tester::test()
 {
-//    if (test1() == -1)
-//      return -1;
-//    if (test2() == -1)
-//      return -1;
-  ACE_UUID_GENERATOR::instance ()->init ();
+  // Generate UUID
+  ACE_UUID* uuid = ACE_UUID_GENERATOR::instance ()->generateUUID ();
+  ACE_CString uuid_str (uuid->to_string ()->c_str ());
+  ACE_DEBUG ((LM_DEBUG,
+	      "UUID - %s\n",
+	      uuid_str.c_str ()));
 
+  // Construct UUID from string
+  ACE_UUID new_uuid (uuid_str);
   ACE_DEBUG ((LM_DEBUG,
-	      "%s\n",
-	      ACE_UUID_GENERATOR::instance ()->generateUUID ()->to_string ()->c_str ()));
-  
+	      "New UUID - %s\n",
+	      new_uuid.to_string ()->c_str ()));
   return 0;
 }
 
-
-
-// main ------------------------------------------------------------------------
-
 int main(int argc, char* argv[])
 
 {
   ACE::init();
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %D\n"), "UUIDTest"));
 
-  int retValue = EXIT_SUCCESS;
-  int testRetValue = 0;
-  try  {
-
-    Tester tester;
+  Tester tester;
 
-    if (tester.init( argc, argv) == -1) {
-
-      ACE_DEBUG((
-          LM_DEBUG,
-          "UUIDTest: Tester::init failed\n"));
+  if (tester.init( argc, argv) == -1) 
+    {
+	
+      ACE_DEBUG((LM_DEBUG,
+		 "UUIDTest: Tester::init failed\n"));
       return EXIT_FAILURE;
-
     }
-    testRetValue = tester.test();
-    tester.fini();
-
-  } catch( std::exception& ex) {
-
-    ACE_ERROR((
-        LM_ERROR,
-        ACE_TEXT( "(%P|%t)")
-        ACE_TEXT( "UUIDTest - got exception %s\n"),
-        ex.what()));
-    testRetValue = -1;
-
-  } catch( ...) {
-
-    ACE_DEBUG((
-        LM_DEBUG,
-        "UUIDTest - unknown exception\n"));
-    testRetValue = -1;
-
-  }
-  if (testRetValue == 0) {
-
-    ACE_DEBUG((
-        LM_DEBUG,
-        "UUIDTest succeeded\n"));
-
-  } else {
-
-    ACE_DEBUG((
-        LM_DEBUG,
-        "UUIDTest failed\n"));
-    retValue = EXIT_FAILURE;
-
-  }
+  int testRetValue = tester.test();
+
+  if (testRetValue == 0) 
+    {
+      ACE_DEBUG((LM_DEBUG,
+		 "UUIDTest succeeded\n"));
+    } 
+  else 
+    {
+      ACE_DEBUG((LM_DEBUG,
+		 "UUIDTest failed\n"));
+    }
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %D\n"), "UUIDTest"));
   ACE::fini();
-  return retValue;
+  return testRetValue;
 }