Remove unread private transport members
This commit is contained in:
@@ -217,7 +217,7 @@ func TestSourceVersionExtractionPreservesVersionVocabulary(t *testing.T) {
|
||||
return nil
|
||||
}}
|
||||
result := processSourceVersion(root, rule, sourceVersionContribution, Keys("collections", "weather"), sourceVersionModeIfPresent)
|
||||
if len(result.diagnostics) != 0 || !result.evidence.checked || result.evidence.version != test.want || checked != test.want {
|
||||
if len(result.diagnostics) != 0 || result.evidence.version != test.want || checked != test.want {
|
||||
t.Fatalf("result = %#v, checked = %#v", result, checked)
|
||||
}
|
||||
if _, found := documentAtPath(result.payload, rule.Path); found {
|
||||
@@ -245,35 +245,34 @@ func TestSourceVersionExtractionHandlesMissingAndMalformedValues(t *testing.T) {
|
||||
wantCode Code
|
||||
wantPresent bool
|
||||
wantCallback bool
|
||||
wantAbsence sourceVersionPathAbsence
|
||||
}{
|
||||
{
|
||||
name: "missing mapping member is optional absence", input: "settings: {}\n",
|
||||
path: Keys("settings", "version"), mode: sourceVersionModeIfPresent,
|
||||
role: sourceVersionContribution, wantPresent: false, wantAbsence: sourceVersionMemberMissing,
|
||||
role: sourceVersionContribution, wantPresent: false,
|
||||
},
|
||||
{
|
||||
name: "missing below scalar is optional absence", input: "settings: scalar\n",
|
||||
path: Keys("settings", "version"), mode: sourceVersionModeIfPresent,
|
||||
role: sourceVersionContribution, wantPresent: false, wantAbsence: sourceVersionPathObstructed,
|
||||
role: sourceVersionContribution, wantPresent: false,
|
||||
},
|
||||
{
|
||||
name: "required absence reports nearest location", input: "settings: scalar\n",
|
||||
path: Keys("settings", "version"), mode: sourceVersionModeRequired,
|
||||
role: sourceVersionContribution, wantCode: CodeVersionError, wantAbsence: sourceVersionPathObstructed,
|
||||
role: sourceVersionContribution, wantCode: CodeVersionError,
|
||||
},
|
||||
{
|
||||
name: "unavailable sequence index is absence", input: "versions: [1]\n",
|
||||
path: Keys("versions").Index(3), mode: sourceVersionModeRequired,
|
||||
role: sourceVersionContribution, wantCode: CodeVersionError, wantAbsence: sourceVersionIndexUnavailable,
|
||||
role: sourceVersionContribution, wantCode: CodeVersionError,
|
||||
},
|
||||
{
|
||||
name: "required actual main absence", input: "name: demo\n", path: Keys("version"),
|
||||
mode: sourceVersionModeRequired, role: sourceVersionMain, wantCode: CodeVersionError, wantAbsence: sourceVersionMemberMissing,
|
||||
mode: sourceVersionModeRequired, role: sourceVersionMain, wantCode: CodeVersionError,
|
||||
},
|
||||
{
|
||||
name: "main optional absence invokes checker", input: "name: demo\n", path: Keys("version"),
|
||||
mode: sourceVersionModeIfPresent, role: sourceVersionMain, wantCallback: true, wantAbsence: sourceVersionMemberMissing,
|
||||
mode: sourceVersionModeIfPresent, role: sourceVersionMain, wantCallback: true,
|
||||
},
|
||||
{name: "boolean", input: "version: true\n", path: Keys("version"), mode: sourceVersionModeIfPresent, role: sourceVersionContribution, wantCode: CodeVersionType, wantPresent: true},
|
||||
{name: "fraction", input: "version: 4.5\n", path: Keys("version"), mode: sourceVersionModeIfPresent, role: sourceVersionContribution, wantCode: CodeVersionType, wantPresent: true},
|
||||
@@ -307,15 +306,9 @@ func TestSourceVersionExtractionHandlesMissingAndMalformedValues(t *testing.T) {
|
||||
if result.evidence == nil || result.evidence.version.Present != test.wantPresent {
|
||||
t.Fatalf("evidence = %#v", result.evidence)
|
||||
}
|
||||
if result.evidence.absence != test.wantAbsence {
|
||||
t.Fatalf("absence cause = %v, want %v", result.evidence.absence, test.wantAbsence)
|
||||
}
|
||||
if test.wantCode == CodeVersionType && (!result.evidence.redacted || result.evidence.version.Text != "") {
|
||||
t.Fatalf("malformed value was retained: %#v", result.evidence)
|
||||
}
|
||||
if !test.wantCallback && result.evidence.checked {
|
||||
t.Fatalf("evidence incorrectly records a callback: %#v", result.evidence)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -339,7 +332,7 @@ func TestSourceVersionExtractionConsumesOnlySelectedNodes(t *testing.T) {
|
||||
if original, found := documentAtPath(root, Keys("settings", "version")); !found || original.Text != "8" {
|
||||
t.Fatalf("original source changed: %#v, found %v", original, found)
|
||||
}
|
||||
if len(result.evidence.ancestors) != 3 || result.evidence.ancestors[1].kind != document.Mapping {
|
||||
if len(result.evidence.ancestors) != 3 || result.evidence.ancestors[1].path.String() != "/settings" || result.evidence.ancestors[2].path.String() != "/settings/version" {
|
||||
t.Fatalf("ancestor shape = %#v", result.evidence.ancestors)
|
||||
}
|
||||
|
||||
@@ -1492,7 +1485,7 @@ func TestSourceVersionOverlayProtectsMountedMainAndPreservesSequenceCoordinates(
|
||||
t.Fatalf("resolve overlay context: %#v", diagnostic)
|
||||
}
|
||||
request := selectedOverlayRequest{
|
||||
name: "testing", filesystem: resolved, protectionRule: effectiveRule,
|
||||
name: "testing", protectionRule: effectiveRule,
|
||||
limits: defaultImportLimits(), versionState: state,
|
||||
}
|
||||
if diagnostic := validateResolvedFilesystemDirectories(resolved); diagnostic != nil {
|
||||
@@ -1544,7 +1537,7 @@ func TestSourceVersionImportAccountingIncludesConsumedHeaderNodes(t *testing.T)
|
||||
if len(foundDiagnostics) != 0 || composed == nil || len(sources) != 2 || accounting.nodes != wantNodes || accounting.bytes != wantBytes {
|
||||
t.Fatalf("exact raw byte/node accounting = %#v, %d/%d, want %d/%d, %#v", composed, accounting.bytes, accounting.nodes, wantBytes, wantNodes, foundDiagnostics)
|
||||
}
|
||||
if len(state.evidence) != 1 || state.evidence[0].sourceID != "source-2" || !state.evidence[0].checked || state.evidence[0].version.Text != "accepted" {
|
||||
if len(state.evidence) != 1 || state.evidence[0].sourceID != "source-2" || state.evidence[0].version.Text != "accepted" {
|
||||
t.Fatalf("acquired child evidence = %#v", state.evidence)
|
||||
}
|
||||
if _, present := documentAtPath(composed.root, Keys("version")); present {
|
||||
|
||||
Reference in New Issue
Block a user