Skip to content

Change to use try-with-resources on test #1270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 3, 2018
Merged

Change to use try-with-resources on test #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/test/java/org/apache/ibatis/autoconstructor/AutoConstructorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ public class AutoConstructorTest {
@BeforeClass
public static void setUp() throws Exception {
// create a SqlSessionFactory
final Reader reader = Resources.getResourceAsReader("org/apache/ibatis/autoconstructor/mybatis-config.xml");
sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
reader.close();
try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/autoconstructor/mybatis-config.xml")) {
sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
}

// populate in-memory database
BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
Expand Down
15 changes: 6 additions & 9 deletions src/test/java/org/apache/ibatis/binding/BindingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ public void shouldSelectBlogWithPostsUsingSubSelect() {
BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
Blog b = mapper.selectBlogWithPostsUsingSubSelect(1);
assertEquals(1, b.getId());
session.close();
assertNotNull(b.getAuthor());
assertEquals(101, b.getAuthor().getId());
assertEquals("jim", b.getAuthor().getUsername());
Expand Down Expand Up @@ -637,14 +636,12 @@ public void executeWithMapKeyAndRowBounds() {
public void executeWithCursorAndRowBounds() {
try (SqlSession session = sqlSessionFactory.openSession()) {
BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
Cursor<Blog> blogs = mapper.openRangeBlogs(new RowBounds(1, 1));

Iterator<Blog> blogIterator = blogs.iterator();
Blog blog = blogIterator.next();
assertEquals(2, blog.getId());
assertFalse(blogIterator.hasNext());

blogs.close();
try (Cursor<Blog> blogs = mapper.openRangeBlogs(new RowBounds(1, 1)) ) {
Iterator<Blog> blogIterator = blogs.iterator();
Blog blog = blogIterator.next();
assertEquals(2, blog.getId());
assertFalse(blogIterator.hasNext());
}
} catch (IOException e) {
Assert.fail(e.getMessage());
}
Expand Down
218 changes: 109 additions & 109 deletions src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2009-2017 the original author or authors.
* Copyright 2009-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -72,35 +72,35 @@ public class XmlConfigBuilderTest {
@Test
public void shouldSuccessfullyLoadMinimalXMLConfigFile() throws Exception {
String resource = "org/apache/ibatis/builder/MinimalMapperConfig.xml";
InputStream inputStream = Resources.getResourceAsStream(resource);
XMLConfigBuilder builder = new XMLConfigBuilder(inputStream);
Configuration config = builder.parse();
assertNotNull(config);
assertThat(config.getAutoMappingBehavior()).isEqualTo(AutoMappingBehavior.PARTIAL);
assertThat(config.getAutoMappingUnknownColumnBehavior()).isEqualTo(AutoMappingUnknownColumnBehavior.NONE);
assertThat(config.isCacheEnabled()).isTrue();
assertThat(config.getProxyFactory()).isInstanceOf(JavassistProxyFactory.class);
assertThat(config.isLazyLoadingEnabled()).isFalse();
assertThat(config.isAggressiveLazyLoading()).isFalse();
assertThat(config.isMultipleResultSetsEnabled()).isTrue();
assertThat(config.isUseColumnLabel()).isTrue();
assertThat(config.isUseGeneratedKeys()).isFalse();
assertThat(config.getDefaultExecutorType()).isEqualTo(ExecutorType.SIMPLE);
assertNull(config.getDefaultStatementTimeout());
assertNull(config.getDefaultFetchSize());
assertThat(config.isMapUnderscoreToCamelCase()).isFalse();
assertThat(config.isSafeRowBoundsEnabled()).isFalse();
assertThat(config.getLocalCacheScope()).isEqualTo(LocalCacheScope.SESSION);
assertThat(config.getJdbcTypeForNull()).isEqualTo(JdbcType.OTHER);
assertThat(config.getLazyLoadTriggerMethods()).isEqualTo((Set<String>) new HashSet<String>(Arrays.asList("equals", "clone", "hashCode", "toString")));
assertThat(config.isSafeResultHandlerEnabled()).isTrue();
assertThat(config.getDefaultScriptingLanuageInstance()).isInstanceOf(XMLLanguageDriver.class);
assertThat(config.isCallSettersOnNulls()).isFalse();
assertNull(config.getLogPrefix());
assertNull(config.getLogImpl());
assertNull(config.getConfigurationFactory());
assertThat(config.getTypeHandlerRegistry().getTypeHandler(RoundingMode.class)).isInstanceOf(EnumTypeHandler.class);
inputStream.close();
try (InputStream inputStream = Resources.getResourceAsStream(resource)) {
XMLConfigBuilder builder = new XMLConfigBuilder(inputStream);
Configuration config = builder.parse();
assertNotNull(config);
assertThat(config.getAutoMappingBehavior()).isEqualTo(AutoMappingBehavior.PARTIAL);
assertThat(config.getAutoMappingUnknownColumnBehavior()).isEqualTo(AutoMappingUnknownColumnBehavior.NONE);
assertThat(config.isCacheEnabled()).isTrue();
assertThat(config.getProxyFactory()).isInstanceOf(JavassistProxyFactory.class);
assertThat(config.isLazyLoadingEnabled()).isFalse();
assertThat(config.isAggressiveLazyLoading()).isFalse();
assertThat(config.isMultipleResultSetsEnabled()).isTrue();
assertThat(config.isUseColumnLabel()).isTrue();
assertThat(config.isUseGeneratedKeys()).isFalse();
assertThat(config.getDefaultExecutorType()).isEqualTo(ExecutorType.SIMPLE);
assertNull(config.getDefaultStatementTimeout());
assertNull(config.getDefaultFetchSize());
assertThat(config.isMapUnderscoreToCamelCase()).isFalse();
assertThat(config.isSafeRowBoundsEnabled()).isFalse();
assertThat(config.getLocalCacheScope()).isEqualTo(LocalCacheScope.SESSION);
assertThat(config.getJdbcTypeForNull()).isEqualTo(JdbcType.OTHER);
assertThat(config.getLazyLoadTriggerMethods()).isEqualTo((Set<String>) new HashSet<String>(Arrays.asList("equals", "clone", "hashCode", "toString")));
assertThat(config.isSafeResultHandlerEnabled()).isTrue();
assertThat(config.getDefaultScriptingLanuageInstance()).isInstanceOf(XMLLanguageDriver.class);
assertThat(config.isCallSettersOnNulls()).isFalse();
assertNull(config.getLogPrefix());
assertNull(config.getLogImpl());
assertNull(config.getConfigurationFactory());
assertThat(config.getTypeHandlerRegistry().getTypeHandler(RoundingMode.class)).isInstanceOf(EnumTypeHandler.class);
}
}

enum MyEnum {
Expand Down Expand Up @@ -163,96 +163,96 @@ public void registerJavaTypeInitializingTypeHandler() {
@Test
public void shouldSuccessfullyLoadXMLConfigFile() throws Exception {
String resource = "org/apache/ibatis/builder/CustomizedSettingsMapperConfig.xml";
InputStream inputStream = Resources.getResourceAsStream(resource);
Properties props = new Properties();
props.put("prop2", "cccc");
XMLConfigBuilder builder = new XMLConfigBuilder(inputStream, null, props);
Configuration config = builder.parse();

assertThat(config.getAutoMappingBehavior()).isEqualTo(AutoMappingBehavior.NONE);
assertThat(config.getAutoMappingUnknownColumnBehavior()).isEqualTo(AutoMappingUnknownColumnBehavior.WARNING);
assertThat(config.isCacheEnabled()).isFalse();
assertThat(config.getProxyFactory()).isInstanceOf(CglibProxyFactory.class);
assertThat(config.isLazyLoadingEnabled()).isTrue();
assertThat(config.isAggressiveLazyLoading()).isTrue();
assertThat(config.isMultipleResultSetsEnabled()).isFalse();
assertThat(config.isUseColumnLabel()).isFalse();
assertThat(config.isUseGeneratedKeys()).isTrue();
assertThat(config.getDefaultExecutorType()).isEqualTo(ExecutorType.BATCH);
assertThat(config.getDefaultStatementTimeout()).isEqualTo(10);
assertThat(config.getDefaultFetchSize()).isEqualTo(100);
assertThat(config.isMapUnderscoreToCamelCase()).isTrue();
assertThat(config.isSafeRowBoundsEnabled()).isTrue();
assertThat(config.getLocalCacheScope()).isEqualTo(LocalCacheScope.STATEMENT);
assertThat(config.getJdbcTypeForNull()).isEqualTo(JdbcType.NULL);
assertThat(config.getLazyLoadTriggerMethods()).isEqualTo((Set<String>) new HashSet<String>(Arrays.asList("equals", "clone", "hashCode", "toString", "xxx")));
assertThat(config.isSafeResultHandlerEnabled()).isFalse();
assertThat(config.getDefaultScriptingLanuageInstance()).isInstanceOf(RawLanguageDriver.class);
assertThat(config.isCallSettersOnNulls()).isTrue();
assertThat(config.getLogPrefix()).isEqualTo("mybatis_");
assertThat(config.getLogImpl().getName()).isEqualTo(Slf4jImpl.class.getName());
assertThat(config.getVfsImpl().getName()).isEqualTo(JBoss6VFS.class.getName());
assertThat(config.getConfigurationFactory().getName()).isEqualTo(String.class.getName());

assertTrue(config.getTypeAliasRegistry().getTypeAliases().get("blogauthor").equals(Author.class));
assertTrue(config.getTypeAliasRegistry().getTypeAliases().get("blog").equals(Blog.class));
assertTrue(config.getTypeAliasRegistry().getTypeAliases().get("cart").equals(Cart.class));

assertThat(config.getTypeHandlerRegistry().getTypeHandler(Integer.class)).isInstanceOf(CustomIntegerTypeHandler.class);
assertThat(config.getTypeHandlerRegistry().getTypeHandler(Long.class)).isInstanceOf(CustomLongTypeHandler.class);
assertThat(config.getTypeHandlerRegistry().getTypeHandler(String.class)).isInstanceOf(CustomStringTypeHandler.class);
assertThat(config.getTypeHandlerRegistry().getTypeHandler(String.class, JdbcType.VARCHAR)).isInstanceOf(CustomStringTypeHandler.class);
assertThat(config.getTypeHandlerRegistry().getTypeHandler(RoundingMode.class)).isInstanceOf(EnumOrdinalTypeHandler.class);

ExampleObjectFactory objectFactory = (ExampleObjectFactory)config.getObjectFactory();
assertThat(objectFactory.getProperties().size()).isEqualTo(1);
assertThat(objectFactory.getProperties().getProperty("objectFactoryProperty")).isEqualTo("100");

assertThat(config.getObjectWrapperFactory()).isInstanceOf(CustomObjectWrapperFactory.class);

assertThat(config.getReflectorFactory()).isInstanceOf(CustomReflectorFactory.class);

ExamplePlugin plugin = (ExamplePlugin)config.getInterceptors().get(0);
assertThat(plugin.getProperties().size()).isEqualTo(1);
assertThat(plugin.getProperties().getProperty("pluginProperty")).isEqualTo("100");

Environment environment = config.getEnvironment();
assertThat(environment.getId()).isEqualTo("development");
assertThat(environment.getDataSource()).isInstanceOf(UnpooledDataSource.class);
assertThat(environment.getTransactionFactory()).isInstanceOf(JdbcTransactionFactory.class);

assertThat(config.getDatabaseId()).isEqualTo("derby");

assertThat(config.getMapperRegistry().getMappers().size()).isEqualTo(4);
assertThat(config.getMapperRegistry().hasMapper(CachedAuthorMapper.class)).isTrue();
assertThat(config.getMapperRegistry().hasMapper(CustomMapper.class)).isTrue();
assertThat(config.getMapperRegistry().hasMapper(BlogMapper.class)).isTrue();
assertThat(config.getMapperRegistry().hasMapper(NestedBlogMapper.class)).isTrue();
inputStream.close();
try (InputStream inputStream = Resources.getResourceAsStream(resource)) {
Properties props = new Properties();
props.put("prop2", "cccc");
XMLConfigBuilder builder = new XMLConfigBuilder(inputStream, null, props);
Configuration config = builder.parse();

assertThat(config.getAutoMappingBehavior()).isEqualTo(AutoMappingBehavior.NONE);
assertThat(config.getAutoMappingUnknownColumnBehavior()).isEqualTo(AutoMappingUnknownColumnBehavior.WARNING);
assertThat(config.isCacheEnabled()).isFalse();
assertThat(config.getProxyFactory()).isInstanceOf(CglibProxyFactory.class);
assertThat(config.isLazyLoadingEnabled()).isTrue();
assertThat(config.isAggressiveLazyLoading()).isTrue();
assertThat(config.isMultipleResultSetsEnabled()).isFalse();
assertThat(config.isUseColumnLabel()).isFalse();
assertThat(config.isUseGeneratedKeys()).isTrue();
assertThat(config.getDefaultExecutorType()).isEqualTo(ExecutorType.BATCH);
assertThat(config.getDefaultStatementTimeout()).isEqualTo(10);
assertThat(config.getDefaultFetchSize()).isEqualTo(100);
assertThat(config.isMapUnderscoreToCamelCase()).isTrue();
assertThat(config.isSafeRowBoundsEnabled()).isTrue();
assertThat(config.getLocalCacheScope()).isEqualTo(LocalCacheScope.STATEMENT);
assertThat(config.getJdbcTypeForNull()).isEqualTo(JdbcType.NULL);
assertThat(config.getLazyLoadTriggerMethods()).isEqualTo((Set<String>) new HashSet<String>(Arrays.asList("equals", "clone", "hashCode", "toString", "xxx")));
assertThat(config.isSafeResultHandlerEnabled()).isFalse();
assertThat(config.getDefaultScriptingLanuageInstance()).isInstanceOf(RawLanguageDriver.class);
assertThat(config.isCallSettersOnNulls()).isTrue();
assertThat(config.getLogPrefix()).isEqualTo("mybatis_");
assertThat(config.getLogImpl().getName()).isEqualTo(Slf4jImpl.class.getName());
assertThat(config.getVfsImpl().getName()).isEqualTo(JBoss6VFS.class.getName());
assertThat(config.getConfigurationFactory().getName()).isEqualTo(String.class.getName());

assertTrue(config.getTypeAliasRegistry().getTypeAliases().get("blogauthor").equals(Author.class));
assertTrue(config.getTypeAliasRegistry().getTypeAliases().get("blog").equals(Blog.class));
assertTrue(config.getTypeAliasRegistry().getTypeAliases().get("cart").equals(Cart.class));

assertThat(config.getTypeHandlerRegistry().getTypeHandler(Integer.class)).isInstanceOf(CustomIntegerTypeHandler.class);
assertThat(config.getTypeHandlerRegistry().getTypeHandler(Long.class)).isInstanceOf(CustomLongTypeHandler.class);
assertThat(config.getTypeHandlerRegistry().getTypeHandler(String.class)).isInstanceOf(CustomStringTypeHandler.class);
assertThat(config.getTypeHandlerRegistry().getTypeHandler(String.class, JdbcType.VARCHAR)).isInstanceOf(CustomStringTypeHandler.class);
assertThat(config.getTypeHandlerRegistry().getTypeHandler(RoundingMode.class)).isInstanceOf(EnumOrdinalTypeHandler.class);

ExampleObjectFactory objectFactory = (ExampleObjectFactory) config.getObjectFactory();
assertThat(objectFactory.getProperties().size()).isEqualTo(1);
assertThat(objectFactory.getProperties().getProperty("objectFactoryProperty")).isEqualTo("100");

assertThat(config.getObjectWrapperFactory()).isInstanceOf(CustomObjectWrapperFactory.class);

assertThat(config.getReflectorFactory()).isInstanceOf(CustomReflectorFactory.class);

ExamplePlugin plugin = (ExamplePlugin) config.getInterceptors().get(0);
assertThat(plugin.getProperties().size()).isEqualTo(1);
assertThat(plugin.getProperties().getProperty("pluginProperty")).isEqualTo("100");

Environment environment = config.getEnvironment();
assertThat(environment.getId()).isEqualTo("development");
assertThat(environment.getDataSource()).isInstanceOf(UnpooledDataSource.class);
assertThat(environment.getTransactionFactory()).isInstanceOf(JdbcTransactionFactory.class);

assertThat(config.getDatabaseId()).isEqualTo("derby");

assertThat(config.getMapperRegistry().getMappers().size()).isEqualTo(4);
assertThat(config.getMapperRegistry().hasMapper(CachedAuthorMapper.class)).isTrue();
assertThat(config.getMapperRegistry().hasMapper(CustomMapper.class)).isTrue();
assertThat(config.getMapperRegistry().hasMapper(BlogMapper.class)).isTrue();
assertThat(config.getMapperRegistry().hasMapper(NestedBlogMapper.class)).isTrue();
}
}

@Test
public void shouldSuccessfullyLoadXMLConfigFileWithPropertiesUrl() throws Exception {
String resource = "org/apache/ibatis/builder/PropertiesUrlMapperConfig.xml";
InputStream inputStream = Resources.getResourceAsStream(resource);
XMLConfigBuilder builder = new XMLConfigBuilder(inputStream);
Configuration config = builder.parse();
assertThat(config.getVariables().get("driver").toString()).isEqualTo("org.apache.derby.jdbc.EmbeddedDriver");
assertThat(config.getVariables().get("prop1").toString()).isEqualTo("bbbb");
inputStream.close();
try (InputStream inputStream = Resources.getResourceAsStream(resource)) {
XMLConfigBuilder builder = new XMLConfigBuilder(inputStream);
Configuration config = builder.parse();
assertThat(config.getVariables().get("driver").toString()).isEqualTo("org.apache.derby.jdbc.EmbeddedDriver");
assertThat(config.getVariables().get("prop1").toString()).isEqualTo("bbbb");
}
}

@Test
public void parseIsTwice() throws Exception {
String resource = "org/apache/ibatis/builder/MinimalMapperConfig.xml";
InputStream inputStream = Resources.getResourceAsStream(resource);
XMLConfigBuilder builder = new XMLConfigBuilder(inputStream);
builder.parse();
try (InputStream inputStream = Resources.getResourceAsStream(resource)) {
XMLConfigBuilder builder = new XMLConfigBuilder(inputStream);
builder.parse();

when(builder).parse();
then(caughtException()).isInstanceOf(BuilderException.class)
.hasMessage("Each XMLConfigBuilder can only be used once.");
inputStream.close();
when(builder).parse();
then(caughtException()).isInstanceOf(BuilderException.class)
.hasMessage("Each XMLConfigBuilder can only be used once.");
}
}

@Test
Expand Down
Loading