Use main for the main provenance layer
This commit is contained in:
@@ -17,10 +17,10 @@ func TestHistorySourceObservationsPreserveRawAndCompositeDefinitions(t *testing.
|
||||
setHistoryDocumentSource(overlay, "overlay")
|
||||
|
||||
baseOrigins := make(map[string]Origin)
|
||||
collectOverlayOrigins(baseOrigins, base, Path{}, LayerBase)
|
||||
collectOverlayOrigins(baseOrigins, base, Path{}, LayerMain)
|
||||
baseApplication := historyApplication{
|
||||
layer: LayerBase, value: base,
|
||||
origin: overlayOrigin(LayerBase, base.Location),
|
||||
layer: LayerMain, value: base,
|
||||
origin: overlayOrigin(LayerMain, base.Location),
|
||||
}
|
||||
composition := &composedDocument{
|
||||
root: document.Clone(base), origins: baseOrigins,
|
||||
@@ -91,7 +91,7 @@ func TestHistorySourceObservationsPreserveRawAndCompositeDefinitions(t *testing.
|
||||
explanation, explained := inspection.Explain(Keys("section", "empty"))
|
||||
var contributionSources []string
|
||||
for _, change := range explanation.History {
|
||||
if change.Origin.Layer == LayerBase || change.Origin.Layer == LayerOverlay {
|
||||
if change.Origin.Layer == LayerMain || change.Origin.Layer == LayerOverlay {
|
||||
contributionSources = append(contributionSources, locationSourceIDs(change.Origin.Locations)...)
|
||||
}
|
||||
}
|
||||
@@ -109,12 +109,12 @@ func TestHistorySourceReplacementTracksConcreteBeforeAndAfterShapes(t *testing.T
|
||||
setHistoryDocumentSource(base, "base")
|
||||
setHistoryDocumentSource(overlay, "overlay")
|
||||
baseOrigins := make(map[string]Origin)
|
||||
collectOverlayOrigins(baseOrigins, base, Path{}, LayerBase)
|
||||
collectOverlayOrigins(baseOrigins, base, Path{}, LayerMain)
|
||||
overlayOrigins := make(map[string]Origin)
|
||||
collectOverlayOrigins(overlayOrigins, overlay, Path{}, LayerOverlay)
|
||||
composition := &composedDocument{
|
||||
root: document.Clone(base), origins: baseOrigins,
|
||||
applications: []historyApplication{{layer: LayerBase, value: base, origin: overlayOrigin(LayerBase, base.Location)}},
|
||||
applications: []historyApplication{{layer: LayerMain, value: base, origin: overlayOrigin(LayerMain, base.Location)}},
|
||||
}
|
||||
assembly := newAssemblyAccumulator(composition)
|
||||
if diagnostics := assembly.applyOverlay(overlay, overlayOrigins, []historyApplication{{layer: LayerOverlay, value: overlay, origin: overlayOrigin(LayerOverlay, overlay.Location)}}, LayerOverlay); len(diagnostics) != 0 {
|
||||
@@ -175,7 +175,7 @@ func TestOverlayReplacementCapturesIntroducedPathOrigins(t *testing.T) {
|
||||
setHistoryDocumentSource(incoming, "overlay")
|
||||
path := Keys("section")
|
||||
origins := make(map[string]Origin)
|
||||
collectOverlayOrigins(origins, existing, path, LayerBase)
|
||||
collectOverlayOrigins(origins, existing, path, LayerMain)
|
||||
incomingOrigins := make(map[string]Origin)
|
||||
collectOverlayOrigins(incomingOrigins, incoming, path, LayerOverlay)
|
||||
result := &composedDocument{
|
||||
|
||||
Reference in New Issue
Block a user