KiCad PCB EDA Suite
Loading...
Searching...
No Matches
Functions
test_auto_resolution.cpp File Reference
#include <boost/test/unit_test.hpp>
#include <diff_merge/auto_resolution.h>
#include <wx/intl.h>

Go to the source code of this file.

Functions

 BOOST_AUTO_TEST_CASE (Parse_ValidObject)
 
 BOOST_AUTO_TEST_CASE (Parse_EmptyObject)
 
 BOOST_AUTO_TEST_CASE (Parse_InvalidJson)
 
 BOOST_AUTO_TEST_CASE (Parse_EmptyString)
 
 BOOST_AUTO_TEST_CASE (Parse_NotObject)
 
 BOOST_AUTO_TEST_CASE (Parse_NotObject_String)
 
 BOOST_AUTO_TEST_CASE (Parse_BadValueType)
 
 BOOST_AUTO_TEST_CASE (Parse_UnknownKindString)
 
 BOOST_AUTO_TEST_CASE (Parse_EngineInternalKindRejected_Keep)
 
 BOOST_AUTO_TEST_CASE (Parse_EngineInternalKindRejected_Delete)
 
 BOOST_AUTO_TEST_CASE (Parse_EngineInternalKindRejected_MergeProps)
 
 BOOST_AUTO_TEST_CASE (Parse_NonOkStatusClearsResolutions)
 
 BOOST_AUTO_TEST_CASE (Parse_UnicodeKeys)
 
 BOOST_AUTO_TEST_CASE (Apply_AllConflictsCovered)
 
 BOOST_AUTO_TEST_CASE (Apply_PartialCoverageLeavesPlanUntouched)
 
 BOOST_AUTO_TEST_CASE (Apply_NoConflicts)
 
 BOOST_AUTO_TEST_CASE (BuildConflictList_OnlyUnresolvedActions)
 
 BOOST_AUTO_TEST_CASE (BuildConflictList_LongLabelsAreTruncated)
 
 BOOST_AUTO_TEST_CASE (BuildConflictList_ShortLabelNotTruncated)
 
 BOOST_AUTO_TEST_CASE (BuildConflictList_EmptyPlan)
 
 BOOST_AUTO_TEST_CASE (CollectUnresolved_AllConcreteChoices_Empty)
 
 BOOST_AUTO_TEST_CASE (CollectUnresolved_KeepIsUnresolved)
 
 BOOST_AUTO_TEST_CASE (CollectUnresolved_MergePropsIsUnresolved)
 
 BOOST_AUTO_TEST_CASE (CollectUnresolved_DeleteIsUnresolved)
 
 BOOST_AUTO_TEST_CASE (CollectUnresolved_OutOfRangeIndexSkipped)
 
 BOOST_AUTO_TEST_CASE (Apply_ValidThenStaleIndex_NoMidLoopMutation)
 
 BOOST_AUTO_TEST_CASE (Apply_OutOfRangeIndexBailsAsPartial)
 
 BOOST_AUTO_TEST_CASE (CollectUnresolved_MixedSet)
 
 BOOST_AUTO_TEST_CASE (BBox_PrimaryWinsWhenPresent)
 
 BOOST_AUTO_TEST_CASE (BBox_PrimaryEmptyFallsThroughToOurs)
 
 BOOST_AUTO_TEST_CASE (BBox_FallsThroughOursMissingToTheirs)
 
 BOOST_AUTO_TEST_CASE (BBox_FallsThroughToAncestor)
 
 BOOST_AUTO_TEST_CASE (BBox_DegenerateBBoxSkipped)
 
 BOOST_AUTO_TEST_CASE (BBox_AllMissingReturnsNullopt)
 
 BOOST_AUTO_TEST_CASE (BBox_FallbackOrderOursThenTheirsThenAncestor)
 
 BOOST_AUTO_TEST_CASE (DetailText_ContainsIdAndKind)
 
 BOOST_AUTO_TEST_CASE (DetailText_IncludesPropertyCount)
 
 BOOST_AUTO_TEST_CASE (DetailText_KnownResolutionKindsProduceText)
 

Function Documentation

◆ BOOST_AUTO_TEST_CASE() [1/38]

BOOST_AUTO_TEST_CASE ( Apply_AllConflictsCovered )

Definition at line 192 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KICAD_DIFF::ApplyAutoResolutions(), KIID_PATH::AsString(), BOOST_CHECK_EQUAL(), KICAD_DIFF::COMPLETE, result, KICAD_DIFF::TAKE_OURS, KICAD_DIFF::TAKE_THEIRS, and KICAD_DIFF::MERGE_PLAN::unresolved.

◆ BOOST_AUTO_TEST_CASE() [2/38]

BOOST_AUTO_TEST_CASE ( Apply_NoConflicts )

Definition at line 242 of file test_auto_resolution.cpp.

References KICAD_DIFF::ApplyAutoResolutions(), BOOST_CHECK_EQUAL(), KICAD_DIFF::NO_CONFLICTS, and result.

◆ BOOST_AUTO_TEST_CASE() [3/38]

BOOST_AUTO_TEST_CASE ( Apply_OutOfRangeIndexBailsAsPartial )

Definition at line 443 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KICAD_DIFF::ApplyAutoResolutions(), KIID_PATH::AsString(), KICAD_DIFF::KEEP, KICAD_DIFF::PARTIAL, result, and KICAD_DIFF::TAKE_OURS.

◆ BOOST_AUTO_TEST_CASE() [4/38]

BOOST_AUTO_TEST_CASE ( Apply_PartialCoverageLeavesPlanUntouched )

Definition at line 215 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KICAD_DIFF::ApplyAutoResolutions(), KIID_PATH::AsString(), BOOST_CHECK_EQUAL(), KICAD_DIFF::KEEP, KICAD_DIFF::PARTIAL, result, KICAD_DIFF::TAKE_OURS, and KICAD_DIFF::MERGE_PLAN::unresolved.

◆ BOOST_AUTO_TEST_CASE() [5/38]

BOOST_AUTO_TEST_CASE ( Apply_ValidThenStaleIndex_NoMidLoopMutation )

Definition at line 414 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KICAD_DIFF::ApplyAutoResolutions(), KIID_PATH::AsString(), BOOST_CHECK_EQUAL(), KICAD_DIFF::KEEP, KICAD_DIFF::PARTIAL, result, KICAD_DIFF::TAKE_OURS, KICAD_DIFF::TAKE_THEIRS, and KICAD_DIFF::MERGE_PLAN::unresolved.

◆ BOOST_AUTO_TEST_CASE() [6/38]

BOOST_AUTO_TEST_CASE ( BBox_AllMissingReturnsNullopt )

Definition at line 573 of file test_auto_resolution.cpp.

References empty(), and KICAD_DIFF::ResolveConflictBBox().

◆ BOOST_AUTO_TEST_CASE() [7/38]

BOOST_AUTO_TEST_CASE ( BBox_DegenerateBBoxSkipped )

Definition at line 556 of file test_auto_resolution.cpp.

References BOOST_REQUIRE(), and KICAD_DIFF::ResolveConflictBBox().

◆ BOOST_AUTO_TEST_CASE() [8/38]

BOOST_AUTO_TEST_CASE ( BBox_FallbackOrderOursThenTheirsThenAncestor )

Definition at line 583 of file test_auto_resolution.cpp.

References BOOST_REQUIRE(), and KICAD_DIFF::ResolveConflictBBox().

◆ BOOST_AUTO_TEST_CASE() [9/38]

BOOST_AUTO_TEST_CASE ( BBox_FallsThroughOursMissingToTheirs )

Definition at line 526 of file test_auto_resolution.cpp.

References BOOST_REQUIRE(), and KICAD_DIFF::ResolveConflictBBox().

◆ BOOST_AUTO_TEST_CASE() [10/38]

BOOST_AUTO_TEST_CASE ( BBox_FallsThroughToAncestor )

Definition at line 541 of file test_auto_resolution.cpp.

References BOOST_REQUIRE(), and KICAD_DIFF::ResolveConflictBBox().

◆ BOOST_AUTO_TEST_CASE() [11/38]

BOOST_AUTO_TEST_CASE ( BBox_PrimaryEmptyFallsThroughToOurs )

Definition at line 510 of file test_auto_resolution.cpp.

References BOOST_REQUIRE(), and KICAD_DIFF::ResolveConflictBBox().

◆ BOOST_AUTO_TEST_CASE() [12/38]

BOOST_AUTO_TEST_CASE ( BBox_PrimaryWinsWhenPresent )

Definition at line 495 of file test_auto_resolution.cpp.

References BOOST_REQUIRE(), and KICAD_DIFF::ResolveConflictBBox().

◆ BOOST_AUTO_TEST_CASE() [13/38]

BOOST_AUTO_TEST_CASE ( BuildConflictList_EmptyPlan )

Definition at line 328 of file test_auto_resolution.cpp.

References KICAD_DIFF::BuildConflictList(), and empty().

◆ BOOST_AUTO_TEST_CASE() [14/38]

BOOST_AUTO_TEST_CASE ( BuildConflictList_LongLabelsAreTruncated )

Definition at line 283 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KIID::AsString(), KIID_PATH::AsString(), BOOST_CHECK_EQUAL(), KICAD_DIFF::BuildConflictList(), KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::KEEP, KICAD_DIFF::ITEM_RESOLUTION::kind, KIID::SeedGenerator(), and KICAD_DIFF::MERGE_PLAN::unresolved.

◆ BOOST_AUTO_TEST_CASE() [15/38]

BOOST_AUTO_TEST_CASE ( BuildConflictList_OnlyUnresolvedActions )

Definition at line 256 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, BOOST_CHECK_EQUAL(), KICAD_DIFF::BuildConflictList(), KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::KEEP, KICAD_DIFF::ITEM_RESOLUTION::kind, KICAD_DIFF::TAKE_OURS, and KICAD_DIFF::MERGE_PLAN::unresolved.

◆ BOOST_AUTO_TEST_CASE() [16/38]

BOOST_AUTO_TEST_CASE ( BuildConflictList_ShortLabelNotTruncated )

Definition at line 311 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KIID_PATH::AsString(), KICAD_DIFF::BuildConflictList(), KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::KEEP, KICAD_DIFF::ITEM_RESOLUTION::kind, and KICAD_DIFF::MERGE_PLAN::unresolved.

◆ BOOST_AUTO_TEST_CASE() [17/38]

BOOST_AUTO_TEST_CASE ( CollectUnresolved_AllConcreteChoices_Empty )

Definition at line 337 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KICAD_DIFF::CollectUnresolvedConflicts(), KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::ITEM_RESOLUTION::kind, KICAD_DIFF::TAKE_OURS, and KICAD_DIFF::TAKE_THEIRS.

◆ BOOST_AUTO_TEST_CASE() [18/38]

BOOST_AUTO_TEST_CASE ( CollectUnresolved_DeleteIsUnresolved )

Definition at line 380 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KICAD_DIFF::CollectUnresolvedConflicts(), KICAD_DIFF::DELETE_ITEM, KICAD_DIFF::ITEM_RESOLUTION::id, and KICAD_DIFF::ITEM_RESOLUTION::kind.

◆ BOOST_AUTO_TEST_CASE() [19/38]

BOOST_AUTO_TEST_CASE ( CollectUnresolved_KeepIsUnresolved )

Definition at line 352 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KICAD_DIFF::CollectUnresolvedConflicts(), KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::KEEP, and KICAD_DIFF::ITEM_RESOLUTION::kind.

◆ BOOST_AUTO_TEST_CASE() [20/38]

BOOST_AUTO_TEST_CASE ( CollectUnresolved_MergePropsIsUnresolved )

Definition at line 366 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KICAD_DIFF::CollectUnresolvedConflicts(), KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::ITEM_RESOLUTION::kind, and KICAD_DIFF::MERGE_PROPS.

◆ BOOST_AUTO_TEST_CASE() [21/38]

BOOST_AUTO_TEST_CASE ( CollectUnresolved_MixedSet )

Definition at line 461 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KICAD_DIFF::CollectUnresolvedConflicts(), KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::KEEP, KICAD_DIFF::ITEM_RESOLUTION::kind, KICAD_DIFF::TAKE_ANCESTOR, and KICAD_DIFF::TAKE_OURS.

◆ BOOST_AUTO_TEST_CASE() [22/38]

BOOST_AUTO_TEST_CASE ( CollectUnresolved_OutOfRangeIndexSkipped )

Definition at line 397 of file test_auto_resolution.cpp.

References KICAD_DIFF::MERGE_PLAN::actions, KICAD_DIFF::CollectUnresolvedConflicts(), KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::KEEP, and KICAD_DIFF::ITEM_RESOLUTION::kind.

◆ BOOST_AUTO_TEST_CASE() [23/38]

BOOST_AUTO_TEST_CASE ( DetailText_ContainsIdAndKind )

Definition at line 603 of file test_auto_resolution.cpp.

References _, KIID_PATH::AsString(), KICAD_DIFF::BuildConflictDetailText(), KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::ITEM_RESOLUTION::kind, KICAD_DIFF::TAKE_OURS, and text.

◆ BOOST_AUTO_TEST_CASE() [24/38]

BOOST_AUTO_TEST_CASE ( DetailText_IncludesPropertyCount )

Definition at line 624 of file test_auto_resolution.cpp.

References KICAD_DIFF::BuildConflictDetailText(), KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::ITEM_RESOLUTION::kind, KICAD_DIFF::MERGE_PROPS, KICAD_DIFF::PROPERTY_RESOLUTION::name, KICAD_DIFF::ITEM_RESOLUTION::props, and text.

◆ BOOST_AUTO_TEST_CASE() [25/38]

BOOST_AUTO_TEST_CASE ( DetailText_KnownResolutionKindsProduceText )

Definition at line 638 of file test_auto_resolution.cpp.

References _, BOOST_CHECK_MESSAGE(), KICAD_DIFF::BuildConflictDetailText(), KICAD_DIFF::DELETE_ITEM, KICAD_DIFF::ITEM_RESOLUTION::id, KICAD_DIFF::KEEP, KICAD_DIFF::ITEM_RESOLUTION::kind, KICAD_DIFF::MERGE_PROPS, KICAD_DIFF::TAKE_ANCESTOR, KICAD_DIFF::TAKE_OURS, KICAD_DIFF::TAKE_THEIRS, and text.

◆ BOOST_AUTO_TEST_CASE() [26/38]

BOOST_AUTO_TEST_CASE ( Parse_BadValueType )

Definition at line 90 of file test_auto_resolution.cpp.

References KICAD_DIFF::BAD_VALUE, and KICAD_DIFF::ParseAutoResolutionJson().

◆ BOOST_AUTO_TEST_CASE() [27/38]

BOOST_AUTO_TEST_CASE ( Parse_EmptyObject )

Definition at line 53 of file test_auto_resolution.cpp.

References KICAD_DIFF::OK, and KICAD_DIFF::ParseAutoResolutionJson().

◆ BOOST_AUTO_TEST_CASE() [28/38]

BOOST_AUTO_TEST_CASE ( Parse_EmptyString )

Definition at line 69 of file test_auto_resolution.cpp.

References KICAD_DIFF::INVALID_JSON, and KICAD_DIFF::ParseAutoResolutionJson().

◆ BOOST_AUTO_TEST_CASE() [29/38]

BOOST_AUTO_TEST_CASE ( Parse_EngineInternalKindRejected_Delete )

Definition at line 115 of file test_auto_resolution.cpp.

References KICAD_DIFF::ENGINE_INTERNAL_KIND, and KICAD_DIFF::ParseAutoResolutionJson().

◆ BOOST_AUTO_TEST_CASE() [30/38]

BOOST_AUTO_TEST_CASE ( Parse_EngineInternalKindRejected_Keep )

Definition at line 107 of file test_auto_resolution.cpp.

References KICAD_DIFF::ENGINE_INTERNAL_KIND, and KICAD_DIFF::ParseAutoResolutionJson().

◆ BOOST_AUTO_TEST_CASE() [31/38]

BOOST_AUTO_TEST_CASE ( Parse_EngineInternalKindRejected_MergeProps )

Definition at line 122 of file test_auto_resolution.cpp.

References KICAD_DIFF::ENGINE_INTERNAL_KIND, and KICAD_DIFF::ParseAutoResolutionJson().

◆ BOOST_AUTO_TEST_CASE() [32/38]

BOOST_AUTO_TEST_CASE ( Parse_InvalidJson )

Definition at line 61 of file test_auto_resolution.cpp.

References KICAD_DIFF::INVALID_JSON, and KICAD_DIFF::ParseAutoResolutionJson().

◆ BOOST_AUTO_TEST_CASE() [33/38]

BOOST_AUTO_TEST_CASE ( Parse_NonOkStatusClearsResolutions )

Definition at line 129 of file test_auto_resolution.cpp.

References KICAD_DIFF::BAD_VALUE, BOOST_REQUIRE(), KICAD_DIFF::ENGINE_INTERNAL_KIND, KICAD_DIFF::ParseAutoResolutionJson(), and KICAD_DIFF::UNKNOWN_KIND.

◆ BOOST_AUTO_TEST_CASE() [34/38]

BOOST_AUTO_TEST_CASE ( Parse_NotObject )

Definition at line 76 of file test_auto_resolution.cpp.

References KICAD_DIFF::NOT_OBJECT, and KICAD_DIFF::ParseAutoResolutionJson().

◆ BOOST_AUTO_TEST_CASE() [35/38]

BOOST_AUTO_TEST_CASE ( Parse_NotObject_String )

Definition at line 83 of file test_auto_resolution.cpp.

References KICAD_DIFF::NOT_OBJECT, and KICAD_DIFF::ParseAutoResolutionJson().

◆ BOOST_AUTO_TEST_CASE() [36/38]

BOOST_AUTO_TEST_CASE ( Parse_UnicodeKeys )

Definition at line 151 of file test_auto_resolution.cpp.

References BOOST_REQUIRE(), KICAD_DIFF::OK, and KICAD_DIFF::ParseAutoResolutionJson().

◆ BOOST_AUTO_TEST_CASE() [37/38]

BOOST_AUTO_TEST_CASE ( Parse_UnknownKindString )

Definition at line 99 of file test_auto_resolution.cpp.

References KICAD_DIFF::ParseAutoResolutionJson(), and KICAD_DIFF::UNKNOWN_KIND.

◆ BOOST_AUTO_TEST_CASE() [38/38]

BOOST_AUTO_TEST_CASE ( Parse_ValidObject )

Definition at line 39 of file test_auto_resolution.cpp.

References BOOST_AUTO_TEST_CASE(), BOOST_REQUIRE(), KICAD_DIFF::OK, KICAD_DIFF::ParseAutoResolutionJson(), KICAD_DIFF::TAKE_ANCESTOR, KICAD_DIFF::TAKE_OURS, and KICAD_DIFF::TAKE_THEIRS.