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

polishing

Browse Source
This commit is contained in:
Mark Fisher
2010-11-05 14:58:24 -04:00
parent 12d0d46fc4
commit d020387d7e
5 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2010 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.
@@ -35,7 +35,6 @@ import static org.mockito.Mockito.*;
* @author Iwein Fuld
* @author Mark Fisher
*/
@SuppressWarnings("unchecked")
@RunWith(MockitoJUnitRunner.class)
public class FileReadingMessageSourceTests {
@@ -76,7 +75,7 @@ public class FileReadingMessageSourceTests {
@Test
public void requeueOnFailure() throws Exception {
when(inputDirectoryMock.listFiles()).thenReturn(new File[]{fileMock});
Message received = source.receive();
Message<File> received = source.receive();
assertNotNull(received);
source.onFailure(received);
assertEquals(received.getPayload(), source.receive().getPayload());

2
spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java
View File

@@ -58,7 +58,7 @@ public class FileInboundChannelAdapterParserTests {
@Test
public void channelName() throws Exception {
Object adapter = context.getBean("inputDirPoller");
context.getBean("inputDirPoller");
AbstractMessageChannel channel = context.getBean("inputDirPoller", AbstractMessageChannel.class);
assertEquals("Channel should be available under specified id", "inputDirPoller", channel.getComponentName());
}

5
spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithPatternParserTests.java
View File

@@ -116,11 +116,10 @@ public class FileInboundChannelAdapterWithPatternParserTests {
@SuppressWarnings("unchecked")
public void patternFilter() {
DirectFieldAccessor scannerAccessor = new DirectFieldAccessor(accessor.getPropertyValue("scanner"));
Set<EntryListFilter> filters = (Set<EntryListFilter>) new DirectFieldAccessor(
Set<EntryListFilter<?>> filters = (Set<EntryListFilter<?>>) new DirectFieldAccessor(
scannerAccessor.getPropertyValue("filter")).getPropertyValue("fileFilters");
String pattern = null;
for (EntryListFilter filter : filters) {
for (EntryListFilter<?> filter : filters) {
if (filter instanceof SimplePatternFileListFilter) {
pattern = (String) new DirectFieldAccessor(filter).getPropertyValue("path");
}

40
spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithPreventDuplicatesFlagTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2010 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.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.file.config;
import org.junit.Test;
@@ -43,33 +44,34 @@ import static org.junit.Assert.*;
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class FileInboundChannelAdapterWithPreventDuplicatesFlagTests {
@Autowired
private ApplicationContext context;
@Autowired
@Qualifier("testFilter")
private TestFileListFilter testFilter;
@Test
public void filterAndNull() {
EntryListFilter filter = this.extractFilter("filterAndNull");
EntryListFilter<?> filter = this.extractFilter("filterAndNull");
assertFalse(filter instanceof CompositeEntryListFilter);
assertSame(testFilter, filter);
}
@Test
@SuppressWarnings("unchecked")
public void filterAndTrue() {
EntryListFilter filter = this.extractFilter("filterAndTrue");
EntryListFilter<?> filter = this.extractFilter("filterAndTrue");
assertTrue(filter instanceof CompositeEntryListFilter);
Collection filters = (Collection) new DirectFieldAccessor(filter).getPropertyValue("fileFilters");
Collection<?> filters = (Collection<?>) new DirectFieldAccessor(filter).getPropertyValue("fileFilters");
assertTrue(filters.iterator().next() instanceof AcceptOnceEntryFileListFilter);
assertTrue(filters.contains(testFilter));
}
@Test
public void filterAndFalse() throws Exception {
EntryListFilter filter = this.extractFilter("filterAndFalse");
EntryListFilter<?> filter = this.extractFilter("filterAndFalse");
assertFalse(filter instanceof CompositeEntryListFilter);
assertSame(testFilter, filter);
}
@@ -77,10 +79,10 @@ public class FileInboundChannelAdapterWithPreventDuplicatesFlagTests {
@Test
@SuppressWarnings("unchecked")
public void patternAndNull() throws Exception {
EntryListFilter filter = this.extractFilter("patternAndNull");
EntryListFilter<?> filter = this.extractFilter("patternAndNull");
assertTrue(filter instanceof CompositeEntryListFilter);
Collection filters = (Collection) new DirectFieldAccessor(filter).getPropertyValue("fileFilters");
Collection<EntryListFilter<File>> filters = (Collection<EntryListFilter<File>>)
new DirectFieldAccessor(filter).getPropertyValue("fileFilters");
Iterator<EntryListFilter<File>> iterator = filters.iterator();
assertTrue(iterator.next() instanceof AcceptOnceEntryFileListFilter);
assertThat(iterator.next(), is(SimplePatternFileListFilter.class));
@@ -89,11 +91,11 @@ public class FileInboundChannelAdapterWithPreventDuplicatesFlagTests {
@Test
@SuppressWarnings("unchecked")
public void patternAndTrue() throws Exception {
EntryListFilter filter = this.extractFilter("patternAndTrue");
EntryListFilter<?> filter = this.extractFilter("patternAndTrue");
assertTrue(filter instanceof CompositeEntryListFilter);
Collection filters = (Collection) new DirectFieldAccessor(filter).getPropertyValue("fileFilters");
Iterator<EntryListFilter> iterator = filters.iterator();
Collection<EntryListFilter<File>> filters = (Collection<EntryListFilter<File>>)
new DirectFieldAccessor(filter).getPropertyValue("fileFilters");
Iterator<EntryListFilter<File>> iterator = filters.iterator();
assertTrue(iterator.next() instanceof AcceptOnceEntryFileListFilter);
assertThat(iterator.next(), is(SimplePatternFileListFilter.class));
}
@@ -119,12 +121,10 @@ public class FileInboundChannelAdapterWithPreventDuplicatesFlagTests {
}
@Test
@SuppressWarnings("unchecked")
public void defaultAndTrue() throws Exception {
EntryListFilter filter = this.extractFilter("defaultAndTrue");
EntryListFilter<File> filter = this.extractFilter("defaultAndTrue");
assertFalse(filter instanceof CompositeEntryListFilter);
assertTrue(filter instanceof AcceptOnceEntryFileListFilter);
File testFile = new File("test");
File[] files = new File[] { testFile, testFile, testFile };
List<File> result = filter.filterEntries(files);
@@ -132,19 +132,18 @@ public class FileInboundChannelAdapterWithPreventDuplicatesFlagTests {
}
@Test
@SuppressWarnings("unchecked")
public void defaultAndFalse() throws Exception {
EntryListFilter filter = this.extractFilter("defaultAndFalse");
EntryListFilter<File> filter = this.extractFilter("defaultAndFalse");
assertNotNull(filter);
assertFalse(filter instanceof CompositeEntryListFilter);
assertFalse(filter instanceof AcceptOnceEntryFileListFilter);
File testFile = new File("test");
File[] files = new File[] { testFile, testFile, testFile };
List<File> result = filter.filterEntries(files);
assertEquals(3, result.size());
}
@SuppressWarnings("unchecked")
private EntryListFilter<File> extractFilter(String beanName) {
return (EntryListFilter<File>)
@@ -155,4 +154,5 @@ public class FileInboundChannelAdapterWithPreventDuplicatesFlagTests {
.getPropertyValue("scanner"))
.getPropertyValue("filter");
}
}

13
spring-integration-file/src/test/java/org/springframework/integration/file/config/FileListFilterFactoryBeanTests.java
View File

@@ -53,7 +53,6 @@ public class FileListFilterFactoryBeanTests {
}
@Test
@SuppressWarnings("unchecked")
public void customFilterAndPreventDuplicatesTrue() throws Exception {
FileListFilterFactoryBean factory = new FileListFilterFactoryBean();
TestFilter testFilter = new TestFilter();
@@ -61,7 +60,7 @@ public class FileListFilterFactoryBeanTests {
factory.setPreventDuplicates(Boolean.TRUE);
EntryListFilter<File> result = factory.getObject();
assertTrue(result instanceof CompositeEntryListFilter);
Collection filters = (Collection) new DirectFieldAccessor(result).getPropertyValue("fileFilters");
Collection<?> filters = (Collection<?>) new DirectFieldAccessor(result).getPropertyValue("fileFilters");
assertTrue(filters.iterator().next() instanceof AcceptOnceEntryFileListFilter);
assertTrue(filters.contains(testFilter));
}
@@ -84,8 +83,9 @@ public class FileListFilterFactoryBeanTests {
factory.setFilenamePattern("foo");
EntryListFilter<File> result = factory.getObject();
assertTrue(result instanceof CompositeEntryListFilter);
Collection filters = (Collection) new DirectFieldAccessor(result).getPropertyValue("fileFilters");
Iterator<EntryListFilter> iterator = filters.iterator();
Collection<EntryListFilter<?>> filters = (Collection<EntryListFilter<?>>)
new DirectFieldAccessor(result).getPropertyValue("fileFilters");
Iterator<EntryListFilter<?>> iterator = filters.iterator();
assertTrue(iterator.next() instanceof AcceptOnceEntryFileListFilter);
assertThat(iterator.next(), is(SimplePatternFileListFilter.class));
}
@@ -98,8 +98,9 @@ public class FileListFilterFactoryBeanTests {
factory.setPreventDuplicates(Boolean.TRUE);
EntryListFilter<File> result = factory.getObject();
assertTrue(result instanceof CompositeEntryListFilter);
Collection filters = (Collection) new DirectFieldAccessor(result).getPropertyValue("fileFilters");
Iterator<EntryListFilter> iterator = filters.iterator();
Collection<EntryListFilter<?>> filters = (Collection<EntryListFilter<?>>)
new DirectFieldAccessor(result).getPropertyValue("fileFilters");
Iterator<EntryListFilter<?>> iterator = filters.iterator();
assertTrue(iterator.next() instanceof AcceptOnceEntryFileListFilter);
assertThat(iterator.next(), is(SimplePatternFileListFilter.class));
}