Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new dereferencing in unittests

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@897 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-08-07 09:28:18 +00:00
parent 17fdd5a08c
commit 1c8d4fb59b
12 changed files with 196 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Unittests/unittests_trimesh_circulator_vertex_edge.hh
View File

@@ -89,38 +89,38 @@ TEST_F(OpenMeshTrimeshCirculatorVertexEdge, VertexEdgeIterWithoutHolesIncrement)
// Iterate around vertex 1 at the middle (with holes in between)
Mesh::VertexEdgeIter ve_it = mesh_.ve_begin(vhandle[1]);
Mesh::VertexEdgeIter ve_end = mesh_.ve_end(vhandle[1]);
EXPECT_EQ(5, ve_it.handle().idx() ) << "Index wrong in VertexEdgeIter at initialization";
EXPECT_EQ(5, ve_it->idx() ) << "Index wrong in VertexEdgeIter at initialization";
EXPECT_TRUE(ve_it) << "Iterator invalid in VertexEdgeIter at initialization";
++ve_it ;
EXPECT_EQ(3, ve_it.handle().idx() ) << "Index wrong in VertexEdgeIter at step 1";
EXPECT_EQ(3, ve_it->idx() ) << "Index wrong in VertexEdgeIter at step 1";
EXPECT_TRUE(ve_it) << "Iterator invalid in VertexEdgeIter at step 1";
++ve_it ;
EXPECT_EQ(0, ve_it.handle().idx() ) << "Index wrong in VertexEdgeIter at step 2";
EXPECT_EQ(0, ve_it->idx() ) << "Index wrong in VertexEdgeIter at step 2";
EXPECT_TRUE(ve_it) << "Iterator invalid in VertexEdgeIter at step 2";
++ve_it ;
EXPECT_EQ(1, ve_it.handle().idx() ) << "Index wrong in VertexEdgeIter at step 3";
EXPECT_EQ(1, ve_it->idx() ) << "Index wrong in VertexEdgeIter at step 3";
EXPECT_TRUE(ve_it) << "Iterator invalid in VertexEdgeIter at step 3";
++ve_it ;
EXPECT_EQ(5, ve_it.handle().idx() ) << "Index wrong in VertexEdgeIter at end";
EXPECT_EQ(5, ve_it->idx() ) << "Index wrong in VertexEdgeIter at end";
EXPECT_FALSE(ve_it) << "Iterator not invalid in VertexEdgeIter at end";
EXPECT_TRUE( ve_it == ve_end ) << "End iterator for VertexEdgeIter not matching";
// Iterate around vertex 1 at the middle (with holes in between) with const iterator
Mesh::ConstVertexEdgeIter cve_it = mesh_.cve_begin(vhandle[1]);
Mesh::ConstVertexEdgeIter cve_end = mesh_.cve_end(vhandle[1]);
EXPECT_EQ(5, cve_it.handle().idx() ) << "Index wrong in ConstVertexEdgeIter at initialization";
EXPECT_EQ(5, cve_it->idx() ) << "Index wrong in ConstVertexEdgeIter at initialization";
EXPECT_TRUE(cve_it) << "Iterator invalid in ConstVertexEdgeIter at initialization";
++cve_it ;
EXPECT_EQ(3, cve_it.handle().idx() ) << "Index wrong in ConstVertexEdgeIter at step 1";
EXPECT_EQ(3, cve_it->idx() ) << "Index wrong in ConstVertexEdgeIter at step 1";
EXPECT_TRUE(cve_it) << "Iterator invalid in ConstVertexEdgeIter at step 1";
++cve_it ;
EXPECT_EQ(0, cve_it.handle().idx() ) << "Index wrong in ConstVertexEdgeIter at step 2";
EXPECT_EQ(0, cve_it->idx() ) << "Index wrong in ConstVertexEdgeIter at step 2";
EXPECT_TRUE(cve_it) << "Iterator invalid in ConstVertexEdgeIter at step 2";
++cve_it ;
EXPECT_EQ(1, cve_it.handle().idx() ) << "Index wrong in ConstVertexEdgeIter at step 3";
EXPECT_EQ(1, cve_it->idx() ) << "Index wrong in ConstVertexEdgeIter at step 3";
EXPECT_TRUE(cve_it) << "Iterator invalid in ConstVertexEdgeIter at step 3";
++cve_it ;
EXPECT_EQ(5, cve_it.handle().idx() ) << "Index wrong in ConstVertexEdgeIter at end";
EXPECT_EQ(5, cve_it->idx() ) << "Index wrong in ConstVertexEdgeIter at end";
EXPECT_FALSE(cve_it) << "Iterator not invalid in VertexEdgeIter at end";
EXPECT_TRUE( cve_it == cve_end ) << "End iterator for ConstVertexEdgeIter not matching";
}
@@ -182,16 +182,16 @@ TEST_F(OpenMeshTrimeshCirculatorVertexEdge, VertexEdgeIterBoundaryIncrement) {
// Iterate around vertex 1 at the middle (with holes in between)
Mesh::VertexEdgeIter ve_it = mesh_.ve_begin(vhandle[2]);
Mesh::VertexEdgeIter ve_end = mesh_.ve_end(vhandle[2]);
EXPECT_EQ(7, ve_it.handle().idx() ) << "Index wrong in VertexEdgeIter at initialization";
EXPECT_EQ(7, ve_it->idx() ) << "Index wrong in VertexEdgeIter at initialization";
EXPECT_TRUE(ve_it) << "Iterator invalid in VertexEdgeIter at initialization";
++ve_it ;
EXPECT_EQ(1, ve_it.handle().idx() ) << "Index wrong in VertexEdgeIter at step 1";
EXPECT_EQ(1, ve_it->idx() ) << "Index wrong in VertexEdgeIter at step 1";
EXPECT_TRUE(ve_it) << "Iterator invalid in VertexEdgeIter at step 1";
++ve_it ;
EXPECT_EQ(2, ve_it.handle().idx() ) << "Index wrong in VertexEdgeIter at step 2";
EXPECT_EQ(2, ve_it->idx() ) << "Index wrong in VertexEdgeIter at step 2";
EXPECT_TRUE(ve_it) << "Iterator invalid in VertexEdgeIter at step 2";
++ve_it ;
EXPECT_EQ(7, ve_it.handle().idx() ) << "Index wrong in VertexEdgeIter at step 3";
EXPECT_EQ(7, ve_it->idx() ) << "Index wrong in VertexEdgeIter at step 3";
EXPECT_FALSE(ve_it) << "Iterator not invalid in VertexEdgeIter at end";
EXPECT_TRUE( ve_it == ve_end ) << "End iterator for VertexEdgeIter not matching";