From 440e135e3a3e90d9ef826d4a910cefcbfc22195b Mon Sep 17 00:00:00 2001 From: John Beard Date: Wed, 17 Apr 2019 11:46:38 +0100 Subject: [PATCH] QA: Remove expected failure from fixed tests Commit 55fcbddde8205acb9832ccd5fc441b70ff6f537e fixed a couple of failures in the SHAPE_POLY_SET tests, so these no longer need the expected failure markers. (cherry picked from commit 371149756dc7bb7e045f08d5e4e8e1ee065a43a2) --- qa/common/geometry/test_shape_poly_set_collision.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/qa/common/geometry/test_shape_poly_set_collision.cpp b/qa/common/geometry/test_shape_poly_set_collision.cpp index 11aa8bb5d7..5a2caae041 100644 --- a/qa/common/geometry/test_shape_poly_set_collision.cpp +++ b/qa/common/geometry/test_shape_poly_set_collision.cpp @@ -113,13 +113,11 @@ BOOST_AUTO_TEST_CASE( PointOnEdge ) BOOST_CHECK( !common.holeyPolySet.PointOnEdge( VECTOR2I( 200, 200 ) ) ); } -#ifdef HAVE_EXPECTED_FAILURES - /** * This test checks that the function Contains, whose behaviour has been updated to also manage * holey polygons, does the right work. */ -BOOST_AUTO_TEST_CASE( pointInPolygonSet, *boost::unit_test::expected_failures( 1 ) ) +BOOST_AUTO_TEST_CASE( pointInPolygonSet ) { // Check that the set contains the points that collide with it for( const VECTOR2I& point : collidingPoints ) @@ -137,7 +135,7 @@ BOOST_AUTO_TEST_CASE( pointInPolygonSet, *boost::unit_test::expected_failures( 1 /** * This test checks the behaviour of the Collide (with a point) method. */ -BOOST_AUTO_TEST_CASE( Collide, *boost::unit_test::expected_failures( 1 ) ) +BOOST_AUTO_TEST_CASE( Collide ) { // When clearance = 0, the behaviour should be the same as with Contains @@ -162,8 +160,6 @@ BOOST_AUTO_TEST_CASE( Collide, *boost::unit_test::expected_failures( 1 ) ) BOOST_CHECK( common.holeyPolySet.Collide( VECTOR2I( 11, 11 ), 5 ) ); } -#endif - /** * This test checks the behaviour of the CollideVertex method, testing whether the collision with * vertices is well detected