1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package merge_test
import (
"testing"
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
"sigs.k8s.io/structured-merge-diff/v4/merge"
"sigs.k8s.io/structured-merge-diff/v4/value"
)
var (
// Short names for readable test cases.
_NS = fieldpath.NewSet
_P = fieldpath.MakePathOrDie
_KBF = fieldpath.KeyByFields
_V = value.NewValueInterface
)
func TestNewFromSets(t *testing.T) {
got := merge.ConflictsFromManagers(fieldpath.ManagedFields{
"Bob": fieldpath.NewVersionedSet(
_NS(
_P("key"),
_P("list", _KBF("key", "a", "id", 2), "id"),
),
"v1",
false,
),
"Alice": fieldpath.NewVersionedSet(
_NS(
_P("value"),
_P("list", _KBF("key", "a", "id", 2), "key"),
),
"v1",
false,
),
})
wanted := `conflicts with "Alice":
- .value
- .list[id=2,key="a"].key
conflicts with "Bob":
- .key
- .list[id=2,key="a"].id`
if got.Error() != wanted {
t.Errorf("Got %v, wanted %v", got.Error(), wanted)
}
}
func TestToSet(t *testing.T) {
conflicts := merge.ConflictsFromManagers(fieldpath.ManagedFields{
"Bob": fieldpath.NewVersionedSet(
_NS(
_P("key"),
_P("list", _KBF("key", "a", "id", 2), "id"),
),
"v1",
false,
),
"Alice": fieldpath.NewVersionedSet(
_NS(
_P("value"),
_P("list", _KBF("key", "a", "id", 2), "key"),
),
"v1",
false,
),
})
expected := fieldpath.NewSet(
_P("key"),
_P("value"),
_P("list", _KBF("key", "a", "id", 2), "id"),
_P("list", _KBF("key", "a", "id", 2), "key"),
)
actual := conflicts.ToSet()
if !expected.Equals(actual) {
t.Fatalf("expected\n%v\n, but got\n%v\n", expected, actual)
}
}
|
