aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/test/java/com/yahoo/search/federation/sourceref
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-04-13 22:18:11 +0200
committerJon Bratseth <bratseth@oath.com>2018-04-13 22:18:11 +0200
commit8c54be83e36fa4ba28c747fec2b8040832002b49 (patch)
treec63d75c05930352205e46fd405b2ddc5272dcd1f /container-search/src/test/java/com/yahoo/search/federation/sourceref
parent41969051757a99e5c8ed09fac31fa0658f039c7c (diff)
Remove usage of old junit
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/federation/sourceref')
-rw-r--r--container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java5
-rw-r--r--container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java2
2 files changed, 4 insertions, 3 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java
index 3df5151de0b..4485a016ee6 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java
@@ -16,10 +16,10 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.SortedSet;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.fail;
import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
/**
* @author tonytv
@@ -149,4 +149,5 @@ public class SearchChainResolverTestCase {
assertThat(res.federationOptions, is(federationOptions));
return res;
}
+
}
diff --git a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java
index de468a2be2d..714d1803605 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java
@@ -20,9 +20,9 @@ import java.util.Set;
import java.util.TreeMap;
import static com.yahoo.search.federation.sourceref.test.SearchChainResolverTestCase.emptySourceToProviderMap;
-import static junit.framework.Assert.fail;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
import static org.junit.matchers.JUnitMatchers.hasItems;