From 41ce5887ad966f78c14eed62107b01daae9aae67 Mon Sep 17 00:00:00 2001
From: nbv <nbv@opencascade.com>
Date: Tue, 27 Sep 2016 17:46:14 +0300
Subject: [PATCH] 0027892: Construction error in offset

Provide proper initialization of the field Geom_OffsetSurface::myOscSurf in the case of creating offset of the trimmed bspline surface.

Adjusting test cases according to their new behavior.
---
 src/Geom/Geom_OffsetSurface.cxx   | 6 +++---
 tests/bugs/modalg_4/bug8842_8     | 4 ++++
 tests/offset/with_intersect_20/J9 | 7 ++-----
 tests/offset/with_intersect_80/J9 | 9 +++------
 tests/offset/with_intersect_80/K8 | 8 +++-----
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/Geom/Geom_OffsetSurface.cxx b/src/Geom/Geom_OffsetSurface.cxx
index 13f019c9d3..156f2fd63b 100644
--- a/src/Geom/Geom_OffsetSurface.cxx
+++ b/src/Geom/Geom_OffsetSurface.cxx
@@ -221,15 +221,15 @@ void Geom_OffsetSurface::SetBasisSurface (const Handle(Geom_Surface)& S,
   
   equivSurf = Surface();
 
-  if (basisSurf->IsKind(STANDARD_TYPE(Geom_BSplineSurface)) ||
-      basisSurf->IsKind(STANDARD_TYPE(Geom_BezierSurface)))
+  if (aCheckingSurf->IsKind(STANDARD_TYPE(Geom_BSplineSurface)) ||
+      aCheckingSurf->IsKind(STANDARD_TYPE(Geom_BezierSurface)))
   {
     // Tolerance en dur pour l'instant ,mais on devrait la proposer dans le constructeur
     // et la mettre en champ, on pourrait utiliser par exemple pour l'extraction d'iso 
     // et aussi pour les singularite. Pour les surfaces osculatrices, on l'utilise pour
     // detecter si une iso est degeneree.
     const Standard_Real Tol = Precision::Confusion(); //0.0001;
-    myOscSurf = new Geom_OsculatingSurface(basisSurf, Tol);
+    myOscSurf = new Geom_OsculatingSurface(aCheckingSurf, Tol);
   }
 
   // Surface value calculator
diff --git a/tests/bugs/modalg_4/bug8842_8 b/tests/bugs/modalg_4/bug8842_8
index eac4f7ae9b..1c23a88d6c 100755
--- a/tests/bugs/modalg_4/bug8842_8
+++ b/tests/bugs/modalg_4/bug8842_8
@@ -1,3 +1,7 @@
+puts "TODO OCC27929 ALL: Error : The area of result shape is"
+puts "TODO OCC27929 ALL: Error :  is WRONG because number of "
+
+
 puts "============"
 puts "OCC8842"
 puts "============"
diff --git a/tests/offset/with_intersect_20/J9 b/tests/offset/with_intersect_20/J9
index 3be5c693f3..55246c9a3b 100644
--- a/tests/offset/with_intersect_20/J9
+++ b/tests/offset/with_intersect_20/J9
@@ -1,8 +1,5 @@
-#puts "TODO OCC26577 All: Error :  is WRONG because number of EDGE entities in shape"
-#puts "TODO OCC26577 All: Error :  is WRONG because number of SHELL entities in shape"
-puts "TODO 26329 All: Standard_ConstructionError: BRepOffset_MakeOffset::TrimEdge no projection"
-puts "TODO 26329 All: TEST INCOMPLETE"
-
+puts "TODO OCC26577 All: Error :  is WRONG because number of EDGE entities in shape"
+puts "TODO OCC26577 All: Error :  is WRONG because number of SHELL entities in shape"
 restore [locate_data_file bug26663_test_offset_J9.brep] s
 OFFSETSHAPE ${off_param} {} ${calcul} ${type}
 checknbshapes result -ref [lrange [nbshapes s] 8 19]
diff --git a/tests/offset/with_intersect_80/J9 b/tests/offset/with_intersect_80/J9
index 4db409e01e..5c5f4e7904 100644
--- a/tests/offset/with_intersect_80/J9
+++ b/tests/offset/with_intersect_80/J9
@@ -1,9 +1,6 @@
-#puts "TODO OCC26578 All:An exception was caught"
-#puts "TODO OCC26578 All:\\*\\* Exception \\*\\*"
-#puts "TODO OCC26578 All:TEST INCOMPLETE"
-puts "TODO OCC26578 All: Error :  is WRONG because number of EDGE"
-puts "TODO OCC26578 All: Error :  is WRONG because number of SHELL"
-#puts "TODO OCC26578 All: Faulty shapes in variables faulty_1"
+puts "TODO OCC26578 All:An exception was caught"
+puts "TODO OCC26578 All:\\*\\* Exception \\*\\*"
+puts "TODO OCC26578 All:TEST INCOMPLETE"
 restore [locate_data_file bug26663_test_offset_J9.brep] s
 OFFSETSHAPE ${off_param} {} ${calcul} ${type}
 checknbshapes result -ref [lrange [nbshapes s] 8 19]
diff --git a/tests/offset/with_intersect_80/K8 b/tests/offset/with_intersect_80/K8
index d3cbc902b3..c7b86dc3dd 100644
--- a/tests/offset/with_intersect_80/K8
+++ b/tests/offset/with_intersect_80/K8
@@ -1,8 +1,6 @@
-#puts "TODO OCC26578 All:An exception was caught"
-#puts "TODO OCC26578 All:\\*\\* Exception \\*\\*"
-puts "TODO OCC26578 All:is WRONG"
-puts "TODO OCC26578 All:Faulty shapes in variables faulty_1 to faulty_"
-#
+puts "TODO OCC26578 All:An exception was caught"
+puts "TODO OCC26578 All:\\*\\* Exception \\*\\*"
+puts "TODO OCC26578 All:TEST INCOMPLETE"
 restore [locate_data_file bug26663_test_offset_K8.brep] s
 OFFSETSHAPE ${off_param} {} ${calcul} ${type}
 checknbshapes result -ref [lrange [nbshapes s] 8 19]