0028428: BinMNaming_NamedShapeDriver fails if there are no nodes in NamedShape

Unit test and additional parsing rule for tests are added as well as a minor fix of the draw command for bug24164_2 unit test (in reference array it was impossible to set only one value).

Added the exception for the checking in issue 2269, when bad document is read.

It checks that there is no crash, but just an error message. If crash is appeared, this test will not skipped anyway.

Correction of test for bug2269 and parse.rules

(cherry picked from commit 6d1e872b4da9f518621ece8d043b6f6fa484ef5b)

diff --git a/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx b/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx
index 1fbe784ccf36ba8a747ffbe5777ef7b326b34b4f..f06331ce985f109c2488af565a974c7050f04734 100644 (file)
--- a/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx
+++ b/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx
@@ -175,7 +175,6 @@ Standard_Boolean BinMNaming_NamedShapeDriver::Paste
   theSource >> aNbShapes;
   TDF_Label aLabel = theTarget->Label ();
   TNaming_Builder   aBuilder   (aLabel);
-  if (aNbShapes == 0) return Standard_False;
   Standard_Integer aVer;
   Standard_Boolean ok = theSource >> aVer;
   if(!ok) return Standard_False;
@@ -241,8 +240,6 @@ void BinMNaming_NamedShapeDriver::Paste (const Handle(TDF_Attribute)& theSource,
   for (TNaming_Iterator SItr (aSAtt); SItr.More (); SItr.Next ()) NbShapes++;
   //--------------------------------------------------------------
 
-  if (NbShapes == 0) return;
-
   BinTools_ShapeSet& aShapeSet = (BinTools_ShapeSet&) myShapeSet;
   TNaming_Evolution anEvol = aSAtt->Evolution();
   
@@ -311,4 +308,3 @@ void BinMNaming_NamedShapeDriver::ReadShapeSection (Standard_IStream& theIS)
   else
     theIS.seekg(aPos); // no shape section is present, try to return to initial point
 }
-

diff --git a/src/DDataStd/DDataStd_BasicCommands.cxx b/src/DDataStd/DDataStd_BasicCommands.cxx
index 3e1cdfcc7f65f0b1800578c451c811d349f0163e..bd2dd363546423d65d0f2eec8141d45a64584090 100644 (file)
--- a/src/DDataStd/DDataStd_BasicCommands.cxx
+++ b/src/DDataStd/DDataStd_BasicCommands.cxx
@@ -3697,7 +3697,7 @@ static Standard_Integer DDataStd_SetRefArray (Draw_Interpretor& di,
 
   Handle(TDataStd_ReferenceArray) A = TDataStd_ReferenceArray::Set(label, From, To);
   
-  if (nb > 6) {
+  if (nb >= 6) {
     j = 5;
     for(Standard_Integer i = From; i<=To; i++) { 
       TDF_Label aRefLabel; 

diff --git a/src/QADNaming/QADNaming_BuilderCommands.cxx b/src/QADNaming/QADNaming_BuilderCommands.cxx
index edd2bfa0fde05d760691840a2540fef35d665882..e0d75e5ec395ffb0099f5489185d21001ca8b610 100644 (file)
--- a/src/QADNaming/QADNaming_BuilderCommands.cxx
+++ b/src/QADNaming/QADNaming_BuilderCommands.cxx
@@ -23,7 +23,7 @@
 static Standard_Integer BuildNamedShape (Draw_Interpretor& di,
                                         Standard_Integer nb, 
                                         const char** arg) {
-  if (nb > 4) { 
+  if (nb >= 4) { 
     TDF_Label aLabel;
     if (!QADNaming::Entry(arg, aLabel)) return 1;
     char anEvolution = arg[3][0];
@@ -73,7 +73,7 @@ static Standard_Integer BuildNamedShape (Draw_Interpretor& di,
 //       OnlyModif = Draw::Atoi(arg[3]);
 //     }
   } else {
-    di<<"Usage: BuildName df entry evolution(P[RIMITIVE] G[ENERATED] M[ODIFY] D[ELETE] R[EPLACE] S[ELECTED]) shape1 [shape2 ...]\n";
+    di<<"Usage: BuildName df entry evolution(P[RIMITIVE] G[ENERATED] M[ODIFY] D[ELETE] R[EPLACE] S[ELECTED]) [shape1 shape2 ...]\n";
     return 1;
   }
   return 0;
@@ -89,6 +89,6 @@ void QADNaming::BuilderCommands(Draw_Interpretor& theCommands)
   const char* g = "Naming builder commands";
 
   theCommands.Add("BuildNamedShape",
-                 "BuildNamedShape df entry evolution(P[RIMITIVE] G[ENERATED] M[ODIFY] D[ELETE] R[EPLACE] S[ELECTED]) shape1 [shape2 ...]",
+                 "BuildNamedShape df entry evolution(P[RIMITIVE] G[ENERATED] M[ODIFY] D[ELETE] R[EPLACE] S[ELECTED]) [shape1 shape2 ...]",
                  __FILE__,BuildNamedShape,g);
 }

diff --git a/tests/bugs/caf/bug2269 b/tests/bugs/caf/bug2269
index be5909134b6f101965853a54de6e3cbf224bfa9c..a0cbe3ffc80bcbac43c3b1b8e177307bc2c179ba 100644 (file)
--- a/tests/bugs/caf/bug2269
+++ b/tests/bugs/caf/bug2269
@@ -1,3 +1,5 @@
+puts "REQUIRED All: XmlDriver warning: failure reading attribute TDataStd_RealArray"
+
 puts "================"
 puts "OCC2269"
 puts "================"

diff --git a/tests/bugs/caf/bug28428 b/tests/bugs/caf/bug28428
new file mode 100644 (file)
index 0000000..eb6020a
--- /dev/null
+++ b/tests/bugs/caf/bug28428
@@ -0,0 +1,19 @@
+puts "==========="
+puts "OCC28428"
+puts "==========="
+puts ""
+########################################################################
+# BinMNaming_NamedShapeDriver fails if there are no nodes in NamedShape
+########################################################################
+
+pload QAcommands
+
+NewDocument D1 BinOcaf
+# Create TNaming_Builder on a label without putthing shapes
+BuildNamedShape D1 0:1 P
+SaveAs D1 $imagedir/bug28428_new.cbf
+Close D1
+# This produced a NamedShape driver failure with catching by general driver
+# and output a failure message (catched by parse.rules)
+Open $imagedir/bug28428_new.cbf D2
+Close D2

diff --git a/tests/bugs/parse.rules b/tests/bugs/parse.rules
index 4450a2904255d61f561b5a6962b63dae1aa0c971..9d0907f3c04e489ea1ec96a77f2fc37c87d394be 100755 (executable)
--- a/tests/bugs/parse.rules
+++ b/tests/bugs/parse.rules
@@ -1,3 +1,4 @@
 FAILED /\bFaulty\b/ bad shape
+FAILED /failure reading attribute/ attribute failure
 SKIPPED /Error: unsupported locale specification/ locale is unavailable on tested system
-OK /Relative error of mass computation/ message from vprops
\ No newline at end of file
+OK /Relative error of mass computation/ message from vprops