Skip to content

Commit f00f3f4

Browse files
theshadowcotheshadowco
committed
fix test
1 parent 4ea8407 commit f00f3f4

File tree

5 files changed

+477
-909
lines changed

5 files changed

+477
-909
lines changed

‎build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ dependencies {
5656
// прочее
5757
implementation("commons-io", "commons-io", "2.8.0")
5858
implementation("com.github.1c-syntax", "utils", "0.5.1")
59-
implementation("io.github.1c-syntax", "bsl-common-library", "0.5.0")
60-
implementation("io.github.1c-syntax", "supportconf", "0.12.1") {
59+
implementation("io.github.1c-syntax", "bsl-common-library", "0.5.1")
60+
implementation("io.github.1c-syntax", "supportconf", "0.13.1") {
6161
exclude("io.github.1c-syntax", "bsl-common-library")
6262
}
6363

‎src/main/java/com/github/_1c_syntax/bsl/reader/FakeReader.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
/*
2-
* This file is a part of MDClasses.
3-
*
4-
* Copyright (c) 2019 - 2024
5-
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6-
*
7-
* SPDX-License-Identifier: LGPL-3.0-or-later
8-
*
9-
* MDClasses is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU Lesser General Public
11-
* License as published by the Free Software Foundation; either
12-
* version 3.0 of the License, or (at your option) any later version.
13-
*
14-
* MDClasses is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
* Lesser General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU Lesser General Public
20-
* License along with MDClasses.
21-
*/
22-
package com.github._1c_syntax.bsl.reader;
1+
/*
2+
* This file is a part of MDClasses.
3+
*
4+
* Copyright (c) 2019 - 2024
5+
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* MDClasses is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* MDClasses is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with MDClasses.
21+
*/
22+
package com.github._1c_syntax.bsl.reader;
2323

2424
import com.github._1c_syntax.bsl.mdclasses.MDClass;
2525
import com.github._1c_syntax.bsl.mdclasses.MDClasses;

‎src/main/java/com/github/_1c_syntax/bsl/reader/MDReader.java

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
/*
2-
* This file is a part of MDClasses.
3-
*
4-
* Copyright (c) 2019 - 2024
5-
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6-
*
7-
* SPDX-License-Identifier: LGPL-3.0-or-later
8-
*
9-
* MDClasses is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU Lesser General Public
11-
* License as published by the Free Software Foundation; either
12-
* version 3.0 of the License, or (at your option) any later version.
13-
*
14-
* MDClasses is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
* Lesser General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU Lesser General Public
20-
* License along with MDClasses.
21-
*/
22-
package com.github._1c_syntax.bsl.reader;
1+
/*
2+
* This file is a part of MDClasses.
3+
*
4+
* Copyright (c) 2019 - 2024
5+
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* MDClasses is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* MDClasses is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with MDClasses.
21+
*/
22+
package com.github._1c_syntax.bsl.reader;
2323

2424
import com.github._1c_syntax.bsl.mdclasses.MDClass;
2525
import com.github._1c_syntax.bsl.reader.common.xstream.ExtendXStream;
@@ -65,5 +65,4 @@ default Converter getReflectionConverter() {
6565
MDClass readConfiguration();
6666

6767
MDClass readExternalSource();
68-
6968
}

‎src/test/resources/fixtures/mdclasses/Roles.Роль1.json

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -171,52 +171,40 @@
171171
"rights": [
172172
[
173173
{
174-
"name": "READ",
175-
"value": true
174+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right"
176175
},
177176
{
178-
"name": "INSERT",
179-
"value": true
177+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[2]"
180178
},
181179
{
182-
"name": "UPDATE",
183-
"value": true
180+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[3]"
184181
},
185182
{
186-
"name": "DELETE",
187-
"value": true
183+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[4]"
188184
},
189185
{
190-
"name": "VIEW",
191-
"value": true
186+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[7]"
192187
},
193188
{
194-
"name": "INTERACTIVE_INSERT",
195-
"value": true
189+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[8]"
196190
},
197191
{
198-
"name": "EDIT",
199-
"value": true
192+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[9]"
200193
},
201194
{
202-
"name": "INTERACTIVE_DELETE",
203-
"value": true
195+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[10]"
204196
},
205197
{
206-
"name": "INTERACTIVE_SET_DELETION_MARK",
207-
"value": true
198+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[11]"
208199
},
209200
{
210-
"name": "INTERACTIVE_CLEAR_DELETION_MARK",
211-
"value": true
201+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[12]"
212202
},
213203
{
214-
"name": "INTERACTIVE_DELETE_MARKED",
215-
"value": true
204+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[13]"
216205
},
217206
{
218-
"name": "INPUT_BY_STRING",
219-
"value": true
207+
"@reference": "/com.github._1c_syntax.bsl.mdo.Role/data/objectRights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$ObjectRight[2]/rights/c/com.github._1c_syntax.bsl.mdo.storage.RoleData$Right[18]"
220208
},
221209
{
222210
"name": "INTERACTIVE_DELETE_PREDEFINED_DATA",

0 commit comments

Comments
 (0)