Split tests for Iterators and Circulators, added test for FaceIter with skipping

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@423 fdac6126-5c0c-442c-9429-916003d36597

src/Unittests/unittests.cc

@@ -3,6 +3,7 @@
 #include "unittests_common.hh"
 #include "unittests_loading.hh"
 #include "unittests_trimesh_iterators.hh"
+#include "unittests_trimesh_circulators.hh"
 #include "unittests_decimater.hh"
 
 int main(int _argc, char** _argv) {

src/Unittests/unittests_trimesh_circulators.hh

@@ -0,0 +1,377 @@
+#ifndef INCLUDE_UNITTESTS_TRIMESH_CIRCULATORS_HH
+#define INCLUDE_UNITTESTS_TRIMESH_CIRCULATORS_HH
+
+#include <gtest/gtest.h>
+#include <Unittests/unittests_common.hh>
+
+#include <iostream>
+
+class OpenMeshCirculators : public OpenMeshBase {
+
+    protected:
+
+        // This function is called before each test is run
+        virtual void SetUp() {
+        }
+
+        // This function is called after all tests are through
+        virtual void TearDown() {
+
+            // Do some final stuff with the member data here...
+        }
+
+    // Member already defined in OpenMeshBase
+    //Mesh mesh_;  
+};
+
+/*
+ * ====================================================================
+ * Define tests below
+ * ====================================================================
+ */
+
+
+/*
+ * Small VertexFaceIterator Test with holes in it
+ *
+ * WARNING!!! Basically this is an illegal configuration!
+ * But this way we can still detect if it breaks!
+ */
+TEST_F(OpenMeshCirculators, VertexFaceIterWithHoles) {
+
+  mesh_.clear();
+
+  // Add some vertices
+  Mesh::VertexHandle vhandle[5];
+
+  vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
+  vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
+  vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
+  vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
+  vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
+
+  // Add two faces
+  std::vector<Mesh::VertexHandle> face_vhandles;
+
+  face_vhandles.push_back(vhandle[0]);
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[2]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[3]);
+  face_vhandles.push_back(vhandle[4]);
+  mesh_.add_face(face_vhandles);
+
+  /* Test setup:
+      0 ==== 2
+       \    /
+        \  /
+          1
+        /  \
+       /    \
+      3 ==== 4 */
+
+  // Iterate around vertex 1 at the middle (with holes in between)
+  Mesh::VertexFaceIter vf_it  = mesh_.vf_begin(vhandle[1]); 
+  Mesh::VertexFaceIter vf_end = mesh_.vf_end(vhandle[1]);
+  EXPECT_EQ(0, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at initialization";
+  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at initialization";
+  ++vf_it ;
+  EXPECT_EQ(1, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 1";
+  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 1";
+  ++vf_it ;
+  EXPECT_EQ(-1, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at end";
+  EXPECT_FALSE(vf_it) << "Iterator not invalid in VertexFaceIter at end";
+  EXPECT_TRUE( vf_it == vf_end )  << "End iterator for VertexFaceIter not matching";
+
+  // Iterate around vertex 1 at the middle (with holes in between) with const iterator
+  Mesh::ConstVertexFaceIter cvf_it  = mesh_.cvf_begin(vhandle[1]);
+  Mesh::ConstVertexFaceIter cvf_end = mesh_.cvf_end(vhandle[1]);
+  EXPECT_EQ(0, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at initialization";
+  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at initialization";
+  ++cvf_it ;
+  EXPECT_EQ(1, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step one";
+  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step one";
+  ++cvf_it ;
+  EXPECT_EQ(-1, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at end";
+  EXPECT_FALSE(cvf_it) << "Iterator not invalid in ConstVertexFaceIter at end";
+  EXPECT_TRUE( cvf_it == cvf_end )  << "End iterator for ConstVertexFaceIter not matching";
+
+}
+
+/*
+ * Small VertexFaceIterator Test without holes in it
+ */
+TEST_F(OpenMeshCirculators, VertexFaceIterWithoutHoles) {
+
+  mesh_.clear();
+
+  // Add some vertices
+  Mesh::VertexHandle vhandle[5];
+
+  vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
+  vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
+  vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
+  vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
+  vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
+
+  // Add two faces
+  std::vector<Mesh::VertexHandle> face_vhandles;
+
+  face_vhandles.push_back(vhandle[0]);
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[2]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[3]);
+  face_vhandles.push_back(vhandle[4]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[0]);
+  face_vhandles.push_back(vhandle[3]);
+  face_vhandles.push_back(vhandle[1]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[2]);
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[4]);
+  mesh_.add_face(face_vhandles);
+
+  /* Test setup:
+      0 ==== 2
+      |\  0 /|
+      | \  / |
+      |2  1 3|
+      | /  \ |
+      |/  1 \|
+      3 ==== 4 */
+
+  Mesh::VertexFaceIter vfa_it  = mesh_.vf_begin(vhandle[1]);
+
+  // Iterate around vertex 1 at the middle (with holes in between)
+  Mesh::VertexFaceIter vf_it  = mesh_.vf_begin(vhandle[1]);
+  Mesh::VertexFaceIter vf_end = mesh_.vf_end(vhandle[1]);
+  EXPECT_EQ(3, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at initialization";
+  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at initialization";
+  ++vf_it ;
+  EXPECT_EQ(1, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 1";
+  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 1";
+  ++vf_it ;
+  EXPECT_EQ(2, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 2";
+  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 2";
+  ++vf_it ;
+  EXPECT_EQ(0, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 3";
+  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 3";
+  ++vf_it ;
+  EXPECT_EQ(3, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at end";
+  EXPECT_FALSE(vf_it) << "Iterator not invalid in VertexFaceIter at end";
+  EXPECT_TRUE( vf_it == vf_end )  << "End iterator for VertexFaceIter not matching";
+
+  // Iterate around vertex 1 at the middle (with holes in between) with const iterator
+  Mesh::ConstVertexFaceIter cvf_it  = mesh_.cvf_begin(vhandle[1]);
+  Mesh::ConstVertexFaceIter cvf_end = mesh_.cvf_end(vhandle[1]);
+  EXPECT_EQ(3, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at initialization";
+  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at initialization";
+  ++cvf_it ;
+  EXPECT_EQ(1, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step 1";
+  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step 1";
+  ++cvf_it ;
+  EXPECT_EQ(2, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step 2";
+  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step 2";
+  ++cvf_it ;
+  EXPECT_EQ(0, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step 3";
+  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step 3";
+  ++cvf_it ;
+  EXPECT_EQ(3, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at end";
+  EXPECT_FALSE(cvf_it) << "Iterator not invalid in VertexFaceIter at end";
+  EXPECT_TRUE( cvf_it == cvf_end )  << "End iterator for ConstVertexFaceIter not matching";
+
+
+}
+
+/*
+ * Small FaceFaceIterator Test with holes in it
+ */
+TEST_F(OpenMeshCirculators, FaceFaceIterWithHoles) {
+
+  mesh_.clear();
+
+  // Add some vertices
+  Mesh::VertexHandle vhandle[5];
+
+  vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
+  vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
+  vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
+  vhandle[3] = mesh_.add_vertex(Mesh::Point(3, 0, 0));
+  vhandle[4] = mesh_.add_vertex(Mesh::Point(4, 1, 0));
+
+  // Add three faces
+  std::vector<Mesh::VertexHandle> face_vhandles;
+
+  face_vhandles.push_back(vhandle[0]);
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[2]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[2]);
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[3]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[2]);
+  face_vhandles.push_back(vhandle[3]);
+  face_vhandles.push_back(vhandle[4]);
+  mesh_.add_face(face_vhandles);
+
+  /* Test setup:
+   *
+   * 0 ------ 2 ------ 4
+   *  \      / \      /
+   *   \  0 /   \  2 /
+   *    \  /  1  \  /
+   *     1 ------- 3
+   */
+
+
+  Mesh::FaceFaceIter ff_it  = mesh_.ff_begin(mesh_.face_handle(1));
+  Mesh::FaceFaceIter ff_end = mesh_.ff_end(mesh_.face_handle(1));
+
+  EXPECT_EQ(2, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at initialization";
+  EXPECT_TRUE(ff_it) << "Iterator invalid in FaceFaceIter at initialization";
+  ++ff_it;
+  EXPECT_EQ(0, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at step 1";
+  EXPECT_TRUE(ff_it) << "Iterator invalid in FaceFaceIter at step 1";
+  ++ff_it;
+  EXPECT_EQ(2, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at end";
+  EXPECT_FALSE(ff_it) << "Iterator invalid in FaceFaceIter at end";
+  EXPECT_TRUE( ff_it == ff_end )  << "End iterator for FaceFaceIter not matching";
+
+  Mesh::ConstFaceFaceIter cff_it  = mesh_.cff_begin(mesh_.face_handle(1));
+  Mesh::ConstFaceFaceIter cff_end = mesh_.cff_end(mesh_.face_handle(1));
+
+  EXPECT_EQ(2, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at initialization";
+  EXPECT_TRUE(cff_it) << "Iterator invalid in ConstFaceFaceIter at initialization";
+  ++cff_it;
+  EXPECT_EQ(0, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at step 1";
+  EXPECT_TRUE(cff_it) << "Iterator invalid in ConstFaceFaceIter at step 1";
+  ++cff_it;
+  EXPECT_EQ(2, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at end";
+  EXPECT_FALSE(cff_it) << "Iterator invalid in ConstFaceFaceIter at end";
+  EXPECT_TRUE( cff_it == cff_end )  << "End iterator for ConstFaceFaceIter not matching";
+
+}
+
+/*
+ * Small FaceFaceIterator Test with holes in it
+ */
+TEST_F(OpenMeshCirculators, FaceFaceIterWithoutHoles) {
+
+  mesh_.clear();
+
+  // Add some vertices
+  Mesh::VertexHandle vhandle[6];
+
+  vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
+  vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
+  vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
+  vhandle[3] = mesh_.add_vertex(Mesh::Point(3, 0, 0));
+  vhandle[4] = mesh_.add_vertex(Mesh::Point(4, 1, 0));
+  vhandle[5] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
+
+  // Add three faces
+  std::vector<Mesh::VertexHandle> face_vhandles;
+
+  face_vhandles.push_back(vhandle[0]);
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[2]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[2]);
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[3]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[2]);
+  face_vhandles.push_back(vhandle[3]);
+  face_vhandles.push_back(vhandle[4]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[5]);
+  face_vhandles.push_back(vhandle[3]);
+  mesh_.add_face(face_vhandles);
+
+  /* Test setup:
+   *
+   * 0 ------ 2 ------ 4
+   *  \      / \      /
+   *   \  0 /   \  2 /
+   *    \  /  1  \  /
+   *     1 ------- 3
+   *      \       /
+   *       \  3  /
+   *        \   /
+   *         \ /
+   *          5
+   */
+
+
+  Mesh::FaceFaceIter ff_it  = mesh_.ff_begin(mesh_.face_handle(1));
+  Mesh::FaceFaceIter ff_end = mesh_.ff_end(mesh_.face_handle(1));
+
+  EXPECT_EQ(2, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at initialization";
+  EXPECT_TRUE(ff_it) << "Iterator invalid in FaceFaceIter at initialization";
+  ++ff_it;
+  EXPECT_EQ(0, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at step 1";
+  EXPECT_TRUE(ff_it) << "Iterator invalid in FaceFaceIter at step 1";
+  ++ff_it;
+  EXPECT_EQ(3, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at step 2";
+  EXPECT_TRUE(ff_it) << "Iterator invalid in FaceFaceIter at step 2";
+  ++ff_it;
+  EXPECT_EQ(2, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at end";
+  EXPECT_FALSE(ff_it) << "Iterator invalid in FaceFaceIter at end";
+  EXPECT_TRUE( ff_it == ff_end )  << "End iterator for FaceFaceIter not matching";
+
+  Mesh::ConstFaceFaceIter cff_it  = mesh_.cff_begin(mesh_.face_handle(1));
+  Mesh::ConstFaceFaceIter cff_end = mesh_.cff_end(mesh_.face_handle(1));
+
+  EXPECT_EQ(2, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at initialization";
+  EXPECT_TRUE(cff_it) << "Iterator invalid in ConstFaceFaceIter at initialization";
+  ++cff_it;
+  EXPECT_EQ(0, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at step 1";
+  EXPECT_TRUE(cff_it) << "Iterator invalid in ConstFaceFaceIter at step 1";
+  ++cff_it;
+  EXPECT_EQ(3, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at step 2";
+  EXPECT_TRUE(cff_it) << "Iterator invalid in ConstFaceFaceIter at step 2";
+  ++cff_it;
+  EXPECT_EQ(2, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at end";
+  EXPECT_FALSE(cff_it) << "Iterator invalid in ConstFaceFaceIter at end";
+  EXPECT_TRUE( cff_it == cff_end )  << "End iterator for ConstFaceFaceIter not matching";
+
+}
+
+
+
+
+
+#endif // INCLUDE GUARD

src/Unittests/unittests_trimesh_iterators.hh

@@ -174,343 +174,91 @@ TEST_F(OpenMeshIterators, EdgeIter) {
 }
 
 /*
- * Small VertexFaceIterator Test with holes in it
+ * Test with a mesh with one deleted face
  */
-TEST_F(OpenMeshIterators, VertexFaceIterWithHoles) {
+TEST_F(OpenMeshIterators, FaceIterEmptyMeshOneDeletedFace) {
 
   mesh_.clear();
 
-  // Add some vertices
+  // request delete_face capability
-  Mesh::VertexHandle vhandle[5];
+  mesh_.request_vertex_status();
+  mesh_.request_edge_status();
+  mesh_.request_face_status();
 
-  vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
+  // Add some vertices
-  vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
+  Mesh::VertexHandle vhandle[4];
-  vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
+
-  vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
+  vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 0, 0));
-  vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
+  vhandle[1] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
+  vhandle[2] = mesh_.add_vertex(Mesh::Point(1, 1, 0));
 
   // Add two faces
   std::vector<Mesh::VertexHandle> face_vhandles;
 
-  face_vhandles.push_back(vhandle[0]);
-  face_vhandles.push_back(vhandle[1]);
   face_vhandles.push_back(vhandle[2]);
-  mesh_.add_face(face_vhandles);
-
-  face_vhandles.clear();
-
   face_vhandles.push_back(vhandle[1]);
-  face_vhandles.push_back(vhandle[3]);
+  face_vhandles.push_back(vhandle[0]);
-  face_vhandles.push_back(vhandle[4]);
+  Mesh::FaceHandle fh = mesh_.add_face(face_vhandles);
-  mesh_.add_face(face_vhandles);
 
-  /* Test setup:
+  // Delete face but keep vertices
-      0 ==== 2
+  bool const is_delete_isolated_vertex = false;
-       \    /
+  mesh_.delete_face(fh, is_delete_isolated_vertex);
-        \  /
-          1
-        /  \
-       /    \
-      3 ==== 4 */
 
-  // Iterate around vertex 1 at the middle (with holes in between)
+  // Test setup (Face deleted but vertices kept.
-  Mesh::VertexFaceIter vf_it  = mesh_.vf_begin(vhandle[1]); 
+  //  1 === 2
-  Mesh::VertexFaceIter vf_end = mesh_.vf_end(vhandle[1]);
+  //  |   /
-  EXPECT_EQ(0, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at initialization";
+  //  |  /
-  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at initialization";
+  //  | /
-  ++vf_it ;
+  //  0
-  EXPECT_EQ(1, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 1";
-  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 1";
-  ++vf_it ;
-  EXPECT_EQ(-1, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at end";
-  EXPECT_FALSE(vf_it) << "Iterator not invalid in VertexFaceIter at end";
-  EXPECT_TRUE( vf_it == vf_end )  << "End iterator for VertexFaceIter not matching";
 
-  // Iterate around vertex 1 at the middle (with holes in between) with const iterator
+  Mesh::FaceIter f_it  = mesh_.faces_begin();
-  Mesh::ConstVertexFaceIter cvf_it  = mesh_.cvf_begin(vhandle[1]);
+  Mesh::FaceIter f_end = mesh_.faces_end();
-  Mesh::ConstVertexFaceIter cvf_end = mesh_.cvf_end(vhandle[1]);
+
-  EXPECT_EQ(0, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at initialization";
+  EXPECT_EQ(0, f_it.handle().idx()) << "Wrong start index in FaceIterator";
-  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at initialization";
+
-  ++cvf_it ;
+  EXPECT_EQ(1, f_end.handle().idx()) << "Wrong end index in FaceIterator";
-  EXPECT_EQ(1, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step one";
+
-  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step one";
+  ++f_it;
-  ++cvf_it ;
+  EXPECT_EQ(1, f_it.handle().idx()) << "Wrong end index in FaceIterator after one step";
-  EXPECT_EQ(-1, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at end";
+  EXPECT_TRUE(f_it == f_end ) << "Iterator not at end for FaceIterator after one step";
-  EXPECT_FALSE(cvf_it) << "Iterator not invalid in ConstVertexFaceIter at end";
+
-  EXPECT_TRUE( cvf_it == cvf_end )  << "End iterator for ConstVertexFaceIter not matching";
+  Mesh::ConstFaceIter cf_it  = mesh_.faces_begin();
+  Mesh::ConstFaceIter cf_end = mesh_.faces_end();
+
+  EXPECT_EQ(0, cf_it.handle().idx()) << "Wrong start index in ConstFaceIterator";
+
+  EXPECT_EQ(1, cf_end.handle().idx()) << "Wrong end index in ConstFaceIterator";
+
+  ++cf_it;
+  EXPECT_EQ(1, cf_it.handle().idx()) << "Wrong end index in ConstFaceIterator after one step";
+  EXPECT_TRUE(cf_it == cf_end ) << "Iterator not at end for ConstFaceIterator after one step";
+
+
+  // Same with skipping iterators:
+  f_it  = mesh_.faces_sbegin();
+  f_end = mesh_.faces_end();
+
+  EXPECT_EQ(1, f_it.handle().idx()) << "Wrong start index in FaceIterator with skipping";
+
+  EXPECT_EQ(1, f_end.handle().idx()) << "Wrong end index in FaceIterator with skipping";
+
+  EXPECT_TRUE(f_it == f_end ) << "Iterator not at end for FaceIterator with skipping";
+
+  // Same with skipping iterators:
+  cf_it  = mesh_.faces_sbegin();
+  cf_end = mesh_.faces_end();
+
+  EXPECT_EQ(1, cf_it.handle().idx()) << "Wrong start index in ConstFaceIterator with skipping";
+
+  EXPECT_EQ(1, cf_end.handle().idx()) << "Wrong end index in ConstFaceIterator with skipping";
+
+  EXPECT_TRUE(cf_it == cf_end ) << "Iterator not at end for ConstFaceIterator with skipping";
+
+
+  mesh_.release_vertex_status();
+  mesh_.release_edge_status();
+  mesh_.release_face_status();
 
 }
 
-/*
- * Small VertexFaceIterator Test without holes in it
- */
-TEST_F(OpenMeshIterators, VertexFaceIterWithoutHoles) {
-
-  mesh_.clear();
-
-  // Add some vertices
-  Mesh::VertexHandle vhandle[5];
-
-  vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
-  vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
-  vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
-  vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
-  vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
-
-  // Add two faces
-  std::vector<Mesh::VertexHandle> face_vhandles;
-
-  face_vhandles.push_back(vhandle[0]);
-  face_vhandles.push_back(vhandle[1]);
-  face_vhandles.push_back(vhandle[2]);
-  mesh_.add_face(face_vhandles);
-
-  face_vhandles.clear();
-
-  face_vhandles.push_back(vhandle[1]);
-  face_vhandles.push_back(vhandle[3]);
-  face_vhandles.push_back(vhandle[4]);
-  mesh_.add_face(face_vhandles);
-
-  face_vhandles.clear();
-
-  face_vhandles.push_back(vhandle[0]);
-  face_vhandles.push_back(vhandle[3]);
-  face_vhandles.push_back(vhandle[1]);
-  mesh_.add_face(face_vhandles);
-
-  face_vhandles.clear();
-
-  face_vhandles.push_back(vhandle[2]);
-  face_vhandles.push_back(vhandle[1]);
-  face_vhandles.push_back(vhandle[4]);
-  mesh_.add_face(face_vhandles);
-
-  /* Test setup:
-      0 ==== 2
-      |\  0 /|
-      | \  / |
-      |2  1 3|
-      | /  \ |
-      |/  1 \|
-      3 ==== 4 */
-
-  Mesh::VertexFaceIter vfa_it  = mesh_.vf_begin(vhandle[1]);
-
-  // Iterate around vertex 1 at the middle (with holes in between)
-  Mesh::VertexFaceIter vf_it  = mesh_.vf_begin(vhandle[1]);
-  Mesh::VertexFaceIter vf_end = mesh_.vf_end(vhandle[1]);
-  EXPECT_EQ(3, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at initialization";
-  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at initialization";
-  ++vf_it ;
-  EXPECT_EQ(1, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 1";
-  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 1";
-  ++vf_it ;
-  EXPECT_EQ(2, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 2";
-  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 2";
-  ++vf_it ;
-  EXPECT_EQ(0, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 3";
-  EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 3";
-  ++vf_it ;
-  EXPECT_EQ(3, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at end";
-  EXPECT_FALSE(vf_it) << "Iterator not invalid in VertexFaceIter at end";
-  EXPECT_TRUE( vf_it == vf_end )  << "End iterator for VertexFaceIter not matching";
-
-  // Iterate around vertex 1 at the middle (with holes in between) with const iterator
-  Mesh::ConstVertexFaceIter cvf_it  = mesh_.cvf_begin(vhandle[1]);
-  Mesh::ConstVertexFaceIter cvf_end = mesh_.cvf_end(vhandle[1]);
-  EXPECT_EQ(3, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at initialization";
-  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at initialization";
-  ++cvf_it ;
-  EXPECT_EQ(1, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step 1";
-  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step 1";
-  ++cvf_it ;
-  EXPECT_EQ(2, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step 2";
-  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step 2";
-  ++cvf_it ;
-  EXPECT_EQ(0, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step 3";
-  EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step 3";
-  ++cvf_it ;
-  EXPECT_EQ(3, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at end";
-  EXPECT_FALSE(cvf_it) << "Iterator not invalid in VertexFaceIter at end";
-  EXPECT_TRUE( cvf_it == cvf_end )  << "End iterator for ConstVertexFaceIter not matching";
-
-
-}
-
-/*
- * Small FaceFaceIterator Test with holes in it
- */
-TEST_F(OpenMeshIterators, FaceFaceIterWithHoles) {
-
-  mesh_.clear();
-
-  // Add some vertices
-  Mesh::VertexHandle vhandle[5];
-
-  vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
-  vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
-  vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
-  vhandle[3] = mesh_.add_vertex(Mesh::Point(3, 0, 0));
-  vhandle[4] = mesh_.add_vertex(Mesh::Point(4, 1, 0));
-
-  // Add three faces
-  std::vector<Mesh::VertexHandle> face_vhandles;
-
-  face_vhandles.push_back(vhandle[0]);
-  face_vhandles.push_back(vhandle[1]);
-  face_vhandles.push_back(vhandle[2]);
-  mesh_.add_face(face_vhandles);
-
-  face_vhandles.clear();
-
-  face_vhandles.push_back(vhandle[2]);
-  face_vhandles.push_back(vhandle[1]);
-  face_vhandles.push_back(vhandle[3]);
-  mesh_.add_face(face_vhandles);
-
-  face_vhandles.clear();
-
-  face_vhandles.push_back(vhandle[2]);
-  face_vhandles.push_back(vhandle[3]);
-  face_vhandles.push_back(vhandle[4]);
-  mesh_.add_face(face_vhandles);
-
-  /* Test setup:
-   *
-   * 0 ------ 2 ------ 4
-   *  \      / \      /
-   *   \  0 /   \  2 /
-   *    \  /  1  \  /
-   *     1 ------- 3
-   */
-
-
-  Mesh::FaceFaceIter ff_it  = mesh_.ff_begin(mesh_.face_handle(1));
-  Mesh::FaceFaceIter ff_end = mesh_.ff_end(mesh_.face_handle(1));
-
-  EXPECT_EQ(2, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at initialization";
-  EXPECT_TRUE(ff_it) << "Iterator invalid in FaceFaceIter at initialization";
-  ++ff_it;
-  EXPECT_EQ(0, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at step 1";
-  EXPECT_TRUE(ff_it) << "Iterator invalid in FaceFaceIter at step 1";
-  ++ff_it;
-  EXPECT_EQ(2, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at end";
-  EXPECT_FALSE(ff_it) << "Iterator invalid in FaceFaceIter at end";
-  EXPECT_TRUE( ff_it == ff_end )  << "End iterator for FaceFaceIter not matching";
-
-  Mesh::ConstFaceFaceIter cff_it  = mesh_.cff_begin(mesh_.face_handle(1));
-  Mesh::ConstFaceFaceIter cff_end = mesh_.cff_end(mesh_.face_handle(1));
-
-  EXPECT_EQ(2, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at initialization";
-  EXPECT_TRUE(cff_it) << "Iterator invalid in ConstFaceFaceIter at initialization";
-  ++cff_it;
-  EXPECT_EQ(0, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at step 1";
-  EXPECT_TRUE(cff_it) << "Iterator invalid in ConstFaceFaceIter at step 1";
-  ++cff_it;
-  EXPECT_EQ(2, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at end";
-  EXPECT_FALSE(cff_it) << "Iterator invalid in ConstFaceFaceIter at end";
-  EXPECT_TRUE( cff_it == cff_end )  << "End iterator for ConstFaceFaceIter not matching";
-
-}
-
-/*
- * Small FaceFaceIterator Test with holes in it
- */
-TEST_F(OpenMeshIterators, FaceFaceIterWithoutHoles) {
-
-  mesh_.clear();
-
-  // Add some vertices
-  Mesh::VertexHandle vhandle[6];
-
-  vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
-  vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
-  vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
-  vhandle[3] = mesh_.add_vertex(Mesh::Point(3, 0, 0));
-  vhandle[4] = mesh_.add_vertex(Mesh::Point(4, 1, 0));
-  vhandle[5] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
-
-  // Add three faces
-  std::vector<Mesh::VertexHandle> face_vhandles;
-
-  face_vhandles.push_back(vhandle[0]);
-  face_vhandles.push_back(vhandle[1]);
-  face_vhandles.push_back(vhandle[2]);
-  mesh_.add_face(face_vhandles);
-
-  face_vhandles.clear();
-
-  face_vhandles.push_back(vhandle[2]);
-  face_vhandles.push_back(vhandle[1]);
-  face_vhandles.push_back(vhandle[3]);
-  mesh_.add_face(face_vhandles);
-
-  face_vhandles.clear();
-
-  face_vhandles.push_back(vhandle[2]);
-  face_vhandles.push_back(vhandle[3]);
-  face_vhandles.push_back(vhandle[4]);
-  mesh_.add_face(face_vhandles);
-
-  face_vhandles.clear();
-
-  face_vhandles.push_back(vhandle[1]);
-  face_vhandles.push_back(vhandle[5]);
-  face_vhandles.push_back(vhandle[3]);
-  mesh_.add_face(face_vhandles);
-
-  /* Test setup:
-   *
-   * 0 ------ 2 ------ 4
-   *  \      / \      /
-   *   \  0 /   \  2 /
-   *    \  /  1  \  /
-   *     1 ------- 3
-   *      \       /
-   *       \  3  /
-   *        \   /
-   *         \ /
-   *          5
-   */
-
-
-  Mesh::FaceFaceIter ff_it  = mesh_.ff_begin(mesh_.face_handle(1));
-  Mesh::FaceFaceIter ff_end = mesh_.ff_end(mesh_.face_handle(1));
-
-  EXPECT_EQ(2, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at initialization";
-  EXPECT_TRUE(ff_it) << "Iterator invalid in FaceFaceIter at initialization";
-  ++ff_it;
-  EXPECT_EQ(0, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at step 1";
-  EXPECT_TRUE(ff_it) << "Iterator invalid in FaceFaceIter at step 1";
-  ++ff_it;
-  EXPECT_EQ(3, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at step 2";
-  EXPECT_TRUE(ff_it) << "Iterator invalid in FaceFaceIter at step 2";
-  ++ff_it;
-  EXPECT_EQ(2, ff_it.handle().idx() ) << "Index wrong in FaceFaceIter at end";
-  EXPECT_FALSE(ff_it) << "Iterator invalid in FaceFaceIter at end";
-  EXPECT_TRUE( ff_it == ff_end )  << "End iterator for FaceFaceIter not matching";
-
-  Mesh::ConstFaceFaceIter cff_it  = mesh_.cff_begin(mesh_.face_handle(1));
-  Mesh::ConstFaceFaceIter cff_end = mesh_.cff_end(mesh_.face_handle(1));
-
-  EXPECT_EQ(2, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at initialization";
-  EXPECT_TRUE(cff_it) << "Iterator invalid in ConstFaceFaceIter at initialization";
-  ++cff_it;
-  EXPECT_EQ(0, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at step 1";
-  EXPECT_TRUE(cff_it) << "Iterator invalid in ConstFaceFaceIter at step 1";
-  ++cff_it;
-  EXPECT_EQ(3, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at step 2";
-  EXPECT_TRUE(cff_it) << "Iterator invalid in ConstFaceFaceIter at step 2";
-  ++cff_it;
-  EXPECT_EQ(2, cff_it.handle().idx() ) << "Index wrong in ConstFaceFaceIter at end";
-  EXPECT_FALSE(cff_it) << "Iterator invalid in ConstFaceFaceIter at end";
-  EXPECT_TRUE( cff_it == cff_end )  << "End iterator for ConstFaceFaceIter not matching";
-
-}
-
-
-
-
-
 #endif // INCLUDE GUARD