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

Update tests to UUIDs. 

Fixes https://gitlab.com/kicad/code/kicad/issues/3939

Fixes https://gitlab.com/kicad/code/kicad/issues/3958
This commit is contained in:
Jeff Young 2020-02-28 21:55:51 +00:00
parent 7cb3ed456e
commit 9ded76bcad
6 changed files with 4 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/eeschema/CMakeLists.txt
View File

@ -36,7 +36,7 @@ add_executable( qa_eeschema
mocks_eeschema.cpp mocks_eeschema.cpp
eeschema_test_utils.cpp eeschema_test_utils.cpp
timestamp_test_utils.cpp uuid_test_utils.cpp
# The main test entry points # The main test entry points
test_module.cpp test_module.cpp

2
qa/eeschema/test_sch_rtree.cpp
View File

@ -34,7 +34,7 @@
// Code under test // Code under test
#include <sch_rtree.h> #include <sch_rtree.h>
#include "timestamp_test_utils.h" #include "uuid_test_utils.h"
#include <unit_test_utils/wx_assert.h> #include <unit_test_utils/wx_assert.h>

2
qa/eeschema/test_sch_sheet.cpp
View File

@ -31,7 +31,7 @@
// Code under test // Code under test
#include <sch_sheet.h> #include <sch_sheet.h>
#include "timestamp_test_utils.h" #include "uuid_test_utils.h"
#include <unit_test_utils/wx_assert.h> #include <unit_test_utils/wx_assert.h>

2
qa/eeschema/test_sch_sheet_path.cpp
View File

@ -31,7 +31,7 @@
// Code under test // Code under test
#include <sch_sheet_path.h> #include <sch_sheet_path.h>
#include "timestamp_test_utils.h" #include "uuid_test_utils.h"
#include <sch_sheet.h> #include <sch_sheet.h>

83
qa/eeschema/timestamp_test_utils.cpp
View File

@ -1,83 +0,0 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2019 KiCad Developers, see CHANGELOG.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 Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "timestamp_test_utils.h"
#include <unit_test_utils/unit_test_utils.h>
namespace KI_TEST
{
bool EndsInTimestamp( const std::string& aStr )
{
if( aStr.size() < 8 )
{
BOOST_TEST_INFO( "Too short to be timestamp: " << aStr.size() );
return false;
}
return IsTimeStampish( aStr.end() - 8, aStr.end() );
}
bool IsUUIDPathWithLevels( const std::string& aStr, unsigned aLevels )
{
// A UUID is formated as 8-4-4-4-12
const unsigned tsLen = 36;
const unsigned levelLen = tsLen + 1; // add the /
if( aStr.size() != aLevels * levelLen + 1 )
{
BOOST_TEST_INFO( "String is the wrong length for " << aLevels << " levels." );
return false;
}
if( aStr[0] != '/' )
{
BOOST_TEST_INFO( "Doesn't start with '/'" );
return false;
}
auto tsBegin = aStr.begin() + 1;
for( unsigned i = 0; i < aLevels; i++ )
{
if( !IsTimeStampish( tsBegin, tsBegin + tsLen ) )
{
BOOST_TEST_INFO( "Not a timeStamp at level "
<< i << ": " << std::string( tsBegin, tsBegin + tsLen ) );
return false;
}
if( *( tsBegin + tsLen ) != '/' )
{
BOOST_TEST_INFO( "level doesn't end in '/'" );
return false;
}
tsBegin += levelLen;
}
return true;
}
} // namespace KI_TEST

82
qa/eeschema/timestamp_test_utils.h
View File

@ -1,82 +0,0 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2019 KiCad Developers, see CHANGELOG.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 Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef QA_EESCHEMA_TIMESTAMP_TEST_UTILS__H
#define QA_EESCHEMA_TIMESTAMP_TEST_UTILS__H
#include <algorithm>
#include <string>
/**
* @file
* Test utilities for timestamps
*/
namespace KI_TEST
{
/**
* Predicate for checking a timestamp character
* @param aChr the character
* @return true if it's a valid timestamp char (0-9, A-F)
*/
inline bool IsTimeStampChar( char aChr )
{
return ( aChr >= 'A' && aChr <= 'F' ) || ( aChr >= '0' && aChr <= '9' );
}
/**
* Check if the string between the iterators looks like a timestamp (i.e. 8 hex digits)
*/
template <typename T>
bool IsTimeStampish( const T& aBegin, const T& aEnd )
{
// Wrong length
if( aEnd != aBegin + 8 )
return false;
// Check all chars
return std::all_of( aBegin, aEnd, IsTimeStampChar );
}
/**
* Predicate to check if a string look like it ends in a timestamp
* @param aStr the string to check
* @return true if it does
*/
bool EndsInTimestamp( const std::string& aStr );
/**
* Predicate to check a string is a timestmap path format
*
* Eg. levels=2: /1234ABCD/9878DEFC/
*
* @param aStr candidate string
* @param levels expected levels
* @return true if format matches
*/
bool IsUUIDPathWithLevels( const std::string& aStr, unsigned aLevels );
} // namespace KI_TEST
#endif // QA_EESCHEMA_TIMESTAMP_TEST_UTILS__H