From 695961c2ba067374c799b7efedbef114e03eb2f6 Mon Sep 17 00:00:00 2001 From: Iwein Fuld Date: Thu, 14 Oct 2010 17:15:51 +0200 Subject: [PATCH] QUALITY: avoid writing in source path from testcase --- .../input/FileMessageHistoryTest.txt | 1 - .../file/config/FileMessageHistoryTest.java | 29 ++++++++++++------- .../config/file-message-history-context.xml | 6 ++-- 3 files changed, 23 insertions(+), 13 deletions(-) delete mode 100644 spring-integration-file/input/FileMessageHistoryTest.txt diff --git a/spring-integration-file/input/FileMessageHistoryTest.txt b/spring-integration-file/input/FileMessageHistoryTest.txt deleted file mode 100644 index b6fc4c620b..0000000000 --- a/spring-integration-file/input/FileMessageHistoryTest.txt +++ /dev/null @@ -1 +0,0 @@ -hello \ No newline at end of file diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTest.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTest.java index a0ee919cb4..004ff3a002 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTest.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTest.java @@ -15,15 +15,8 @@ */ package org.springframework.integration.file.config; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.util.Properties; - import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.Message; @@ -31,23 +24,39 @@ import org.springframework.integration.core.PollableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.test.util.TestUtils; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.util.Properties; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.junit.Assert.assertThat; + /** * @author Oleg Zhurakousky + * @author Iwein Fuld * */ public class FileMessageHistoryTest { + + @Test public void testMessageHistory() throws Exception{ ApplicationContext context = new ClassPathXmlApplicationContext("file-message-history-context.xml", this.getClass()); - File file = new File("input/FileMessageHistoryTest.txt"); + TemporaryFolder input = context.getBean(TemporaryFolder.class); + File file = input.newFile("FileMessageHistoryTest.txt"); BufferedWriter out = new BufferedWriter(new FileWriter(file)); out.write("hello"); out.close(); PollableChannel outChannel = context.getBean("outChannel", PollableChannel.class); Message message = outChannel.receive(1000); + assertThat(message, is(notNullValue())); MessageHistory history = MessageHistory.read(message); - assertNotNull(history); + assertThat(history, is(notNullValue())); Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "fileAdapter", 0); assertNotNull(componentHistoryRecord); assertEquals("file:inbound-channel-adapter", componentHistoryRecord.get("type")); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/file-message-history-context.xml b/spring-integration-file/src/test/java/org/springframework/integration/file/config/file-message-history-context.xml index 0b5a606023..6bdaf15410 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/file-message-history-context.xml +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/file-message-history-context.xml @@ -9,8 +9,10 @@ - - + +