- changed lap_counter to int type

- extent circulator unittests for endings testing now the cases: (--endIter).is_valid and (++(--startIter)).is_valid

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1226 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Matthias Möller
2015-02-19 15:47:21 +00:00
parent 1af153e52d
commit 0f9b4c2358
10 changed files with 131 additions and 29 deletions

View File

@@ -328,6 +328,13 @@ TEST_F(OpenMeshTrimeshCirculatorVertexFace, VertexFaceIterCheckInvalidationAtEnd
++endIter ;
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
// Check if the end iterators becomes valid after decrement
endIter = mesh_.vf_end(vhandle[1]);
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
--endIter;
EXPECT_TRUE(endIter.is_valid()) << "EndIter is invalid after decrement";
EXPECT_EQ(0,endIter->idx()) << "EndIter points on the wrong element";
// Check if the start iterator decrement is invalid
Mesh::VertexFaceIter startIter = mesh_.vf_begin(vhandle[1]);
@@ -335,6 +342,11 @@ TEST_F(OpenMeshTrimeshCirculatorVertexFace, VertexFaceIterCheckInvalidationAtEnd
--startIter;
EXPECT_FALSE(startIter.is_valid()) << "StartIter decrement is not invalid";
// Check if the start iterator becomes valid
++startIter;
EXPECT_TRUE(startIter.is_valid()) << "StarIter is invalid after re-incrementing";
EXPECT_EQ(startIter->idx(), mesh_.vf_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
}
/*
@@ -439,6 +451,4 @@ TEST_F(OpenMeshTrimeshCirculatorVertexFace, VertexFaceIterWithoutHolesDecrement)
}
}