Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
2e6f15b6
Commit
2e6f15b6
authored
Sep 13, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix intermittent failure of inMemoryDerbyIsShutdown
parent
1b237de5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
4 deletions
+10
-4
DevToolsPooledDataSourceAutoConfigurationTests.java
...igure/DevToolsPooledDataSourceAutoConfigurationTests.java
+10
-4
No files found.
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsPooledDataSourceAutoConfigurationTests.java
View file @
2e6f15b6
...
@@ -20,16 +20,18 @@ import java.io.File;
...
@@ -20,16 +20,18 @@ import java.io.File;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.sql.SQLException
;
import
java.sql.SQLException
;
import
java.sql.Statement
;
import
java.sql.Statement
;
import
java.time.Duration
;
import
java.util.Properties
;
import
java.util.Properties
;
import
javax.sql.DataSource
;
import
javax.sql.DataSource
;
import
com.zaxxer.hikari.HikariDataSource
;
import
com.zaxxer.hikari.HikariPoolMXBean
;
import
org.apache.derby.jdbc.EmbeddedDriver
;
import
org.apache.derby.jdbc.EmbeddedDriver
;
import
org.awaitility.Awaitility
;
import
org.junit.jupiter.api.AfterEach
;
import
org.junit.jupiter.api.AfterEach
;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.condition.DisabledOnOs
;
import
org.junit.jupiter.api.condition.OS
;
import
org.junit.jupiter.api.io.TempDir
;
import
org.junit.jupiter.api.io.TempDir
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
;
...
@@ -123,13 +125,17 @@ class DevToolsPooledDataSourceAutoConfigurationTests extends AbstractDevToolsDat
...
@@ -123,13 +125,17 @@ class DevToolsPooledDataSourceAutoConfigurationTests extends AbstractDevToolsDat
}
}
@Test
@Test
@DisabledOnOs
(
OS
.
WINDOWS
)
void
inMemoryDerbyIsShutdown
()
throws
Exception
{
void
inMemoryDerbyIsShutdown
()
throws
Exception
{
ConfigurableApplicationContext
context
=
getContext
(
ConfigurableApplicationContext
context
=
getContext
(
()
->
createContext
(
"org.apache.derby.jdbc.EmbeddedDriver"
,
"jdbc:derby:memory:test;create=true"
,
()
->
createContext
(
"org.apache.derby.jdbc.EmbeddedDriver"
,
"jdbc:derby:memory:test;create=true"
,
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
));
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
));
JdbcTemplate
jdbc
=
new
JdbcTemplate
(
context
.
getBean
(
DataSource
.
class
));
HikariDataSource
dataSource
=
context
.
getBean
(
HikariDataSource
.
class
);
JdbcTemplate
jdbc
=
new
JdbcTemplate
(
dataSource
);
jdbc
.
execute
(
"SELECT 1 FROM SYSIBM.SYSDUMMY1"
);
jdbc
.
execute
(
"SELECT 1 FROM SYSIBM.SYSDUMMY1"
);
HikariPoolMXBean
pool
=
dataSource
.
getHikariPoolMXBean
();
// Prevent a race between Hikari's initialization and Derby shutdown
Awaitility
.
await
().
atMost
(
Duration
.
ofSeconds
(
30
)).
until
(
pool:
:
getIdleConnections
,
(
idle
)
->
idle
==
dataSource
.
getMinimumIdle
());
context
.
close
();
context
.
close
();
// Connect should fail as DB no longer exists
// Connect should fail as DB no longer exists
assertThatExceptionOfType
(
SQLException
.
class
)
assertThatExceptionOfType
(
SQLException
.
class
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment