Publish inspection through one frozen history model
This commit is contained in:
@@ -128,12 +128,18 @@ func inheritanceInspectionFromComposition(t *testing.T, composed *composedDocume
|
||||
applyInheritanceMetadata(&metadata, composed.root, composed.origins, composed.overlays, expanded)
|
||||
metadata.historyBuilder.setScratch(composed.root)
|
||||
metadata.historyBuilder.observeInheritanceEvidence(expanded.operations)
|
||||
metadata.inheritance = cloneInheritanceOperations(expanded.operations)
|
||||
finalizeMetadataPathsWithResolution(&metadata, expanded.root, composed.applications, snapshots, baseline, composed.root, expanded.root)
|
||||
final := expanded.root
|
||||
if len(snapshots) != 0 {
|
||||
final = document.Clone(expanded.root)
|
||||
for _, group := range coalescedResolutionSnapshots(snapshots) {
|
||||
if group.coveringRecordID >= 0 && group.coveringRecordID < len(snapshots) {
|
||||
replaceHistoryPath(&final, group.change.Path, snapshots[group.coveringRecordID].after)
|
||||
}
|
||||
}
|
||||
}
|
||||
finalizeMetadataPathsWithResolution(&metadata, final, composed.applications, snapshots, baseline, composed.root, expanded.root)
|
||||
return &Inspection{
|
||||
metadata: metadata, baseline: baseline, input: expanded.root, preCLI: expanded.root,
|
||||
inputOrigins: expanded.origins, final: expanded.root,
|
||||
applications: composed.applications, inheritance: expanded.operations,
|
||||
metadata: metadata, history: metadata.historyModel, final: final,
|
||||
}, expanded
|
||||
}
|
||||
|
||||
@@ -323,8 +329,8 @@ func TestIndexedInheritanceHistoryMatchesOperationScan(t *testing.T) {
|
||||
parseCompositionDocument(t, "source-2", "child: {extends: parent, branch: replaced}\n"),
|
||||
parseCompositionDocument(t, "source-3", "sibling: {extends: parent}\n"))
|
||||
metadata := inspection.Metadata()
|
||||
if len(metadata.inheritance) < 4 {
|
||||
t.Fatalf("inheritance operations = %d, want multiple control and transfer scopes", len(metadata.inheritance))
|
||||
if inspection.history == nil || len(inspection.history.inheritancePayloads) == 0 || len(inspection.history.inheritancePayloads[0].operations) < 4 {
|
||||
t.Fatalf("inheritance operations = %#v, want multiple control and transfer scopes", inspection.history)
|
||||
}
|
||||
queries := []Path{
|
||||
Keys("child"),
|
||||
@@ -372,11 +378,6 @@ func TestInheritanceHistoryPrecedesApplicationResolution(t *testing.T) {
|
||||
after: replacement,
|
||||
}
|
||||
inspection, _ := inheritanceInspectionFromComposition(t, composed, snapshot)
|
||||
final := document.Clone(inspection.final)
|
||||
replaceHistoryPath(&final, path, replacement)
|
||||
inspection.final = final
|
||||
inspection.resolution = []resolutionSnapshot{snapshot}
|
||||
inspection.resolutionReplay = coalescedResolutionSnapshots(inspection.resolution)
|
||||
inspection.metadata.fields[path.String()] = FieldInfo{Explicit: true, Origin: snapshot.change.Origin}
|
||||
history := inspection.Metadata().History(path)
|
||||
if len(history) < 2 || history[len(history)-2].Origin.Operation != ChangeInheritance ||
|
||||
@@ -390,17 +391,24 @@ func TestInheritanceHistoryPrecedesApplicationResolution(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestHistoryNodeBudgetCountsSharedInheritanceEvidenceOnce(t *testing.T) {
|
||||
func TestHistoryNodeBudgetCountsSharedInheritanceRootsOnce(t *testing.T) {
|
||||
shared := &document.Node{Kind: document.String, Text: "shared"}
|
||||
extra := &document.Node{Kind: document.String, Text: "extra"}
|
||||
inspection := &Inspection{
|
||||
inheritance: []inheritanceOperation{{parent: shared, effective: shared}},
|
||||
metadata: Metadata{inheritance: []inheritanceOperation{{parent: shared, effective: extra}}},
|
||||
}
|
||||
operation := inheritanceOperation{parent: shared, effective: shared}
|
||||
builder := newHistoryBuilder()
|
||||
builder.observeInheritanceEvidence([]inheritanceOperation{operation})
|
||||
model := builder.freeze()
|
||||
inspection := &Inspection{history: model, metadata: Metadata{historyModel: model}}
|
||||
counter := newRetainedNodeCounter(2)
|
||||
if !addInspectionHistory(counter, inspection) || counter.count != 2 {
|
||||
t.Fatal("shared evidence node accounting is incorrect")
|
||||
}
|
||||
operation.effective = extra
|
||||
builder = newHistoryBuilder()
|
||||
builder.observeInheritanceEvidence([]inheritanceOperation{operation})
|
||||
model = builder.freeze()
|
||||
inspection.history = model
|
||||
inspection.metadata.historyModel = model
|
||||
counter = newRetainedNodeCounter(1)
|
||||
if addInspectionHistory(counter, inspection) {
|
||||
t.Fatal("distinct inheritance evidence did not consume the budget")
|
||||
|
||||
Reference in New Issue
Block a user