Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More @DirtiesContext for tests in attempt to mitigate OOM error on CI/CD

Browse Source
This commit is contained in:
Artem Bilan
2024-12-03 11:58:46 -05:00
parent 567fb9bae8
commit e2aa904a7b
36 changed files with 254 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
@@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* @author Markus Spann
* @author Prafull Kumar Soni
* @author Artem Bilan
*
*/
public class SmbParserInboundTests extends AbstractBaseTests {
@@ -41,11 +42,13 @@ public class SmbParserInboundTests extends AbstractBaseTests {
}
@Test
@SuppressWarnings("try")
public void testLocalFilesAutoCreationTrue() {
assertFileNotExists(new File("test-temp/local-10"));
new ClassPathXmlApplicationContext(getApplicationContextXmlFile(), this.getClass());
assertFileExists(new File("test-temp/local-10"));
assertFileNotExists(new File("test-temp/local-6"));
try (var ctx = new ClassPathXmlApplicationContext(getApplicationContextXmlFile(), getClass())) {
assertFileExists(new File("test-temp/local-10"));
assertFileNotExists(new File("test-temp/local-6"));
}
}
@Test

14
spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java
View File

@@ -37,6 +37,7 @@ import org.springframework.integration.smb.inbound.SmbInboundFileSynchronizingMe
import org.springframework.integration.smb.session.SmbSession;
import org.springframework.integration.smb.session.SmbSessionFactory;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
@@ -51,12 +52,14 @@ import static org.mockito.Mockito.when;
* @author Gregory Bragg
*/
@SpringJUnitConfig
@DirtiesContext
public class SmbInboundChannelAdapterParserTests {
@Autowired
ApplicationContext applicationContext;
@Test
@SuppressWarnings("unchecked")
public void testSmbInboundChannelAdapterComplete() {
final SourcePollingChannelAdapter adapter =
@@ -76,7 +79,7 @@ public class SmbInboundChannelAdapterParserTests {
assertThat(".working.tmp").isEqualTo(TestUtils.getPropertyValue(fisync, "temporaryFileSuffix", String.class));
String remoteFileSeparator = (String) TestUtils.getPropertyValue(fisync, "remoteFileSeparator");
assertThat(remoteFileSeparator).isNotNull();
assertThat("").isEqualTo(remoteFileSeparator);
assertThat(remoteFileSeparator).isEqualTo("");
FileListFilter<?> filter = TestUtils.getPropertyValue(fisync, "filter", FileListFilter.class);
assertThat(filter).isNotNull();
assertThat(filter).isInstanceOf(CompositeFileListFilter.class);
@@ -86,11 +89,12 @@ public class SmbInboundChannelAdapterParserTests {
assertThat(filtersIterator.next()).isInstanceOf(SmbSimplePatternFileListFilter.class);
assertThat(filtersIterator.next()).isInstanceOf(SmbPersistentAcceptOnceFileListFilter.class);
Object sessionFactory = TestUtils.getPropertyValue(fisync, "remoteFileTemplate.sessionFactory");
assertThat(SmbSessionFactory.class.isAssignableFrom(sessionFactory.getClass())).isTrue();
assertThat(sessionFactory).isInstanceOf(SmbSessionFactory.class);
FileListFilter<?> acceptAllFilter = this.applicationContext.getBean("acceptAllFilter", FileListFilter.class);
assertThat(TestUtils.getPropertyValue(inbound, "fileSource.scanner.filter.fileFilters", Collection.class)
.contains(acceptAllFilter)).isTrue();
assertThat(TestUtils.getPropertyValue(inbound, "fileSource.scanner.filter.fileFilters", Collection.class))
.contains(acceptAllFilter);
}
@Test
@@ -104,7 +108,7 @@ public class SmbInboundChannelAdapterParserTests {
TestUtils.getPropertyValue(adapter, "source.synchronizer", SmbInboundFileSynchronizer.class);
String remoteFileSeparator = (String) TestUtils.getPropertyValue(fisync, "remoteFileSeparator");
assertThat(remoteFileSeparator).isNotNull();
assertThat("/").isEqualTo(remoteFileSeparator);
assertThat(remoteFileSeparator).isEqualTo("/");
}
@Test