From 2d1b3eb6d4572843c7a8bdcc65abc27288e07fa0 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 17 Apr 2015 19:25:36 +0300 Subject: [PATCH] Feed: Fix imports conflict after cherry-picking --- .../integration/feed/inbound/FeedEntryMessageSourceTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java b/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java index 9098969015..16c17bd4c0 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java @@ -19,6 +19,7 @@ package org.springframework.integration.feed.inbound; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; import java.io.File; import java.net.URL; @@ -27,6 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.core.io.ClassPathResource; +import org.springframework.integration.Message; import org.springframework.integration.metadata.PropertiesPersistingMetadataStore; import com.sun.syndication.feed.synd.SyndEntry;