From 23e834fdb525f3f5b66801c60bce17a2508cf9cb Mon Sep 17 00:00:00 2001 From: Tomasz Wlostowski Date: Fri, 31 Jul 2020 16:24:50 +0200 Subject: [PATCH] qa: fixed test fixture name collision causing test failures --- qa/libs/kimath/geometry/test_shape_compound_collision.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/libs/kimath/geometry/test_shape_compound_collision.cpp b/qa/libs/kimath/geometry/test_shape_compound_collision.cpp index 13e44abc5c..99aa0c8575 100644 --- a/qa/libs/kimath/geometry/test_shape_compound_collision.cpp +++ b/qa/libs/kimath/geometry/test_shape_compound_collision.cpp @@ -33,7 +33,7 @@ * Fixture for the Collision test suite. It contains an instance of the common data and two * vectors containing colliding and non-colliding points. */ -struct CollisionFixture +struct ShapeCompoundCollisionFixture { // Structure to store the common data. struct KI_TEST::CommonTestData common; @@ -48,7 +48,7 @@ struct CollisionFixture /** * Constructor */ - CollisionFixture() + ShapeCompoundCollisionFixture() { shapesA.push_back( new SHAPE_CIRCLE( VECTOR2I( 0, 0 ), 100 ) ); shapesA.push_back( new SHAPE_CIRCLE( VECTOR2I( 80, 0 ), 100 ) ); @@ -64,7 +64,7 @@ struct CollisionFixture compoundC = new SHAPE_COMPOUND( shapesC ); } - ~CollisionFixture() + ~ShapeCompoundCollisionFixture() { } }; @@ -72,7 +72,7 @@ struct CollisionFixture /** * Declares the CollisionFixture as the boost test suite fixture. */ -BOOST_FIXTURE_TEST_SUITE( SCompoundCollision, CollisionFixture ) +BOOST_FIXTURE_TEST_SUITE( SCompoundCollision, ShapeCompoundCollisionFixture ) /** * This test checks basic behaviour of PointOnEdge, testing if points on corners, outline edges