diff --git a/src/Unittests/unittests_trimesh_circulator_vertex_ihalfedge.hh b/src/Unittests/unittests_trimesh_circulator_vertex_ihalfedge.hh index 9ed00820..28ea30ba 100644 --- a/src/Unittests/unittests_trimesh_circulator_vertex_ihalfedge.hh +++ b/src/Unittests/unittests_trimesh_circulator_vertex_ihalfedge.hh @@ -120,13 +120,6 @@ TEST_F(OpenMeshTrimeshCirculatorVertexIHalfEdge, VertexIncomingHalfedgeWithoutHo EXPECT_FALSE(vih_it) << "Iterator still valid in VertexIHalfedgeIter at step 4"; EXPECT_TRUE( vih_it == vih_end ) << "Miss matched end iterator"; - ++vih_it ; - - EXPECT_EQ(7, vih_it.handle().idx() ) << "Index wrong in VertexIHalfedgeIter step 5"; - EXPECT_EQ(2, mesh_.face_handle(vih_it.handle()).idx() ) << "Corresponding face Index wrong in VertexIHalfedgeIter step 5"; - //EXPECT_FALSE(vih_it) << "Iterator still valid in VertexIHalfedgeIter at step 5"; - - // Iterate around vertex 1 at the middle (with holes in between) Mesh::ConstVertexIHalfedgeIter cvih_it = mesh_.cvih_begin(vhandle[1]); @@ -162,13 +155,6 @@ TEST_F(OpenMeshTrimeshCirculatorVertexIHalfEdge, VertexIncomingHalfedgeWithoutHo EXPECT_FALSE(cvih_it) << "Iterator still valid in ConstVertexIHalfedgeIter at step 4"; EXPECT_TRUE( cvih_it == cvoh_end ) << "Miss matched end iterator"; - ++cvih_it ; - - EXPECT_EQ(7, cvih_it.handle().idx() ) << "Index wrong in ConstVertexIHalfedgeIter step 5"; - EXPECT_EQ(2, mesh_.face_handle(cvih_it.handle()).idx() ) << "Corresponding face Index wrong in ConstVertexIHalfedgeIter step 5"; - //EXPECT_FALSE(cvih_it) << "Iterator still valid in ConstVertexIHalfedgeIter at step 5"; - - } /* @@ -255,11 +241,6 @@ TEST_F(OpenMeshTrimeshCirculatorVertexIHalfEdge, VertexOIncomingHalfedgeBoundary EXPECT_FALSE(vih_it) << "Iterator still valid in VertexIHalfedgeIter at step 3"; EXPECT_TRUE( vih_it == vih_end ) << "Miss matched end iterator"; - ++vih_it ; - - EXPECT_EQ(2, vih_it.handle().idx() ) << "Index wrong in VertexIHalfedgeIter step 5"; - EXPECT_EQ(0, mesh_.face_handle(vih_it.handle()).idx() ) << "Corresponding face Index wrong in VertexIHalfedgeIter step 4"; - //EXPECT_FALSE(vih_it) << "Iterator still valid in VertexIHalfedgeIter at step 5"; } diff --git a/src/Unittests/unittests_trimesh_circulator_vertex_ohalfedge.hh b/src/Unittests/unittests_trimesh_circulator_vertex_ohalfedge.hh index 96dfcff0..1ffff45d 100644 --- a/src/Unittests/unittests_trimesh_circulator_vertex_ohalfedge.hh +++ b/src/Unittests/unittests_trimesh_circulator_vertex_ohalfedge.hh @@ -121,14 +121,6 @@ TEST_F(OpenMeshTrimeshCirculatorVertexOHalfEdge, VertexOutgoingHalfedgeWithoutHo EXPECT_FALSE(voh_it) << "Iterator still valid in VertexOHalfedgeIter at step 4"; EXPECT_TRUE( voh_it == voh_end ) << "Miss matched end iterator"; - ++voh_it ; - - EXPECT_EQ(6, voh_it.handle().idx() ) << "Index wrong in VertexOHalfedgeIter step 5"; - EXPECT_EQ(1, mesh_.face_handle(voh_it.handle()).idx() ) << "Corresponding face Index wrong in VertexOHalfedgeIter step 5"; - //EXPECT_FALSE(voh_it) << "Iterator still valid in VertexOHalfedgeIter at step 5"; - - - // Iterate around vertex 1 at the middle (with holes in between) Mesh::ConstVertexOHalfedgeIter cvoh_it = mesh_.cvoh_begin(vhandle[1]); Mesh::ConstVertexOHalfedgeIter cvoh_end = mesh_.cvoh_end(vhandle[1]); @@ -163,13 +155,6 @@ TEST_F(OpenMeshTrimeshCirculatorVertexOHalfEdge, VertexOutgoingHalfedgeWithoutHo EXPECT_FALSE(cvoh_it) << "Iterator still valid in ConstVertexOHalfedgeIter at step 4"; EXPECT_TRUE( cvoh_it == cvoh_end ) << "Miss matched end iterator"; - ++cvoh_it ; - - EXPECT_EQ(6, cvoh_it.handle().idx() ) << "Index wrong in ConstVertexOHalfedgeIter step 5"; - EXPECT_EQ(1, mesh_.face_handle(cvoh_it.handle()).idx() ) << "Corresponding face Index wrong in ConstVertexOHalfedgeIter step 5"; - //EXPECT_FALSE(cvoh_it) << "Iterator still valid in ConstVertexOHalfedgeIter at step 5"; - - } /* @@ -256,12 +241,6 @@ TEST_F(OpenMeshTrimeshCirculatorVertexOHalfEdge, VertexOutgoingHalfedgeBoundaryI EXPECT_FALSE(voh_it) << "Iterator still valid in VertexOHalfedgeIter at step 3"; EXPECT_TRUE( voh_it == voh_end ) << "Miss matched end iterator"; - ++voh_it ; - - EXPECT_EQ(3, voh_it.handle().idx() ) << "Index wrong in VertexOHalfedgeIter step 5"; - EXPECT_EQ(3, mesh_.face_handle(voh_it.handle()).idx() ) << "Corresponding face Index wrong in VertexOHalfedgeIter step 4"; - //EXPECT_FALSE(voh_it) << "Iterator still valid in VertexOHalfedgeIter at step 5"; - }