Skip to content

Commit 0dfb95f

Browse files
theshadowcotheshadowco
committed
обновление библиотеки и фиксы тестов
1 parent 7cfe619 commit 0dfb95f

File tree

127 files changed

+14200
-6003
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+14200
-6003
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ dependencies {
5858

5959
// прочее
6060
implementation("commons-io", "commons-io", "2.18.0")
61-
implementation("io.github.1c-syntax", "bsl-common-library", "0.9.0.9-SNAPSHOT")
61+
implementation("io.github.1c-syntax", "bsl-common-library", "0.9.0.16-SNAPSHOT")
6262
implementation("io.github.1c-syntax", "utils", "0.6.3")
6363
implementation("io.github.1c-syntax", "supportconf", "0.14.3") {
6464
exclude("io.github.1c-syntax", "bsl-common-library")

‎src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/ValueTypeQualifierConverter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.github._1c_syntax.bsl.types.Qualifier;
2828
import com.github._1c_syntax.bsl.types.qualifiers.BinaryDataQualifiers;
2929
import com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers;
30-
import com.github._1c_syntax.bsl.types.qualifiers.EmptyQualifiers;
3130
import com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers;
3231
import com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers;
3332
import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -98,7 +97,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
9897
return BinaryDataQualifiers.create(length, allowedLength);
9998
} else { // квалификаторы пока не обрабатываются
10099
LOGGER.warn("Unknown qualifiers {}", nodeName);
101-
return EmptyQualifiers.EMPTY;
100+
return Qualifier.EMPTY;
102101
}
103102
}
104103

‎src/test/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationTest.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,18 @@
3232
import com.github._1c_syntax.bsl.types.ConfigurationSource;
3333
import com.github._1c_syntax.bsl.types.MdoReference;
3434
import com.github._1c_syntax.bsl.types.ModuleType;
35+
import lombok.extern.slf4j.Slf4j;
36+
import org.junit.jupiter.api.Test;
3537
import org.junit.jupiter.params.ParameterizedTest;
3638
import org.junit.jupiter.params.aggregator.ArgumentsAccessor;
3739
import org.junit.jupiter.params.provider.CsvSource;
3840

41+
import java.nio.file.Path;
3942
import java.util.List;
4043

4144
import static org.assertj.core.api.Assertions.assertThat;
4245

43-
46+
@Slf4j
4447
class ConfigurationTest {
4548
@ParameterizedTest
4649
@CsvSource(
@@ -82,7 +85,7 @@ void testFullSSL(ArgumentsAccessor argumentsAccessor) {
8285
checkChildrenSSL(cf);
8386

8487
assertThat(cf.getPlainChildren())
85-
.hasSize(8037)
88+
.hasSize(8038)
8689
.allMatch(md -> md.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
8790

8891
assertThat(cf.getModulesByType())
@@ -196,7 +199,7 @@ void testFullMdclasses(ArgumentsAccessor argumentsAccessor) {
196199
checkChildrenMdclasses(cf);
197200

198201
assertThat(cf.getPlainChildren())
199-
.hasSize(221 + cf.getInterfaces().size() + cf.getStyles().size())
202+
.hasSize(222 + cf.getInterfaces().size() + cf.getStyles().size())
200203
.allMatch(md -> md.getSupportVariant().equals(SupportVariant.NONE));
201204

202205
assertThat(cf.getModules().stream().filter(Module::isProtected)).isEmpty();
@@ -233,7 +236,7 @@ void testFullExt(ArgumentsAccessor argumentsAccessor) {
233236
checkChildrenOrder(cf);
234237

235238
assertThat(cf.getPlainChildren())
236-
.hasSize(326)
239+
.hasSize(328)
237240
.allMatch(md -> md.getSupportVariant().equals(SupportVariant.NONE));
238241

239242
assertThat(cf.getAllModules().stream().filter(Module::isProtected)).isEmpty();

‎src/test/resources/fixtures/external/ТестоваяВнешняяОбработка.json‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,16 @@
1212
"comment": "",
1313
"synonym": {
1414
"content": [
15-
[
16-
1
17-
]
15+
{
16+
"default": {
17+
"tag": 2
18+
},
19+
"int": 1,
20+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
21+
"langKey": "ru",
22+
"value": "Реквизит обработки"
23+
}
24+
}
1825
]
1926
},
2027
"supportVariant": "NONE",
@@ -95,9 +102,16 @@
95102
"supportVariant": "NONE",
96103
"synonym": {
97104
"content": [
98-
[
99-
1
100-
]
105+
{
106+
"default": {
107+
"tag": 2
108+
},
109+
"int": 1,
110+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
111+
"langKey": "ru",
112+
"value": "Тестовая внешняя обработка"
113+
}
114+
}
101115
]
102116
},
103117
"tabularSections": [
@@ -113,9 +127,16 @@
113127
"comment": "",
114128
"synonym": {
115129
"content": [
116-
[
117-
1
118-
]
130+
{
131+
"default": {
132+
"tag": 2
133+
},
134+
"int": 1,
135+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
136+
"langKey": "ru",
137+
"value": "Табличная часть обработки"
138+
}
139+
}
119140
]
120141
},
121142
"supportVariant": "NONE",
@@ -143,9 +164,16 @@
143164
"comment": "",
144165
"synonym": {
145166
"content": [
146-
[
147-
1
148-
]
167+
{
168+
"default": {
169+
"tag": 2
170+
},
171+
"int": 1,
172+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
173+
"langKey": "ru",
174+
"value": "Макет"
175+
}
176+
}
149177
]
150178
},
151179
"supportVariant": "NONE",

‎src/test/resources/fixtures/external/ТестоваяВнешняяОбработка_edt.json‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,16 @@
1212
"comment": "",
1313
"synonym": {
1414
"content": [
15-
[
16-
1
17-
]
15+
{
16+
"default": {
17+
"tag": 2
18+
},
19+
"int": 1,
20+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
21+
"langKey": "ru",
22+
"value": "Реквизит обработки"
23+
}
24+
}
1825
]
1926
},
2027
"supportVariant": "NONE",
@@ -95,9 +102,16 @@
95102
"supportVariant": "NONE",
96103
"synonym": {
97104
"content": [
98-
[
99-
1
100-
]
105+
{
106+
"default": {
107+
"tag": 2
108+
},
109+
"int": 1,
110+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
111+
"langKey": "ru",
112+
"value": "Тестовая внешняя обработка"
113+
}
114+
}
101115
]
102116
},
103117
"tabularSections": [
@@ -113,9 +127,16 @@
113127
"comment": "",
114128
"synonym": {
115129
"content": [
116-
[
117-
1
118-
]
130+
{
131+
"default": {
132+
"tag": 2
133+
},
134+
"int": 1,
135+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
136+
"langKey": "ru",
137+
"value": "Табличная часть обработки"
138+
}
139+
}
119140
]
120141
},
121142
"supportVariant": "NONE",
@@ -143,9 +164,16 @@
143164
"comment": "",
144165
"synonym": {
145166
"content": [
146-
[
147-
1
148-
]
167+
{
168+
"default": {
169+
"tag": 2
170+
},
171+
"int": 1,
172+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
173+
"langKey": "ru",
174+
"value": "Макет"
175+
}
176+
}
149177
]
150178
},
151179
"supportVariant": "NONE",

‎src/test/resources/fixtures/external/ТестовыйВнешнийОтчет.json‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,16 @@
1212
"comment": "",
1313
"synonym": {
1414
"content": [
15-
[
16-
1
17-
]
15+
{
16+
"default": {
17+
"tag": 2
18+
},
19+
"int": 1,
20+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
21+
"langKey": "ru",
22+
"value": "Ревзит отчета"
23+
}
24+
}
1825
]
1926
},
2027
"supportVariant": "NONE",
@@ -95,9 +102,16 @@
95102
"supportVariant": "NONE",
96103
"synonym": {
97104
"content": [
98-
[
99-
1
100-
]
105+
{
106+
"default": {
107+
"tag": 2
108+
},
109+
"int": 1,
110+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
111+
"langKey": "ru",
112+
"value": "Тестовый внешний отчет"
113+
}
114+
}
101115
]
102116
},
103117
"tabularSections": [
@@ -113,9 +127,16 @@
113127
"comment": "",
114128
"synonym": {
115129
"content": [
116-
[
117-
1
118-
]
130+
{
131+
"default": {
132+
"tag": 2
133+
},
134+
"int": 1,
135+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
136+
"langKey": "ru",
137+
"value": "Табличная часть"
138+
}
139+
}
119140
]
120141
},
121142
"supportVariant": "NONE",
@@ -143,9 +164,16 @@
143164
"comment": "",
144165
"synonym": {
145166
"content": [
146-
[
147-
1
148-
]
167+
{
168+
"default": {
169+
"tag": 2
170+
},
171+
"int": 1,
172+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
173+
"langKey": "ru",
174+
"value": "Основная схема компоновки данных"
175+
}
176+
}
149177
]
150178
},
151179
"supportVariant": "NONE",

‎src/test/resources/fixtures/external/ТестовыйВнешнийОтчет_edt.json‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,16 @@
1212
"comment": "",
1313
"synonym": {
1414
"content": [
15-
[
16-
1
17-
]
15+
{
16+
"default": {
17+
"tag": 2
18+
},
19+
"int": 1,
20+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
21+
"langKey": "ru",
22+
"value": "Ревзит отчета"
23+
}
24+
}
1825
]
1926
},
2027
"supportVariant": "NONE",
@@ -95,9 +102,16 @@
95102
"supportVariant": "NONE",
96103
"synonym": {
97104
"content": [
98-
[
99-
1
100-
]
105+
{
106+
"default": {
107+
"tag": 2
108+
},
109+
"int": 1,
110+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
111+
"langKey": "ru",
112+
"value": "Тестовый внешний отчет"
113+
}
114+
}
101115
]
102116
},
103117
"tabularSections": [
@@ -113,9 +127,16 @@
113127
"comment": "",
114128
"synonym": {
115129
"content": [
116-
[
117-
1
118-
]
130+
{
131+
"default": {
132+
"tag": 2
133+
},
134+
"int": 1,
135+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
136+
"langKey": "ru",
137+
"value": "Табличная часть"
138+
}
139+
}
119140
]
120141
},
121142
"supportVariant": "NONE",
@@ -143,9 +164,16 @@
143164
"comment": "",
144165
"synonym": {
145166
"content": [
146-
[
147-
1
148-
]
167+
{
168+
"default": {
169+
"tag": 2
170+
},
171+
"int": 1,
172+
"com.github._1c_syntax.bsl.types.MultiLanguageString$Entry": {
173+
"langKey": "ru",
174+
"value": "Основная схема компоновки данных"
175+
}
176+
}
149177
]
150178
},
151179
"supportVariant": "NONE",

0 commit comments

Comments
 (0)