Fix qa tests after fix made in commit 878c70c1

This commit is contained in:
jean-pierre charras 2022-03-09 17:18:54 +01:00
parent 663edcf665
commit 4ad89b9c04
3 changed files with 10 additions and 7 deletions

View File

@ -150,7 +150,7 @@
(connect_pads (clearance 0)) (connect_pads (clearance 0))
(min_thickness 0.254) (filled_areas_thickness no) (min_thickness 0.254) (filled_areas_thickness no)
(keepout (tracks allowed) (vias allowed) (pads allowed ) (copperpour not_allowed) (footprints allowed)) (keepout (tracks allowed) (vias allowed) (pads allowed ) (copperpour not_allowed) (footprints allowed))
(fill (thermal_gap 0.508) (thermal_bridge_width 0.508)) (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
(polygon (polygon
(pts (pts
(xy -9 -15) (xy -9 -15)

View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2022 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -117,7 +117,7 @@ BOOST_FIXTURE_TEST_CASE( DRCFalseNegativeRegressions, DRC_REGRESSION_TEST_FIXTUR
std::vector< std::pair<wxString, int> > tests = { { "issue1358", 2 }, std::vector< std::pair<wxString, int> > tests = { { "issue1358", 2 },
{ "issue2512", 5 }, { "issue2512", 5 },
{ "issue2528", 1 }, { "issue2528", 1 },
{ "issue5750", 5 }, { "issue5750", 4 }, //Shorting zone fills pass DRC in some cases
{ "issue5854", 3 }, { "issue5854", 3 },
{ "issue6879", 6 }, { "issue6879", 6 },
{ "issue6945", 2 }, { "issue6945", 2 },

View File

@ -43,7 +43,8 @@ struct DRC_REGRESSION_TEST_FIXTURE
BOOST_FIXTURE_TEST_CASE( DRCSolderMaskBridgingTest, DRC_REGRESSION_TEST_FIXTURE ) BOOST_FIXTURE_TEST_CASE( DRCSolderMaskBridgingTest, DRC_REGRESSION_TEST_FIXTURE )
{ {
KI_TEST::LoadBoard( m_settingsManager, "solder_mask_bridge_test", m_board ); wxString brd_name( wxT( "solder_mask_bridge_test" ) );
KI_TEST::LoadBoard( m_settingsManager, brd_name, m_board );
KI_TEST::FillZones( m_board.get() ); KI_TEST::FillZones( m_board.get() );
std::vector<DRC_ITEM> violations; std::vector<DRC_ITEM> violations;
@ -66,14 +67,16 @@ BOOST_FIXTURE_TEST_CASE( DRCSolderMaskBridgingTest, DRC_REGRESSION_TEST_FIXTURE
bds.m_DRCEngine->RunTests( EDA_UNITS::MILLIMETRES, true, false ); bds.m_DRCEngine->RunTests( EDA_UNITS::MILLIMETRES, true, false );
if( violations.size() == 7 ) const int expected_err_cnt = 5;
if( violations.size() == expected_err_cnt )
{ {
BOOST_CHECK_EQUAL( 1, 1 ); // quiet "did not check any assertions" warning BOOST_CHECK_EQUAL( 1, 1 ); // quiet "did not check any assertions" warning
BOOST_TEST_MESSAGE( "DRC solder mask bridge test passed" ); BOOST_TEST_MESSAGE( "DRC solder mask bridge test passed" );
} }
else else
{ {
BOOST_CHECK_EQUAL( violations.size(), 7 ); BOOST_CHECK_EQUAL( violations.size(), expected_err_cnt );
std::map<KIID, EDA_ITEM*> itemMap; std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap ); m_board->FillItemMap( itemMap );
@ -81,6 +84,6 @@ BOOST_FIXTURE_TEST_CASE( DRCSolderMaskBridgingTest, DRC_REGRESSION_TEST_FIXTURE
for( const DRC_ITEM& item : violations ) for( const DRC_ITEM& item : violations )
BOOST_TEST_MESSAGE( item.ShowReport( EDA_UNITS::INCHES, RPT_SEVERITY_ERROR, itemMap ) ); BOOST_TEST_MESSAGE( item.ShowReport( EDA_UNITS::INCHES, RPT_SEVERITY_ERROR, itemMap ) );
BOOST_ERROR( "DRC solder mask bridge test failed" ); BOOST_ERROR( wxString::Format( "DRC solder mask bridge test failed board <%s>", brd_name ) );
} }
} }