haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix disabled schematic page numbering unit tests.

This commit is contained in:
Wayne Stambaugh 2022-11-23 08:05:28 -05:00
parent e62463b52b
commit cd92088b7a
2 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qa/unittests/eeschema/eeschema_test_utils.cpp
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.TXT for contributors.
* Copyright (C) 2019-2022 KiCad Developers, see AUTHORS.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -92,8 +92,11 @@ void KI_TEST::SCHEMATIC_TEST_FIXTURE::LoadSchematic( const wxString& aBaseName )
SCH_SHEET_LIST sheets = m_schematic.GetSheets();
// Restore all of the loaded symbol instances from the root sheet screen.
sheets.UpdateSymbolInstances( m_schematic.RootScreen()->GetSymbolInstances() );
sheets.UpdateSheetInstances( m_schematic.RootScreen()->GetSheetInstances() );
if( m_schematic.RootScreen()->GetFileFormatVersionAtLoad() < 20221002 )
sheets.UpdateSymbolInstances( m_schematic.RootScreen()->GetSymbolInstances() );
if( m_schematic.RootScreen()->GetFileFormatVersionAtLoad() < 20221110 )
sheets.UpdateSheetInstances( m_schematic.RootScreen()->GetSheetInstances() );
sheets.AnnotatePowerSymbols();

53
qa/unittests/eeschema/test_sch_sheet_list.cpp
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@ -103,22 +103,49 @@ BOOST_AUTO_TEST_CASE( TestEditPageNumbersInSharedDesign )
sheets.at( 4 ).SetPageNumber( "E" );
// Save and reload
wxString tempName = "complex_hierarchy_shared/complex_hierarchy_modified";
wxFileName tempFn = GetSchematicPath( tempName );
m_pi->Save( tempFn.GetFullPath(), &m_schematic.Root(), &m_schematic );
LoadSchematic( tempName );
wxFileName rootFn = GetSchematicPath( "complex_hierarchy_shared/complex_hierarchy" );
wxFileName prjFn = rootFn;
// sheets = m_schematic.GetSheets();
prjFn.SetExt( ProjectFileExtension );
// BOOST_CHECK_EQUAL( sheets.size(), 5 );
// BOOST_CHECK_EQUAL( sheets.at( 0 ).GetPageNumber(), "A" );
// BOOST_CHECK_EQUAL( sheets.at( 1 ).GetPageNumber(), "B" );
// BOOST_CHECK_EQUAL( sheets.at( 2 ).GetPageNumber(), "C" );
// BOOST_CHECK_EQUAL( sheets.at( 3 ).GetPageNumber(), "D" );
// BOOST_CHECK_EQUAL( sheets.at( 4 ).GetPageNumber(), "E" );
rootFn.AppendDir( "temp" );
BOOST_CHECK( rootFn.Mkdir() );
wxFileName newPrjFn = rootFn;
newPrjFn.SetExt( ProjectFileExtension );
BOOST_CHECK( wxCopyFile( prjFn.GetFullPath(), newPrjFn.GetFullPath() ) );
m_pi->Save( rootFn.GetFullPath(), &m_schematic.Root(), &m_schematic );
wxFileName subSheetFn = rootFn;
BOOST_CHECK( subSheetFn.AppendDir( "ampli_ht" ) );
BOOST_CHECK( subSheetFn.Mkdir() );
subSheetFn.SetName( "ampli_ht" );
m_pi->Save( subSheetFn.GetFullPath(), sheets.at( 1 ).Last(), &m_schematic );
subSheetFn.SetName( "filter" );
m_pi->Save( subSheetFn.GetFullPath(), sheets.at( 2 ).Last(), &m_schematic );
LoadSchematic( "complex_hierarchy_shared/temp/complex_hierarchy" );
sheets = m_schematic.GetSheets();
BOOST_CHECK_EQUAL( sheets.size(), 5 );
BOOST_CHECK_EQUAL( sheets.at( 0 ).GetPageNumber(), "A" );
BOOST_CHECK_EQUAL( sheets.at( 1 ).GetPageNumber(), "B" );
BOOST_CHECK_EQUAL( sheets.at( 2 ).GetPageNumber(), "C" );
BOOST_CHECK_EQUAL( sheets.at( 3 ).GetPageNumber(), "D" );
BOOST_CHECK_EQUAL( sheets.at( 4 ).GetPageNumber(), "E" );
// Cleanup
wxRemoveFile( tempFn.GetFullPath() );
BOOST_CHECK( wxRemoveFile( subSheetFn.GetFullPath() ) );
subSheetFn.SetName( "ampli_ht" );
BOOST_CHECK( wxRemoveFile( subSheetFn.GetFullPath() ) );
BOOST_CHECK( subSheetFn.Rmdir() );
BOOST_CHECK( wxRemoveFile( newPrjFn.GetFullPath() ) );
BOOST_CHECK( wxRemoveFile( rootFn.GetFullPath() ) );
BOOST_CHECK( rootFn.Rmdir() );
}
BOOST_TEST_CONTEXT( "Read Sub-Sheet, after modification" )