[cgma-dev] r4074 - cgm/trunk/test

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2010-08-06 12:59:48 -0500 (Fri, 06 Aug 2010)
New Revision: 4074

Modified:
   cgm/trunk/test/Makefile.am
   cgm/trunk/test/makept.cpp
Log:
Changes according to fix for merge_occ. Curve order has changed, makept has some change with change of curves.

Modified: cgm/trunk/test/Makefile.am
===================================================================
--- cgm/trunk/test/Makefile.am	2010-08-06 17:57:40 UTC (rev 4073)
+++ cgm/trunk/test/Makefile.am	2010-08-06 17:59:48 UTC (rev 4074)
@@ -23,7 +23,7 @@
 endif
 endif
 if build_OCC
-  TESTS += modify makept r_w test_occ operation brick_occ #merge_occ
+  TESTS += modify makept r_w test_occ operation brick_occ merge_occ
 endif
 
 AM_CPPFLAGS =

Modified: cgm/trunk/test/makept.cpp
===================================================================
--- cgm/trunk/test/makept.cpp	2010-08-06 17:57:40 UTC (rev 4073)
+++ cgm/trunk/test/makept.cpp	2010-08-06 17:59:48 UTC (rev 4074)
@@ -523,10 +523,10 @@
   int num_loops = ref_face->ref_edge_loops(ref_edge_loops);
   DLIList<RefEdge*> *ref_edges1;
   ref_edges1 = ref_edge_loops.get();
-  RefEdge* edge1 = ref_edges1->get();
-  RefEdge* edge2 = ref_edges1->step_and_get();
-  double angle = edge1->angle_between(edge2, ref_face);
-  assert(fabs(angle - 1.57) < 0.001);
+  RefEdge* edge1 = ref_edges1->pop();
+  RefEdge* edge2 = ref_edges1->pop();
+  double angle = edge2->angle_between(edge1, ref_face);
+  assert(fabs(angle - 4.712) < 0.001);
 
   //test for curve
   CubitVector c_point, tangent, center;
@@ -643,17 +643,17 @@
   // bounding box
 
   d = ref_edge->measure();
-  assert(fabs(d - 13.9987) < 0.001);
+  assert(fabs(d - 11.042) < 0.001);
 
   ref_edge->get_param_range(lower,upper);
-  assert(lower - 19988 <= 0 && fabs(upper-20001.998) < 0.001);
+  assert(lower - 2.6024 <= 0.0001 && fabs(upper-6.2832) < 0.001);
   // paremeter range.
 
   d = ref_edge->length_from_u(lower,upper);
-  assert(fabs(d - 13.9987) < 0.001);
+  assert(fabs(d - 11.042) < 0.001);
 
   d = ref_edge->length_from_u(lower/2+upper/2, upper);
-  assert(fabs(d-6.99939) < 0.0001);