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

Fix Checkstyle violations & RMI tests

Browse Source 
* Increase latch timeouts for `RedisLockRegistryLeaderInitiatorTests`
* Some RMI tests fail with different outcome because an RMI registry might be
available on default `1099` port.
Fix them to not rely on that port
This commit is contained in:
Artem Bilan
2020-04-07 13:21:46 -04:00
parent 3a846bad29
commit d24c2c8431
6 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-file/src/test/java/org/springframework/integration/file/splitter/FileSplitterTests.java
View File

@@ -116,7 +116,7 @@ public class FileSplitterTests {
assertThat(receive.getHeaders().get(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE)).isEqualTo(2);
assertThat(receive.getHeaders().get(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER)).isEqualTo(1);
assertThat(this.selector.accept(receive)).isTrue();
assertThat(this.store.get(this.file.getAbsolutePath())).isEqualTo("1");
assertThat(this.store.get(file.getAbsolutePath())).isEqualTo("1");
receive = this.output.receive(10000);
assertThat(receive).isNotNull(); //äöüß
assertThat(receive.getPayload()).isEqualTo("äöüß");
@@ -125,7 +125,7 @@ public class FileSplitterTests {
assertThat(receive.getHeaders().get(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER)).isEqualTo(2);
assertThat(this.output.receive(1)).isNull();
assertThat(this.selector.accept(receive)).isTrue();
assertThat(this.store.get(this.file.getAbsolutePath())).isEqualTo("2");
assertThat(this.store.get(file.getAbsolutePath())).isEqualTo("2");
assertThat(this.selector.accept(receive)).isFalse();
this.input1.send(new GenericMessage<>(file.getAbsolutePath()));
@@ -378,7 +378,7 @@ public class FileSplitterTests {
splitter.setOutputChannel(outputChannel);
FileReader fileReader = Mockito.spy(new FileReader(file));
try {
splitter.handleMessage(new GenericMessage<Reader>(fileReader));
splitter.handleMessage(new GenericMessage<>(fileReader));
}
catch (RuntimeException e) {
// ignore
@@ -421,13 +421,10 @@ public class FileSplitterTests {
@Bean
public MetadataStoreSelector selector() {
return new MetadataStoreSelector(
message -> message.getHeaders().get(FileHeaders.ORIGINAL_FILE, File.class)
.getAbsolutePath(),
message -> message.getHeaders().get(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER)
.toString(),
message -> message.getHeaders().get(FileHeaders.ORIGINAL_FILE, File.class).getAbsolutePath(),
message -> message.getHeaders().get(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER).toString(),
store())
.compareValues(
(oldVal, newVal) -> Integer.parseInt(oldVal) < Integer.parseInt(newVal));
.compareValues((oldVal, newVal) -> Integer.parseInt(oldVal) < Integer.parseInt(newVal));
}
@Bean