Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
theshadowco committed Jan 23, 2024
1 parent 4ea8407 commit f00f3f4
Show file tree
Hide file tree
Showing 5 changed files with 477 additions and 909 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ dependencies {
// прочее
implementation("commons-io", "commons-io", "2.8.0")
implementation("com.github.1c-syntax", "utils", "0.5.1")
implementation("io.github.1c-syntax", "bsl-common-library", "0.5.0")
implementation("io.github.1c-syntax", "supportconf", "0.12.1") {
implementation("io.github.1c-syntax", "bsl-common-library", "0.5.1")
implementation("io.github.1c-syntax", "supportconf", "0.13.1") {
exclude("io.github.1c-syntax", "bsl-common-library")
}

Expand Down
44 changes: 22 additions & 22 deletions src/main/java/com/github/_1c_syntax/bsl/reader/FakeReader.java
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
/*
* This file is a part of MDClasses.
*
* Copyright (c) 2019 - 2024
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
*
* MDClasses is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* MDClasses is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with MDClasses.
*/
package com.github._1c_syntax.bsl.reader;
/*
* This file is a part of MDClasses.
*
* Copyright (c) 2019 - 2024
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
*
* MDClasses is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* MDClasses is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with MDClasses.
*/
package com.github._1c_syntax.bsl.reader;

import com.github._1c_syntax.bsl.mdclasses.MDClass;
import com.github._1c_syntax.bsl.mdclasses.MDClasses;
Expand Down
45 changes: 22 additions & 23 deletions src/main/java/com/github/_1c_syntax/bsl/reader/MDReader.java
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
/*
* This file is a part of MDClasses.
*
* Copyright (c) 2019 - 2024
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
*
* MDClasses is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* MDClasses is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with MDClasses.
*/
package com.github._1c_syntax.bsl.reader;
/*
* This file is a part of MDClasses.
*
* Copyright (c) 2019 - 2024
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
*
* MDClasses is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* MDClasses is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with MDClasses.
*/
package com.github._1c_syntax.bsl.reader;

import com.github._1c_syntax.bsl.mdclasses.MDClass;
import com.github._1c_syntax.bsl.reader.common.xstream.ExtendXStream;
Expand Down Expand Up @@ -65,5 +65,4 @@ default Converter getReflectionConverter() {
MDClass readConfiguration();

MDClass readExternalSource();

}
36 changes: 12 additions & 24 deletions src/test/resources/fixtures/mdclasses/Roles.Роль1.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,52 +171,40 @@
"rights": [
[
{
"name": "READ",
"value": true
"@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"
},
{
"name": "INSERT",
"value": true
"@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]"
},
{
"name": "UPDATE",
"value": true
"@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]"
},
{
"name": "DELETE",
"value": true
"@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]"
},
{
"name": "VIEW",
"value": true
"@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]"
},
{
"name": "INTERACTIVE_INSERT",
"value": true
"@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]"
},
{
"name": "EDIT",
"value": true
"@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]"
},
{
"name": "INTERACTIVE_DELETE",
"value": true
"@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]"
},
{
"name": "INTERACTIVE_SET_DELETION_MARK",
"value": true
"@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]"
},
{
"name": "INTERACTIVE_CLEAR_DELETION_MARK",
"value": true
"@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]"
},
{
"name": "INTERACTIVE_DELETE_MARKED",
"value": true
"@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]"
},
{
"name": "INPUT_BY_STRING",
"value": true
"@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]"
},
{
"name": "INTERACTIVE_DELETE_PREDEFINED_DATA",
Expand Down
Loading

0 comments on commit f00f3f4

Please sign in to comment.