Skip to content

Commit 216646d

Browse files
committed
sq fixes
1 parent aaf0af6 commit 216646d

File tree

3 files changed

+31
-20
lines changed

3 files changed

+31
-20
lines changed

src/main/java/com/github/_1c_syntax/bsl/reader/common/context/AbstractReaderContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public abstract class AbstractReaderContext {
107107
*/
108108
@Setter
109109
@Getter
110+
@Nullable
110111
private String lastName;
111112

112113
/**

src/test/java/com/github/_1c_syntax/bsl/reader/MDOReaderTest.java

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ void testReadConfigurationWithValidPath() {
3939
var path = Paths.get("src/test/resources/ext/edt/ssl_3_1");
4040
var configuration = MDOReader.readConfiguration(path);
4141

42-
assertThat(configuration).isNotNull();
43-
assertThat(configuration).isInstanceOf(Configuration.class);
42+
assertThat(configuration)
43+
.isNotNull()
44+
.isInstanceOf(Configuration.class);
4445
}
4546

4647
@Test
@@ -49,17 +50,19 @@ void testReadConfigurationWithSettings() {
4950
var settings = MDCReadSettings.DEFAULT;
5051
var configuration = MDOReader.readConfiguration(path, settings);
5152

52-
assertThat(configuration).isNotNull();
53-
assertThat(configuration).isInstanceOf(Configuration.class);
53+
assertThat(configuration)
54+
.isNotNull()
55+
.isInstanceOf(Configuration.class);
5456
}
5557

5658
@Test
5759
void testReadConfigurationWithNonExistentPath() {
5860
var path = Paths.get("src/test/resources/nonexistent");
5961
var configuration = MDOReader.readConfiguration(path);
6062

61-
assertThat(configuration).isNotNull();
62-
assertThat(configuration).isEqualTo(Configuration.EMPTY);
63+
assertThat(configuration)
64+
.isNotNull()
65+
.isEqualTo(Configuration.EMPTY);
6366
}
6467

6568
@ParameterizedTest
@@ -71,8 +74,9 @@ void testReadConfigurationDifferentSources(String pathString) {
7174
var path = Paths.get(pathString);
7275
var configuration = MDOReader.readConfiguration(path);
7376

74-
assertThat(configuration).isNotNull();
75-
assertThat(configuration).isInstanceOf(Configuration.class);
77+
assertThat(configuration)
78+
.isNotNull()
79+
.isInstanceOf(Configuration.class);
7680
}
7781

7882
@Test
@@ -106,26 +110,29 @@ void testReadExternalSourceWithInvalidPath() {
106110
var path = Paths.get("src/test/resources/nonexistent.mdo");
107111
var externalSource = MDOReader.readExternalSource(path);
108112

109-
assertThat(externalSource).isNotNull();
110-
assertThat(externalSource).isEqualTo(ExternalReport.EMPTY);
113+
assertThat(externalSource)
114+
.isNotNull()
115+
.isEqualTo(ExternalReport.EMPTY);
111116
}
112117

113118
@Test
114119
void testReadConfigurationFromFile() {
115120
var path = Paths.get("src/test/resources/ext/edt/ssl_3_1/configuration/Configuration.mdo");
116121
var configuration = MDOReader.readConfiguration(path);
117122

118-
assertThat(configuration).isNotNull();
119-
assertThat(configuration).isInstanceOf(Configuration.class);
123+
assertThat(configuration)
124+
.isNotNull()
125+
.isInstanceOf(Configuration.class);
120126
}
121127

122128
@Test
123129
void testReadConfigurationFromDesignerFile() {
124130
var path = Paths.get("src/test/resources/ext/designer/ssl_3_1/src/Configuration/Configuration.xml");
125131
var configuration = MDOReader.readConfiguration(path);
126132

127-
assertThat(configuration).isNotNull();
128-
assertThat(configuration).isInstanceOf(Configuration.class);
133+
assertThat(configuration)
134+
.isNotNull()
135+
.isInstanceOf(Configuration.class);
129136
}
130137

131138
@Test

src/test/java/com/github/_1c_syntax/bsl/reader/common/TransformationUtilsTest.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ void testFieldTypeWithNonExistentField() {
100100
void testBuilder() {
101101
var builder = TransformationUtils.builder(TestClass.class);
102102

103-
assertThat(builder).isNotNull();
104-
assertThat(builder).isInstanceOf(TestClass.TestClassBuilder.class);
103+
assertThat(builder)
104+
.isNotNull()
105+
.isInstanceOf(TestClass.TestClassBuilder.class);
105106
}
106107

107108
@Test
@@ -124,8 +125,9 @@ void testBuildWithBuilder() {
124125
var builder = TestClass.builder().name("Test").value(100);
125126
var result = TransformationUtils.build(builder);
126127

127-
assertThat(result).isNotNull();
128-
assertThat(result).isInstanceOf(TestClass.class);
128+
assertThat(result)
129+
.isNotNull()
130+
.isInstanceOf(TestClass.class);
129131
assertThat(((TestClass) result).getName()).isEqualTo("Test");
130132
assertThat(((TestClass) result).getValue()).isEqualTo(100);
131133
}
@@ -136,8 +138,9 @@ void testBuildWithBuilderAndPath() {
136138
var path = Paths.get("test/path");
137139
var result = TransformationUtils.build(builder, path);
138140

139-
assertThat(result).isNotNull();
140-
assertThat(result).isInstanceOf(TestClass.class);
141+
assertThat(result)
142+
.isNotNull()
143+
.isInstanceOf(TestClass.class);
141144
}
142145

143146
@Test

0 commit comments

Comments
 (0)