Skip to content

Commit 0e22211

Browse files
julia05julia05
committed
add not categorized tests 7 - insert same
1 parent 497b355 commit 0e22211

4 files changed

Lines changed: 517 additions & 2 deletions

File tree

‎tests/configs.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ export const testsEnabled = {
77
"4_xx_update-update_ordered": true,
88
"5_move-move": true,
99
"6_insert-insert": true,
10-
"7_not-categorized": false,
10+
"7_not-categorized": true,
1111
};

‎tests/ressources/7_not-categorized/7_1_same_self_reference.json‎

Lines changed: 264 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,264 @@
1+
{
2+
"base": {
3+
"package": {
4+
"id": "scml",
5+
"classes": [
6+
{
7+
"id": "Smart City",
8+
"references": [
9+
{
10+
"id": "project",
11+
"containment": true,
12+
"upperBound": -1,
13+
"lowerBound": 0,
14+
"type": {
15+
"$ref": "#/package/classes/1"
16+
}
17+
}
18+
]
19+
},
20+
{
21+
"id": "Project",
22+
"references": [
23+
{
24+
"id": "component",
25+
"containment": true,
26+
"upperBound": -1,
27+
"lowerBound": 0,
28+
"type": {
29+
"$ref": "#/package/classes/2"
30+
}
31+
}
32+
]
33+
},
34+
{
35+
"id": "InfrastructureComponent",
36+
"references": []
37+
}
38+
]
39+
}
40+
},
41+
"left": {
42+
"package": {
43+
"id": "scml",
44+
"classes": [
45+
{
46+
"id": "Smart City",
47+
"references": [
48+
{
49+
"id": "project",
50+
"containment": true,
51+
"upperBound": -1,
52+
"lowerBound": 0,
53+
"type": {
54+
"$ref": "#/package/classes/1"
55+
}
56+
}
57+
]
58+
},
59+
{
60+
"id": "Project",
61+
"references": [
62+
{
63+
"id": "component",
64+
"containment": true,
65+
"upperBound": -1,
66+
"lowerBound": 0,
67+
"type": {
68+
"$ref": "#/package/classes/2"
69+
}
70+
}
71+
]
72+
},
73+
{
74+
"id": "InfrastructureComponent",
75+
"references": [
76+
{
77+
"id": "x",
78+
"containment": true,
79+
"upperBound": 1,
80+
"lowerBound": 1,
81+
"type": {
82+
"$ref": "#/package/classes/2"
83+
}
84+
},
85+
{
86+
"id": "y",
87+
"containment": false,
88+
"upperBound": 1,
89+
"lowerBound": 1,
90+
"type": {
91+
"$ref": "#/package/classes/2"
92+
}
93+
}
94+
]
95+
}
96+
]
97+
}
98+
},
99+
"right": {
100+
"package": {
101+
"id": "scml",
102+
"classes": [
103+
{
104+
"id": "Smart City",
105+
"references": [
106+
{
107+
"id": "project",
108+
"containment": true,
109+
"upperBound": -1,
110+
"lowerBound": 0,
111+
"type": {
112+
"$ref": "#/package/classes/1"
113+
}
114+
}
115+
]
116+
},
117+
{
118+
"id": "Project",
119+
"references": [
120+
{
121+
"id": "component",
122+
"containment": true,
123+
"upperBound": -1,
124+
"lowerBound": 0,
125+
"type": {
126+
"$ref": "#/package/classes/2"
127+
}
128+
}
129+
]
130+
},
131+
{
132+
"id": "InfrastructureComponent",
133+
"references": [
134+
{
135+
"id": "x",
136+
"containment": true,
137+
"upperBound": 1,
138+
"lowerBound": 1,
139+
"type": {
140+
"$ref": "#/package/classes/2"
141+
}
142+
},
143+
{
144+
"id": "y",
145+
"containment": false,
146+
"upperBound": 1,
147+
"lowerBound": 1,
148+
"type": {
149+
"$ref": "#/package/classes/2"
150+
}
151+
}
152+
]
153+
}
154+
]
155+
}
156+
},
157+
"expected": {
158+
"2way-a": [
159+
{
160+
"op": "add",
161+
"path": "/package/classes/2/references/0",
162+
"value": {
163+
"id": "x",
164+
"containment": true,
165+
"upperBound": 1,
166+
"lowerBound": 1,
167+
"type": {
168+
"$ref": "#/package/classes/2"
169+
}
170+
}
171+
},
172+
{
173+
"op": "add",
174+
"path": "/package/classes/2/references/1",
175+
"value": {
176+
"id": "y",
177+
"containment": false,
178+
"upperBound": 1,
179+
"lowerBound": 1,
180+
"type": {
181+
"$ref": "#/package/classes/2"
182+
}
183+
}
184+
}
185+
],
186+
"2way-b": [
187+
{
188+
"op": "add",
189+
"path": "/package/classes/2/references/0",
190+
"value": {
191+
"id": "x",
192+
"containment": true,
193+
"upperBound": 1,
194+
"lowerBound": 1,
195+
"type": {
196+
"$ref": "#/package/classes/2"
197+
}
198+
}
199+
},
200+
{
201+
"op": "add",
202+
"path": "/package/classes/2/references/1",
203+
"value": {
204+
"id": "y",
205+
"containment": false,
206+
"upperBound": 1,
207+
"lowerBound": 1,
208+
"type": {
209+
"$ref": "#/package/classes/2"
210+
}
211+
}
212+
}
213+
],
214+
"3way": {
215+
"threeWay": true,
216+
"differencesL": [
217+
{
218+
"id": 0,
219+
"kind": "add",
220+
"state": 0,
221+
"path": "/package/classes/2/references/0"
222+
},
223+
{
224+
"id": 1,
225+
"kind": "add",
226+
"state": 0,
227+
"path": "/package/classes/2/references/1"
228+
}
229+
],
230+
"differencesR": [
231+
{
232+
"id": 0,
233+
"kind": "add",
234+
"state": 0,
235+
"path": "/package/classes/2/references/0"
236+
},
237+
{
238+
"id": 1,
239+
"kind": "add",
240+
"state": 0,
241+
"path": "/package/classes/2/references/1"
242+
}
243+
],
244+
"conflicts": [
245+
{
246+
"leftDiff": {
247+
"$ref": "#/differencesL/0"
248+
},
249+
"rightDiff": {
250+
"$ref": "#/differencesR/0"
251+
}
252+
},
253+
{
254+
"leftDiff": {
255+
"$ref": "#/differencesL/1"
256+
},
257+
"rightDiff": {
258+
"$ref": "#/differencesR/1"
259+
}
260+
}
261+
]
262+
}
263+
}
264+
}

0 commit comments

Comments
 (0)