refs #1382

- Fixed the problem that the end iterator could become valid again if it was incremented.
- Decrementing the start iterator will return an invalid iterator now (Maybe we can implement reverse iterators)
- Removed one check from the iteration, which should result in faster execution of is_valid().



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

src/Unittests/unittests_trimesh_circulator_face_edge.cc

@@ -129,6 +129,80 @@ TEST_F(OpenMeshTrimeshCirculatorFaceEdge, FaceEdgeIterWithoutHolesIncrement) {
 }
 }
 
+
+/*
+ * Test if the end iterator stays invalid after one lap
+ */
+TEST_F(OpenMeshTrimeshCirculatorFaceEdge, FaceEdgeIterCheckInvalidationAtEnds) {
+
+  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::FaceHandle fh0 = 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 */
+
+
+  // Check if the end iterator stays invalid after end
+  Mesh::FaceEdgeIter endIter = mesh_.fe_end(fh0);
+  EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
+  ++endIter ;
+  EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
+
+
+  // Check if the start iterator decrement is invalid
+  Mesh::FaceEdgeIter startIter = mesh_.fe_begin(fh0);
+  EXPECT_TRUE(startIter.is_valid()) << "StartIter is not valid";
+  --startIter;
+  EXPECT_FALSE(startIter.is_valid()) << "StartIter decrement is not invalid";
+
+}
+
+
+
+
 /*
  * Small FaceEdgeIterator Test
  */