From 40f011b5140c4d64c0d4c67487ff16e3c5eb0980 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 8 Apr 2019 11:20:08 -0400 Subject: [PATCH] Drop H2 schema before JDBC tests https://build.spring.io/browse/INT-MJATS41-1679/ # Conflicts: # spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelTests-context.xml # spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreRegionTests.java --- .../JdbcLockRegistryLeaderInitiatorTests.java | 3 ++- .../JdbcMessageStoreChannelTests-context.xml | 1 + .../store/JdbcMessageStoreRegionTests.java | 20 +++++++++++-------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/leader/JdbcLockRegistryLeaderInitiatorTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/leader/JdbcLockRegistryLeaderInitiatorTests.java index b0ed256ea3..f75e888082 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/leader/JdbcLockRegistryLeaderInitiatorTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/leader/JdbcLockRegistryLeaderInitiatorTests.java @@ -55,6 +55,7 @@ public class JdbcLockRegistryLeaderInitiatorTests { public static void init() { dataSource = new EmbeddedDatabaseBuilder() .setType(EmbeddedDatabaseType.H2) + .addScript("classpath:/org/springframework/integration/jdbc/schema-drop-h2.sql") .addScript("classpath:/org/springframework/integration/jdbc/schema-h2.sql") .build(); } @@ -68,7 +69,7 @@ public class JdbcLockRegistryLeaderInitiatorTests { public void testDistributedLeaderElection() throws Exception { CountDownLatch granted = new CountDownLatch(1); CountingPublisher countingPublisher = new CountingPublisher(granted); - List initiators = new ArrayList(); + List initiators = new ArrayList<>(); for (int i = 0; i < 2; i++) { DefaultLockRepository lockRepository = new DefaultLockRepository(dataSource); lockRepository.afterPropertiesSet(); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelTests-context.xml index 869f809ec5..805f486973 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelTests-context.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelTests-context.xml @@ -13,6 +13,7 @@ + diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreRegionTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreRegionTests.java index 775a68d4b1..6d8ffc4878 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreRegionTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreRegionTests.java @@ -29,26 +29,29 @@ import org.junit.Test; import org.springframework.integration.support.MessageBuilder; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; /** * @author Gunnar Hillert + * @author Artem Bilan */ public class JdbcMessageStoreRegionTests { private static EmbeddedDatabase dataSource; + private JdbcTemplate jdbcTemplate; private JdbcMessageStore messageStore1; + private JdbcMessageStore messageStore2; @BeforeClass public static void setupDatabase() { dataSource = new EmbeddedDatabaseBuilder() .setType(EmbeddedDatabaseType.H2) + .addScript("classpath:/org/springframework/integration/jdbc/schema-drop-h2.sql") .addScript("classpath:/org/springframework/integration/jdbc/schema-h2.sql") .build(); } @@ -76,7 +79,7 @@ public class JdbcMessageStoreRegionTests { } @Test - public void testVerifyMessageCount() throws Exception { + public void testVerifyMessageCount() { messageStore1.addMessage(MessageBuilder.withPayload("payload1").build()); messageStore1.addMessage(MessageBuilder.withPayload("payload2").build()); @@ -90,7 +93,7 @@ public class JdbcMessageStoreRegionTests { } @Test - public void testInsertNullRegion() throws Exception { + public void testInsertNullRegion() { try { messageStore1.setRegion(null); @@ -104,7 +107,7 @@ public class JdbcMessageStoreRegionTests { } @Test - public void testVerifyMessageGroupCount() throws Exception { + public void testVerifyMessageGroupCount() { messageStore1.addMessageToGroup("group1", MessageBuilder.withPayload("payload1").build()); messageStore1.addMessageToGroup("group2", MessageBuilder.withPayload("payload2").build()); @@ -123,12 +126,12 @@ public class JdbcMessageStoreRegionTests { } @Test - public void testRegionSetToMessageGroup() throws Exception { + public void testRegionSetToMessageGroup() { messageStore1.addMessageToGroup("group1", MessageBuilder.withPayload("payload1").build()); List regions = jdbcTemplate.query("Select * from INT_MESSAGE_GROUP where REGION = 'region1'", - (RowMapper) (rs, rowNum) -> rs.getString("REGION")); + (rs, rowNum) -> rs.getString("REGION")); assertEquals(1, regions.size()); assertEquals("region1", regions.get(0)); @@ -136,7 +139,7 @@ public class JdbcMessageStoreRegionTests { messageStore2.addMessageToGroup("group1", MessageBuilder.withPayload("payload1").build()); List regions2 = jdbcTemplate.query("Select * from INT_MESSAGE_GROUP where REGION = 'region2'", - (RowMapper) (rs, rowNum) -> rs.getString("REGION")); + (rs, rowNum) -> rs.getString("REGION")); assertEquals(1, regions2.size()); assertEquals("region2", regions2.get(0)); @@ -144,7 +147,7 @@ public class JdbcMessageStoreRegionTests { } @Test - public void testRemoveMessageGroup() throws Exception { + public void testRemoveMessageGroup() { messageStore1.addMessageToGroup("group1", MessageBuilder.withPayload("payload1").build()); messageStore1.addMessageToGroup("group2", MessageBuilder.withPayload("payload2").build()); @@ -158,4 +161,5 @@ public class JdbcMessageStoreRegionTests { assertEquals(2, messageStore2.getMessageGroupCount()); } + }