From 8fcb8c0700bd4e551f5cdc45ce6ffa0607e1a657 Mon Sep 17 00:00:00 2001
From: abv <abv@opencascade.com>
Date: Thu, 19 Nov 2015 15:20:39 +0300
Subject: [PATCH] 0000670: Problem with the Print method.

Test for issue #670 corrected to avoid unpredictable behavior
---
 src/QABugs/QABugs_11.cxx   | 12 ++++++++++--
 tests/bugs/fclasses/bug670 | 12 +++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/QABugs/QABugs_11.cxx b/src/QABugs/QABugs_11.cxx
index 830794bc8f..f74ea412ae 100644
--- a/src/QABugs/QABugs_11.cxx
+++ b/src/QABugs/QABugs_11.cxx
@@ -1705,8 +1705,16 @@ static Standard_Integer OCC670 (Draw_Interpretor& di, Standard_Integer argc, con
     di<<"Usage : " << argv[0] << "\n";
     return -1;
   }
-  TColStd_Array2OfInteger Array2OfInteger(1,1,1,1);
-  Array2OfInteger.SetValue(5,5,55);
+
+  // check that exception initialized without message string can be safely handled and printed
+  try {
+    Standard_OutOfRange::Raise();
+  }
+  catch (Standard_Failure) {
+    std::cout << "Caught successfully: ";
+    Standard_Failure::Caught()->Print (std::cout);
+    std::cout << endl;
+  }
   return 0;
 }
 
diff --git a/tests/bugs/fclasses/bug670 b/tests/bugs/fclasses/bug670
index 41e28bc8a9..41022bc265 100755
--- a/tests/bugs/fclasses/bug670
+++ b/tests/bugs/fclasses/bug670
@@ -1,17 +1,11 @@
-# OK: Exception appears and does not kill DRAWEXE (TEST COMPLETED)
-puts "TODO OCC670 ALL: An exception was caught"
-puts "TODO OCC670 ALL: \\*\\* Exception \\*\\*"
-
 puts "========"
-puts "OCC670"
+puts "OCC670: Problem with the Print method."
 puts "========"
 puts ""
-#########################
-## Problem with the Print method.
-#########################
 
 pload QAcommands
 
-catch { OCC670 }
+# Check that exception is handled and does not kill DRAWEXE (TEST COMPLETED)
+OCC670
 
 puts "OCC670 OK"