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

INT-2000 removed invalid test. Although it could have been fixed with adding a converter to BeanFactoryTypeConverter the actual scenario is invalid and unrealistic

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-08-08 18:04:13 -04:00
parent e4d8edf8d6
commit d38a56922f
2 changed files with 10 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java
View File

@@ -25,7 +25,7 @@ import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.expression.TypeConverter;
/**
@@ -45,7 +45,7 @@ public class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware
public BeanFactoryTypeConverter() {
synchronized (BeanFactoryTypeConverter.class) {
if (defaultConversionService == null) {
defaultConversionService = ConversionServiceFactory.createDefaultConversionService();
defaultConversionService = new DefaultConversionService();
}
}
this.conversionService = defaultConversionService;

42
spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java
View File

@@ -15,16 +15,8 @@
*/
package org.springframework.integration.file.remote.handler;
import static junit.framework.Assert.assertFalse;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.io.InputStream;
import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
@@ -37,6 +29,13 @@ import org.springframework.integration.file.remote.session.SessionFactory;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.support.MessageBuilder;
import static junit.framework.Assert.assertFalse;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Oleg Zhurakousky
@@ -88,30 +87,5 @@ public class FileTransferringMessageHandlerTests {
handler.handleMessage(message);
verify(session, times(1)).write(Mockito.any(InputStream.class), Mockito.anyString());
}
@SuppressWarnings("rawtypes")
@Test
@Ignore
public void testWithNonString() throws Exception{
SessionFactory sf = mock(SessionFactory.class);
Session session = mock(Session.class);
when(sf.getSession()).thenReturn(session);
doAnswer(new Answer() {
public Object answer(InvocationOnMock invocation) throws Throwable {
String path = (String) invocation.getArguments()[1];
assertFalse(path.startsWith("/"));
return null;
}
}).when(session).rename(Mockito.anyString(), Mockito.anyString());
ExpressionParser parser = new SpelExpressionParser();
FileTransferringMessageHandler handler = new FileTransferringMessageHandler(sf);
handler.setRemoteDirectoryExpression(parser.parseExpression("headers['path']"));
handler.afterPropertiesSet();
Message<?> message = MessageBuilder.withPayload("hello").setHeader("path", new Foo()).build();
handler.handleMessage(message);
verify(session, times(1)).write(Mockito.any(InputStream.class), Mockito.anyString());
}
private static class Foo{}
}