songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

manual removal of last CGAL_assertion_code in tests 

according to our guidelines, we should use assert so no need for
CGAL_assertion_code

for lines containing () or multi-line
This commit is contained in:
Sébastien Loriot 2013-03-21 10:31:55 +01:00
parent 08d6ec062f
commit 1fcb9e56c3
5 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Convex_decomposition_3/test/Convex_decomposition_3/edge_sorter.cpp
View File

@ -106,7 +106,7 @@ int main()
e7->set_twin(t7);
t7->set_twin(e7);
CGAL_assertion_code(std::less<Point_3> Less);
std::less<Point_3> Less;
SplitTest st;
Report_new_vertex<LEdge, LVertex> rnv;
GesSM gesSM;

8
HalfedgeDS/test/HalfedgeDS/test_hds.cpp
View File

@ -65,7 +65,7 @@ void test_HalfedgeDS_polyhedron_default() {
CGAL_assertion( hds.size_of_border_halfedges() == 1);
CGAL_assertion( hds.size_of_border_edges() == 1);
typedef HDS::Halfedge_iterator Halfedge_iterator;
CGAL_assertion_code( Halfedge_iterator i = hds.halfedges_begin(); )
Halfedge_iterator i = hds.halfedges_begin();
CGAL_assertion(!(i == hds.halfedges_end()));
}
void test_HalfedgeDS_default() {
@ -92,14 +92,14 @@ void test_HalfedgeDS_default() {
CGAL_assertion( D.is_valid( false, 4));
HDS hds2(hds); // copy constructor.
CGAL_assertion_code( Decorator D2(hds2); )
Decorator D2(hds2);
CGAL_assertion( D2.is_valid( false, 4));
hds = hds2; // assignment.
CGAL_assertion( D.is_valid( false, 4));
typedef HDS::Halfedge_iterator Halfedge_iterator;
CGAL_assertion_code( Halfedge_iterator i = hds.halfedges_begin(); )
Halfedge_iterator i = hds.halfedges_begin();
CGAL_assertion(!(i == hds.halfedges_end()));
}
@ -137,7 +137,7 @@ void test_HalfedgeDS_vector() {
CGAL_assertion( D.is_valid( false, 4));
HDS hds2(hds); // copy constructor.
CGAL_assertion_code( Decorator D2(hds2); )
Decorator D2(hds2);
CGAL_assertion( D2.is_valid( false, 4));
hds = hds2; // assignment.

12
HalfedgeDS/test/HalfedgeDS/test_hds_decorator.cpp
View File

@ -89,8 +89,8 @@ void test_HalfedgeDS_decorator() {
decorator.split_vertex( g2, g->opposite());
CGAL_assertion( decorator.is_valid( false, 4));
CGAL_assertion( g->next()->next()->next()->next() == g);
CGAL_assertion_code( Halfedge_handle g3 =
decorator.split_face( g2->next()->opposite(), h); )
Halfedge_handle g3 =
decorator.split_face( g2->next()->opposite(), h);
CGAL_assertion( decorator.is_valid( false, 4));
CGAL_assertion( g->next()->next()->next()->next() == g);
CGAL_assertion( h->next()->next()->next() == h);
@ -100,7 +100,7 @@ void test_HalfedgeDS_decorator() {
CGAL_assertion( g3->opposite() == h->next());
// Edge flip within the triangle.
CGAL_assertion_code( Halfedge_handle g4 = decorator.flip_edge( g3); )
Halfedge_handle g4 = decorator.flip_edge( g3);
CGAL_assertion( decorator.is_valid( false, 4));
CGAL_assertion( g4 == g3);
CGAL_assertion( g3->next()->next() == g2->opposite());
@ -209,8 +209,8 @@ void test_HalfedgeDS_decorator2() {
hds.normalize_border();
CGAL_assertion( decorator.is_valid( false, 4));
CGAL_assertion( g->next()->next()->next()->next() == g);
CGAL_assertion_code( Halfedge_handle g3 =
decorator.split_face( g2->next()->opposite(), h); )
Halfedge_handle g3 =
decorator.split_face( g2->next()->opposite(), h);
hds.normalize_border();
CGAL_assertion( decorator.is_valid( false, 4));
CGAL_assertion( g->next()->next()->next()->next() == g);
@ -221,7 +221,7 @@ void test_HalfedgeDS_decorator2() {
CGAL_assertion( g3->opposite() == h->next());
// Edge flip within the triangle.
CGAL_assertion_code( Halfedge_handle g4 = decorator.flip_edge( g3); )
Halfedge_handle g4 = decorator.flip_edge( g3);
CGAL_assertion( decorator.is_valid( false, 3));
hds.normalize_border();
CGAL_assertion( decorator.is_valid( false, 4));

76
Polyhedron/test/Polyhedron/test_polyhedron.cpp
View File

@ -191,7 +191,7 @@ Build_tetrahedron_3<HDS>:: operator()( HDS& target) {
std::size_t t5[] = { 2, 4, 5}; // non-manifold at vertex
(void)t5; // suppress warning about unused t5
CGAL_assertion( ! B.test_facet( t5, t5+3));
CGAL_assertion_code( bool removed = B.remove_unconnected_vertices();)
bool removed = B.remove_unconnected_vertices();
CGAL_assertion( removed);
B.end_surface();
}
@ -357,7 +357,7 @@ void test_Polyhedron() {
Polyhedron P;
Halfedge_handle hh = P.make_triangle(); // Check handle.
CGAL_assertion_code( Halfedge_const_handle hch(hh);)
Halfedge_const_handle hch(hh);
CGAL_assertion( P.is_triangle( hh));
CGAL_assertion( P.is_triangle( hch));
CGAL_assertion( P.is_triangle( HDS::halfedge_handle(&*hh)));
@ -368,22 +368,22 @@ void test_Polyhedron() {
Halfedge_iterator hi(hh); // Check Iterator.
CGAL_assertion( P.is_triangle( hi));
CGAL_assertion_code( Halfedge_const_iterator hci(hh);)
Halfedge_const_iterator hci(hh);
CGAL_assertion( P.is_triangle( hci));
CGAL_assertion_code( Edge_iterator ei(hh);) // Check Edge Iterator.
Edge_iterator ei(hh); // Check Edge Iterator.
CGAL_assertion( P.is_triangle( ei));
CGAL_assertion_code( Edge_const_iterator eci(hh);)
Edge_const_iterator eci(hh);
CGAL_assertion( P.is_triangle( eci));
Halfedge_around_facet_circulator hfc(hh); // Check circulator 1.
CGAL_assertion( P.is_triangle( hfc));
CGAL_assertion_code( Halfedge_around_facet_const_circulator hfcc(hh);)
Halfedge_around_facet_const_circulator hfcc(hh);
CGAL_assertion( P.is_triangle( hfcc));
Halfedge_around_vertex_circulator hvc(hh); // Check circulator 2.
CGAL_assertion( P.is_triangle( hvc));
CGAL_assertion_code( Halfedge_around_vertex_const_circulator hvcc(hh);)
Halfedge_around_vertex_const_circulator hvcc(hh);
CGAL_assertion( P.is_triangle( hvcc));
@ -401,33 +401,33 @@ void test_Polyhedron() {
PolyhedronV P;
// Check handle.
CGAL_assertion_code( HalfedgeV_handle hh = P.make_triangle();)
CGAL_assertion_code( HalfedgeV_const_handle hch(hh);)
HalfedgeV_handle hh = P.make_triangle();
HalfedgeV_const_handle hch(hh);
CGAL_assertion( P.is_triangle( hh));
CGAL_assertion( P.is_triangle( hch));
CGAL_assertion( P.is_triangle( HDSV::halfedge_handle(&*hh)));
CGAL_assertion( P.is_triangle( HDSV::halfedge_handle(&*hch)));
CGAL_assertion_code( HalfedgeV_iterator hi(hh);) // Check Iterator.
HalfedgeV_iterator hi(hh); // Check Iterator.
CGAL_assertion( P.is_triangle( hi));
CGAL_assertion_code( HalfedgeV_const_iterator hci(hh);)
HalfedgeV_const_iterator hci(hh);
CGAL_assertion( P.is_triangle( hci));
CGAL_assertion_code( EdgeV_iterator ei(hh);) // Check Edge Iterator.
EdgeV_iterator ei(hh); // Check Edge Iterator.
CGAL_assertion( P.is_triangle( ei));
CGAL_assertion_code( EdgeV_const_iterator eci(hh);)
EdgeV_const_iterator eci(hh);
CGAL_assertion( P.is_triangle( eci));
// Check circulator 1.
CGAL_assertion_code( HalfedgeV_around_facet_circulator hfc(hh);)
HalfedgeV_around_facet_circulator hfc(hh);
CGAL_assertion( P.is_triangle( hfc));
CGAL_assertion_code( HalfedgeV_around_facet_const_circulator hfcc(hh);)
HalfedgeV_around_facet_const_circulator hfcc(hh);
CGAL_assertion( P.is_triangle( hfcc));
// Check circulator 2.
CGAL_assertion_code( HalfedgeV_around_vertex_circulator hvc(hh);)
HalfedgeV_around_vertex_circulator hvc(hh);
CGAL_assertion( P.is_triangle( hvc));
CGAL_assertion_code(HalfedgeV_around_vertex_const_circulator hvcc(hh);)
HalfedgeV_around_vertex_const_circulator hvcc(hh);
CGAL_assertion( P.is_triangle( hvcc));
}
{
@ -475,7 +475,7 @@ void test_Polyhedron() {
CGAL_assertion( P.is_pure_triangle());
CGAL_assertion( 2 == halfedgeds_connected_components(P,
CGAL::Emptyset_iterator()));
CGAL_assertion_code( const Polyhedron& Pq(P);)
const Polyhedron& Pq(P);
CGAL_assertion( 2 == halfedgeds_connected_components(Pq,
CGAL::Emptyset_iterator()));
P.normalize_border();
@ -528,9 +528,9 @@ void test_Polyhedron() {
{
// Check the predefined point iterator
Polyhedron P;
CGAL_assertion_code( Halfedge_handle h = P.make_tetrahedron(
Halfedge_handle h = P.make_tetrahedron(
Point( 1.0, 0.0, 0.0), Point( 0.0, 1.0, 0.0),
Point( 0.0, 0.0, 1.0), Point( 0.0, 0.0, 0.0));)
Point( 0.0, 0.0, 1.0), Point( 0.0, 0.0, 0.0));
CGAL_assertion( P.is_valid());
CGAL_assertion( P.is_tetrahedron( h));
CGAL_assertion( P.is_pure_trivalent());
@ -549,9 +549,9 @@ void test_Polyhedron() {
{
// Check the predefined point const_iterator
Polyhedron P;
CGAL_assertion_code( Halfedge_handle h = P.make_tetrahedron(
Halfedge_handle h = P.make_tetrahedron(
Point( 1.0, 0.0, 0.0), Point( 0.0, 1.0, 0.0),
Point( 0.0, 0.0, 1.0), Point( 0.0, 0.0, 0.0));)
Point( 0.0, 0.0, 1.0), Point( 0.0, 0.0, 0.0));
CGAL_assertion( P.is_valid());
CGAL_assertion( P.is_tetrahedron( h));
typedef Polyhedron::Point_const_iterator Point_const_iterator;
@ -590,7 +590,7 @@ void test_Polyhedron() {
{
// Check the predefined plane const_iterator
Polyhedron P;
CGAL_assertion_code( Halfedge_handle h = P.make_tetrahedron();)
Halfedge_handle h = P.make_tetrahedron();
CGAL_assertion( P.is_valid());
CGAL_assertion( P.is_tetrahedron( h));
typedef Polyhedron::Plane_iterator Plane_iterator;
@ -614,9 +614,9 @@ void test_Polyhedron() {
{
// Check the easy creation of a point iterator.
Polyhedron P;
CGAL_assertion_code( Halfedge_handle h = P.make_tetrahedron(
Halfedge_handle h = P.make_tetrahedron(
Point( 1.0, 0.0, 0.0), Point( 0.0, 1.0, 0.0),
Point( 0.0, 0.0, 1.0), Point( 0.0, 0.0, 0.0));)
Point( 0.0, 0.0, 1.0), Point( 0.0, 0.0, 0.0));
CGAL_assertion( P.is_valid());
CGAL_assertion( P.is_tetrahedron( h));
@ -638,22 +638,22 @@ void test_Polyhedron() {
{
// Check border facet generation.
Polyhedron P;
CGAL_assertion_code( Halfedge_handle h = P.make_triangle();)
Halfedge_handle h = P.make_triangle();
CGAL_assertion( P.is_valid());
CGAL_assertion( P.is_triangle( h));
CGAL_assertion_code( Halfedge_handle g =
Halfedge_handle g =
P.add_vertex_and_facet_to_border(
h->next()->opposite(),
h->opposite());)
h->opposite());
CGAL_assertion( P.is_valid());
CGAL_assertion( h->next()->next()->next() == h);
CGAL_assertion( g->next()->next()->next() == g);
CGAL_assertion( h->opposite()->next() == g);
CGAL_assertion_code( Halfedge_handle gg = P.add_facet_to_border(
Halfedge_handle gg = P.add_facet_to_border(
h->next()->next()->opposite(),
g->next()->opposite());)
g->next()->opposite());
CGAL_assertion( P.is_valid());
CGAL_assertion( h->next()->next()->next() == h);
CGAL_assertion( g->next()->next()->next() == g);
@ -830,7 +830,7 @@ void test_Polyhedron() {
CGAL_assertion( P.is_valid());
CGAL_assertion( P.is_tetrahedron( h));
g = P.make_tetrahedron();
CGAL_assertion_code( Halfedge_handle gg = g->opposite()->next();)
Halfedge_handle gg = g->opposite()->next();
CGAL_assertion( P.size_of_vertices() == 8);
CGAL_assertion( P.size_of_halfedges() == 24);
CGAL_assertion( P.size_of_facets() == 8);
@ -955,7 +955,7 @@ void test_Polyhedron() {
CGAL_assertion( P.is_valid());
CGAL_assertion( P.is_tetrahedron( h));
g = P.make_tetrahedron();
CGAL_assertion_code( HalfedgeL_handle gg = g->opposite()->next();)
HalfedgeL_handle gg = g->opposite()->next();
CGAL_assertion( P.size_of_vertices() == 8);
CGAL_assertion( P.size_of_halfedges() == 24);
CGAL_assertion( P.size_of_facets() == 8);
@ -1220,22 +1220,22 @@ void test_min_Polyhedron() {
{
// Check border facet generation.
Polyhedron P;
CGAL_assertion_code( Halfedge_handle h = P.make_triangle();)
Halfedge_handle h = P.make_triangle();
CGAL_assertion( P.is_valid());
CGAL_assertion( P.is_triangle( h));
CGAL_assertion_code( Halfedge_handle g =
Halfedge_handle g =
P.add_vertex_and_facet_to_border(
h->next()->opposite(),
h->opposite());)
h->opposite());
CGAL_assertion( P.is_valid());
CGAL_assertion( h->next()->next()->next() == h);
CGAL_assertion( g->next()->next()->next() == g);
CGAL_assertion( h->opposite()->next() == g);
CGAL_assertion_code( Halfedge_handle gg = P.add_facet_to_border(
Halfedge_handle gg = P.add_facet_to_border(
h->next()->next()->opposite(),
g->next()->opposite());)
g->next()->opposite());
CGAL_assertion( P.is_valid());
CGAL_assertion( h->next()->next()->next() == h);
CGAL_assertion( g->next()->next()->next() == g);
@ -1352,7 +1352,7 @@ void test_min_Polyhedron() {
CGAL_assertion( P.is_valid());
CGAL_assertion( P.is_tetrahedron( h));
g = P.make_tetrahedron();
CGAL_assertion_code( Halfedge_handle gg = g->opposite()->next();)
Halfedge_handle gg = g->opposite()->next();
CGAL_assertion( P.size_of_vertices() == 8);
CGAL_assertion( P.size_of_halfedges() == 24);
CGAL_assertion( P.size_of_facets() == 8);

56
STL_Extension/test/STL_Extension/test_stl_extension.cpp
View File

@ -972,12 +972,12 @@ l2.destroy();
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == begin[k]);
}
CGAL_assertion_code(
int su = begin[0]
+ begin[1]
+ begin[2]
+ begin[3]
+ begin[4];)
int su = begin[0]
+ begin[1]
+ begin[2]
+ begin[3]
+ begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -1223,12 +1223,12 @@ Assert_random_access_category(c_begin);
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == c_begin[k]);
}
CGAL_assertion_code(
int su = c_begin[0]
+ c_begin[1]
+ c_begin[2]
+ c_begin[3]
+ c_begin[4];)
+ c_begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -2308,12 +2308,12 @@ void test_Iterator_project()
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == begin[k]);
}
CGAL_assertion_code(
int su = begin[0]
+ begin[1]
+ begin[2]
+ begin[3]
+ begin[4];)
+ begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -2505,12 +2505,12 @@ void test_Iterator_project()
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == c_begin[k]);
}
CGAL_assertion_code(
int su = c_begin[0]
+ c_begin[1]
+ c_begin[2]
+ c_begin[3]
+ c_begin[4];)
+ c_begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -4517,12 +4517,12 @@ l2.destroy();
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == begin[k]);
}
CGAL_assertion_code(
int su = begin[0]
+ begin[1]
+ begin[2]
+ begin[3]
+ begin[4];)
+ begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -4768,12 +4768,12 @@ Assert_random_access_category(c_begin);
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == c_begin[k]);
}
CGAL_assertion_code(
int su = c_begin[0]
+ c_begin[1]
+ c_begin[2]
+ c_begin[3]
+ c_begin[4];)
+ c_begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -5809,12 +5809,12 @@ l2.destroy();
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == begin[k]);
}
CGAL_assertion_code(
int su = begin[0]
+ begin[1]
+ begin[2]
+ begin[3]
+ begin[4];)
+ begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -6003,12 +6003,12 @@ l2.destroy();
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == c_begin[k]);
}
CGAL_assertion_code(
int su = c_begin[0]
+ c_begin[1]
+ c_begin[2]
+ c_begin[3]
+ c_begin[4];)
+ c_begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -6375,12 +6375,12 @@ l2.destroy();
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == begin[k]);
}
CGAL_assertion_code(
int su = begin[0]
+ begin[1]
+ begin[2]
+ begin[3]
+ begin[4];)
+ begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -6625,12 +6625,12 @@ Assert_random_access_category(c_begin);
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == c_begin[k]);
}
CGAL_assertion_code(
int su = c_begin[0]
+ c_begin[1]
+ c_begin[2]
+ c_begin[3]
+ c_begin[4];)
+ c_begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -7376,12 +7376,12 @@ void test_N_step_adaptor_derived() {
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == begin[k]);
}
CGAL_assertion_code(
int su = begin[0]
+ begin[1]
+ begin[2]
+ begin[3]
+ begin[4];)
+ begin[4];
CGAL_assertion( su == 15);
// Jump around.
@ -7626,12 +7626,12 @@ void test_N_step_adaptor_derived() {
for( k = 0; k < 5; k++) {
CGAL_assertion( 1+k == c_begin[k]);
}
CGAL_assertion_code(
int su = c_begin[0]
+ c_begin[1]
+ c_begin[2]
+ c_begin[3]
+ c_begin[4];)
+ c_begin[4];
CGAL_assertion( su == 15);
// Jump around.