added test for operator--()

This commit is contained in:
Mariette Yvinec 1999-08-02 16:41:32 +00:00
parent 96c3623a49
commit 5df8a6d495
1 changed files with 42 additions and 1 deletions

View File

@ -52,8 +52,23 @@ _test_cls_face_iterator( const Triangulation &T )
n_finite++;
assert(n_finite == T.number_of_faces());
//test for operator -- and pre incrementation decrementation
if(n_finite==0) assert(fit == T.finite_vertices_end());
else if (n_finite >1) {
fit = T.finite_faces_begin();
fit++;fit--;assert(fit== T.finite_faces_begin());
assert(&(*fit) == &(*(fit++)));
assert(&(*fit) == &(*(fit--)));
assert(fit== T.finite_faces_begin());
for (int i = 0 ; i < n_finite-1 ; ++i) ++fit;
for (int i = 0 ; i < n_finite-1 ; ++i) --fit;
assert(fit == T.finite_faces_begin());
fit--; assert(fit == T.finite_faces_end());
}
return n_finite;
}
}
template < class Triangulation >
@ -69,6 +84,19 @@ _test_cls_vertex_iterator( const Triangulation &T )
n++;
assert( n == T.number_of_vertices() );
vit = T.finite_vertices_begin();
if(n==0) assert(vit == T.finite_vertices_end());
else if (n > 1){
vit++; vit--; assert(vit== T.finite_vertices_begin());
assert(&(*vit) == &(*(vit++)));
assert(&(*vit) == &(*(vit--)));
assert(vit== T.finite_vertices_begin());
for (int i = 0 ; i < n-1 ; ++i) ++vit;
for (int i = 0 ; i < n-1 ; ++i) --vit;
assert(vit == T.finite_vertices_begin());
--vit; assert(vit == T.finite_vertices_end());
}
return n;
}
@ -83,6 +111,19 @@ _test_cls_edge_iterator( const Triangulation &T )
Finite_edges_iterator eit;
for (eit = T.finite_edges_begin(); eit != T.finite_edges_end(); ++eit)
n++;
eit = T.finite_edges_begin();
if(n==0) assert(eit == T.finite_edges_end());
else if ( n > 1 ){
eit++; eit--; assert(eit== T.finite_edges_begin());
//assert(*eit == *(eit++));
//assert(*eit == *(eit--));
assert(eit== T.finite_edges_begin());
for (int i = 0 ; i < n-1 ; ++i) ++eit;
for (int i = 0 ; i < n-1 ; ++i) --eit;
assert(eit == T.finite_edges_begin());
--eit; assert(eit == T.finite_edges_end());
}
return n;
}