Resolve deprecations since the latest SF
This commit is contained in:
@@ -100,7 +100,7 @@ public class DelayerHandlerRescheduleIntegrationTests {
|
||||
(ThreadPoolTaskScheduler) IntegrationContextUtils.getTaskScheduler(context);
|
||||
taskScheduler.shutdown();
|
||||
taskScheduler.getScheduledExecutor().awaitTermination(10, TimeUnit.SECONDS);
|
||||
context.destroy();
|
||||
context.close();
|
||||
|
||||
try {
|
||||
context.getBean("input", MessageChannel.class);
|
||||
@@ -143,7 +143,7 @@ public class DelayerHandlerRescheduleIntegrationTests {
|
||||
|
||||
assertEquals(1, messageStore.getMessageGroupCount());
|
||||
assertEquals(0, messageStore.messageGroupSize(delayerMessageGroupId));
|
||||
context.destroy();
|
||||
context.close();
|
||||
}
|
||||
|
||||
@Test //INT-2649
|
||||
@@ -163,7 +163,7 @@ public class DelayerHandlerRescheduleIntegrationTests {
|
||||
assertEquals(1, messageStore.messageGroupSize(delayerMessageGroupId));
|
||||
|
||||
//To check that 'rescheduling' works in the transaction boundaries too
|
||||
context.destroy();
|
||||
context.close();
|
||||
context.refresh();
|
||||
|
||||
assertTrue(RollbackTxSync.latch.await(20, TimeUnit.SECONDS));
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2014 the original author or authors.
|
||||
* Copyright 2002-2017 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.
|
||||
@@ -36,6 +36,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
|
||||
/**
|
||||
* @author Artem Bilan
|
||||
*
|
||||
* @since 2.2
|
||||
*/
|
||||
@ContextConfiguration
|
||||
@@ -65,7 +66,7 @@ public class StoredProcOutboundChannelAdapterWithinChainTests {
|
||||
assertEquals("Wrong email", "email", map.get("EMAIL"));
|
||||
// embeddedDatabase can be in working state. So other tests with the same embeddedDatabase beanId, type and init scripts
|
||||
// may be failed with Exception like: object in the DB already exists
|
||||
this.context.destroy();
|
||||
this.context.close();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user