Skip to content

Commit 660cef1

Browse files
committed
Update XmlConfigBuilderTest
1 parent 7c3ff97 commit 660cef1

File tree

5 files changed

+7
-0
lines changed

5 files changed

+7
-0
lines changed

src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ private void settingsElement(Properties props) {
268268
configuration.setReturnInstanceForEmptyRow(booleanValueOf(props.getProperty("returnInstanceForEmptyRow"), false));
269269
configuration.setLogPrefix(props.getProperty("logPrefix"));
270270
configuration.setConfigurationFactory(resolveClass(props.getProperty("configurationFactory")));
271+
configuration.setShrinkWhitespacesInSql(booleanValueOf(props.getProperty("shrinkWhitespacesInSql"), false));
271272
}
272273

273274
private void environmentsElement(XNode context) throws Exception {

src/test/java/org/apache/ibatis/builder/CustomizedSettingsMapperConfig.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<setting name="vfsImpl" value="org.apache.ibatis.io.JBoss6VFS"/>
5555
<setting name="configurationFactory" value="java.lang.String"/>
5656
<setting name="defaultEnumTypeHandler" value="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
57+
<setting name="shrinkWhitespacesInSql" value="true"/>
5758
</settings>
5859

5960
<typeAliases>

src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ void shouldSuccessfullyLoadMinimalXMLConfigFile() throws Exception {
100100
assertNull(config.getLogImpl());
101101
assertNull(config.getConfigurationFactory());
102102
assertThat(config.getTypeHandlerRegistry().getTypeHandler(RoundingMode.class)).isInstanceOf(EnumTypeHandler.class);
103+
assertThat(config.isShrinkWhitespacesInSql()).isFalse();
103104
}
104105
}
105106

@@ -194,6 +195,7 @@ void shouldSuccessfullyLoadXMLConfigFile() throws Exception {
194195
assertThat(config.getLogImpl().getName()).isEqualTo(Slf4jImpl.class.getName());
195196
assertThat(config.getVfsImpl().getName()).isEqualTo(JBoss6VFS.class.getName());
196197
assertThat(config.getConfigurationFactory().getName()).isEqualTo(String.class.getName());
198+
assertThat(config.isShrinkWhitespacesInSql()).isTrue();
197199

198200
assertThat(config.getTypeAliasRegistry().getTypeAliases().get("blogauthor")).isEqualTo(Author.class);
199201
assertThat(config.getTypeAliasRegistry().getTypeAliases().get("blog")).isEqualTo(Blog.class);

src/test/java/org/apache/ibatis/builder/xsd/CustomizedSettingsMapperConfig.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<setting name="logImpl" value="SLF4J"/>
5151
<setting name="vfsImpl" value="org.apache.ibatis.io.JBoss6VFS"/>
5252
<setting name="configurationFactory" value="java.lang.String"/>
53+
<setting name="shrinkWhitespacesInSql" value="true"/>
5354
</settings>
5455

5556
<typeAliases>

src/test/java/org/apache/ibatis/builder/xsd/XmlConfigBuilderTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ void shouldSuccessfullyLoadMinimalXMLConfigFile() throws Exception {
8484
assertNull(config.getLogPrefix());
8585
assertNull(config.getLogImpl());
8686
assertNull(config.getConfigurationFactory());
87+
assertFalse(config.isShrinkWhitespacesInSql());
8788
} finally {
8889
// System.clearProperty(XPathParser.KEY_USE_XSD);
8990
}
@@ -121,6 +122,7 @@ void shouldSuccessfullyLoadXMLConfigFile() throws Exception {
121122
assertEquals(Slf4jImpl.class.getName(), config.getLogImpl().getName());
122123
assertEquals(JBoss6VFS.class.getName(), config.getVfsImpl().getName());
123124
assertEquals(String.class.getName(), config.getConfigurationFactory().getName());
125+
assertTrue(config.isShrinkWhitespacesInSql());
124126

125127
assertEquals(Author.class, config.getTypeAliasRegistry().getTypeAliases().get("blogauthor"));
126128
assertEquals(Blog.class, config.getTypeAliasRegistry().getTypeAliases().get("blog"));

0 commit comments

Comments
 (0)