From f2d685a9cbd7a3ffad0f364db6fd84d184e93e95 Mon Sep 17 00:00:00 2001
From: aml <aml@opencascade.com>
Date: Thu, 20 Aug 2015 16:57:10 +0300
Subject: [PATCH] 0026572: Error in ShapeUpgrade_UnifySameDomain algorithm: can
 not merge two edges in customer's shape

Obsolete code deleted.
Test case for issue CR26572
Small correction
---
 .../ShapeUpgrade_UnifySameDomain.cxx          |  6 ----
 tests/bugs/heal/bug26219_1                    |  6 ++--
 tests/bugs/heal/bug26219_gehause_rohteil      |  6 ++--
 tests/bugs/heal/bug26572                      | 36 +++++++++++++++++++
 4 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 tests/bugs/heal/bug26572

diff --git a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
index 2f715051ca..2dc4fefca0 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
@@ -848,12 +848,6 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
       }
     }
   }
-  if(aChain.Length()<SeqEdges1.Length()) {
-#ifdef OCCT_DEBUG
-    cout<<"can not create correct chain..."<<endl;
-#endif
-    return Standard_False;
-  }
 
   Standard_Boolean IsClosed = Standard_False;
   if (VF.IsSame ( VL ))
diff --git a/tests/bugs/heal/bug26219_1 b/tests/bugs/heal/bug26219_1
index 62f3373af7..41306b24c5 100644
--- a/tests/bugs/heal/bug26219_1
+++ b/tests/bugs/heal/bug26219_1
@@ -33,15 +33,15 @@ unifysamedom p p
 
 set nbshapes_after_simplify "
 Number of shapes in shape
- VERTEX    : 132
- EDGE      : 196
+ VERTEX    : 130
+ EDGE      : 194
  WIRE      : 66
  FACE      : 66
  SHELL     : 1
  SOLID     : 1
  COMPSOLID : 0
  COMPOUND  : 1
- SHAPE     : 463
+ SHAPE     : 459
 "
 checknbshapes p -ref ${nbshapes_after_simplify} -t -m "result after attempt to simplify the model"
 
diff --git a/tests/bugs/heal/bug26219_gehause_rohteil b/tests/bugs/heal/bug26219_gehause_rohteil
index 966862dcc3..2a63cdb8dc 100644
--- a/tests/bugs/heal/bug26219_gehause_rohteil
+++ b/tests/bugs/heal/bug26219_gehause_rohteil
@@ -279,15 +279,15 @@ unifysamedom p p
 
 set nbshapes_after_simplify "
 Number of shapes in shape
- VERTEX    : 84
- EDGE      : 127
+ VERTEX    : 82
+ EDGE      : 125
  WIRE      : 51
  FACE      : 44
  SHELL     : 1
  SOLID     : 1
  COMPSOLID : 0
  COMPOUND  : 0
- SHAPE     : 308
+ SHAPE     : 304
 "
 checknbshapes p -ref ${nbshapes_after_simplify} -t -m "result after attempt to simplify the model"
 
diff --git a/tests/bugs/heal/bug26572 b/tests/bugs/heal/bug26572
new file mode 100644
index 0000000000..65d21dd16d
--- /dev/null
+++ b/tests/bugs/heal/bug26572
@@ -0,0 +1,36 @@
+puts "========"
+puts "OCC26572"
+puts "========"
+puts ""
+#######################################################################
+# Error in ShapeUpgrade_UnifySameDomain algorithm: can not merge two edges in customer's shape
+#######################################################################
+
+restore [locate_data_file bug26572_issue_12_new_input.brep] s
+
+nbshapes s -t
+
+smallview
+donly s
+fit
+xwd ${imagedir}/${casename}_1.png
+
+unifysamedom res s
+
+set nbshapes_expected "
+Number of shapes in shape
+ VERTEX    : 48
+ EDGE      : 72
+ WIRE      : 28
+ FACE      : 27
+ SHELL     : 1
+ SOLID     : 1
+ COMPSOLID : 0
+ COMPOUND  : 1
+ SHAPE     : 178
+"
+checknbshapes res -ref ${nbshapes_expected} -t -m "Shape Upgrade"
+
+donly res
+
+xwd ${imagedir}/${casename}_2.png