24#include <boost/test/unit_test.hpp>
38ITEM_CHANGE makeAdded(
const KIID& aUuid,
const wxString& aType = wxS(
"PCB_TRACK" ) )
41 c.
id.push_back( aUuid );
48ITEM_CHANGE makeRemoved(
const KIID& aUuid,
const wxString& aType = wxS(
"PCB_TRACK" ) )
51 c.
id.push_back( aUuid );
58ITEM_CHANGE makeModifiedWidth(
const KIID& aUuid,
int aBefore,
int aAfter )
61 c.
id.push_back( aUuid );
66 d.
name = wxS(
"Width" );
78 c.
id.push_back( aUuid );
83 p1.
name = wxS(
"Position X" );
89 p2.
name = wxS(
"Reference" );
110 ours.
changes.push_back( makeAdded(
id ) );
128 ours.
changes.push_back( makeAdded(
id ) );
129 theirs.
changes.push_back( makeAdded(
id ) );
147 ours.
changes.push_back( makeRemoved(
id ) );
148 theirs.
changes.push_back( makeRemoved(
id ) );
166 ours.
changes.push_back( makeRemoved(
id ) );
167 theirs.
changes.push_back( makeModifiedWidth(
id, 100, 200 ) );
188 ourChange.
id.push_back(
id );
189 ourChange.
typeName = wxS(
"FOOTPRINT" );
192 p1.
name = wxS(
"Position X" );
196 ours.
changes.push_back( ourChange );
199 theirChange.
id.push_back(
id );
200 theirChange.
typeName = wxS(
"FOOTPRINT" );
203 p2.
name = wxS(
"Reference" );
207 theirs.
changes.push_back( theirChange );
219 bool foundOurs =
false, foundTheirs =
false;
242 ours.
changes.push_back( makeModifiedWidth(
id, 100, 200 ) );
243 theirs.
changes.push_back( makeModifiedWidth(
id, 100, 300 ) );
261 ours.
changes.push_back( makeModifiedWidth(
id, 100, 250 ) );
262 theirs.
changes.push_back( makeModifiedWidth(
id, 100, 250 ) );
280 z.
id.push_back(
id );
301 t.
id.push_back(
id );
322 dup.
id.push_back(
id );
341 ours.
changes.push_back( makeAdded(
id ) );
342 theirs.
changes.push_back( makeModifiedWidth(
id, 100, 200 ) );
347 nlohmann::json j =
plan.ToJson();
353 for( std::size_t i = 0; i <
plan.actions.size(); ++i )
360 for( std::size_t i = 0; i <
plan.unresolved.size(); ++i )
374 j[
"actions"] = nlohmann::json::array();
375 j[
"unresolved"] = nlohmann::json::array();
423 pickOurs.
name = wxS(
"Width" );
425 r.
props.push_back( pickOurs );
428 custom.
name = wxS(
"Layer" );
431 r.
props.push_back( custom );
458 const CASE kinds[] = {
465 for(
const CASE& c : kinds )
470 r.
name = wxS(
"Width" );
476 nlohmann::json j = r.
ToJson();
508 KIID parentId, childId;
517 ourParent.
id.push_back( parentId );
518 ourParent.
typeName = wxS(
"FOOTPRINT" );
522 ourChild.
id.push_back( parentId );
523 ourChild.
id.push_back( childId );
527 d1.
name = wxS(
"Number" );
531 ourParent.
children.push_back( ourChild );
533 ours.
changes.push_back( ourParent );
540 d2.
name = wxS(
"Number" );
544 theirParent.
children.push_back( theirChild );
546 theirs.
changes.push_back( theirParent );
554 bool foundChild =
false;
558 if( r.
id.size() == 2 && r.
id.back() == childId )
578 o.
id.push_back(
id );
582 d1.
name = wxS(
"Position X" );
589 t.
id.push_back(
id );
593 d2.
name = wxS(
"Reference" );
619 c1.
id.push_back(
id );
625 theirs.
changes.push_back( c2 );
641PROPERTY_DELTA MakeDelta(
const wxString& aName,
int aBefore,
int aAfter )
697#if wxDEBUG_LEVEL == 0
static DIFF_VALUE FromInt(int aValue)
static DIFF_VALUE FromString(const wxString &aValue)
Three-way merge plan generator.
MERGE_PLAN Plan(const DOCUMENT_DIFF &aAncestorOurs, const DOCUMENT_DIFF &aAncestorTheirs) const
Plan the merge given the canonical pair of diffs.
static void SeedGenerator(unsigned int aSeed)
Re-initialize the UUID generator with a given seed (for testing or QA purposes)
static std::vector< PENDING_PROPERTY > plan(const EDA_ITEM &aSource, const EDA_ITEM &aTarget, const std::set< wxString > &aEnabledKeys)
Target properties to write, paired with values read off the source.
ITEM_RES
Resolution kind for a whole item.
PROPERTY_RESOLUTION_OUTCOME ResolvePropertyConflict(const PROPERTY_DELTA *aOurs, const PROPERTY_DELTA *aTheirs, const KICAD_MERGE_ENGINE::OPTIONS &aOptions)
Decide how to resolve a single property edit between two sides.
PROP_RES
Resolution kind for a single property of a single item.
The full set of changes between two parsed documents of one type.
std::vector< ITEM_CHANGE > changes
One change record on a single item.
std::vector< PROPERTY_DELTA > properties
std::vector< ITEM_CHANGE > children
std::vector< PROPERTY_RESOLUTION > props
static ITEM_RESOLUTION FromJson(const nlohmann::json &aJson)
nlohmann::json ToJson() const
bool preferAutoMerge
When true, property-orthogonal edits auto-merge silently.
bool autoResolveEqualValues
When true and a property edit conflicts but the side values are equal, the resolution is automaticall...
Result of planning a 3-way merge.
bool requiresConnectivityRebuild
std::vector< ITEM_RESOLUTION > actions
std::vector< KIID_PATH > unresolved
static MERGE_PLAN FromJson(const nlohmann::json &aJson)
Single (name, before, after) triple for one mutated property on an item.
static PROPERTY_RESOLUTION FromJson(const nlohmann::json &aJson)
nlohmann::json ToJson() const
BOOST_AUTO_TEST_CASE(HorizontalAlignment)
BOOST_AUTO_TEST_SUITE(CadstarPartParser)
BOOST_CHECK(res.column_datatype(0)==SQL_NUMERIC||res.column_datatype(0)==SQL_DECIMAL)
BOOST_REQUIRE_EQUAL(rows.size(), 1)
BOOST_CHECK_EQUAL(std::any_cast< std::string >(rows[0].at("val")), "12345678901234567.89")
BOOST_AUTO_TEST_SUITE_END()
BOOST_AUTO_TEST_CASE(OneSidedChangeAutoTakes)
BOOST_TEST_CONTEXT("Test Clearance")
#define CHECK_WX_ASSERT(STATEMENT)
A test macro to check a wxASSERT is thrown.