diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-04-25 15:26:32 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-04-25 15:26:32 +0200 |
commit | 695bfc1807271a7a1ad1057202d2401e94edace5 (patch) | |
tree | ca26395e98ee29dd8c07fbb8a1b45ffcc36af5b9 /container-search/src/test | |
parent | e2d4b112ef1308ea1e03c22e91e8dae561071f81 (diff) |
Remove usage of junit.framework
Diffstat (limited to 'container-search/src/test')
2 files changed, 5 insertions, 4 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java index 89ca224682d..1d87402fbd6 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java @@ -8,19 +8,22 @@ import com.yahoo.search.Searcher; import com.yahoo.search.result.Hit; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchers.CacheControlSearcher; -import junit.framework.TestCase; import org.junit.Test; import java.util.List; import static com.yahoo.search.searchers.CacheControlSearcher.CACHE_CONTROL_HEADER; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Unit test cases for CacheControlSearcher. * * @author frodelu */ -public class CacheControlSearcherTestCase extends TestCase { +public class CacheControlSearcherTestCase { private Searcher getDocSource() { return new Searcher() { diff --git a/container-search/src/test/java/com/yahoo/search/statistics/ElapsedTimeTestCase.java b/container-search/src/test/java/com/yahoo/search/statistics/ElapsedTimeTestCase.java index e9bb2365de1..15937e77899 100644 --- a/container-search/src/test/java/com/yahoo/search/statistics/ElapsedTimeTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/statistics/ElapsedTimeTestCase.java @@ -1,8 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.statistics; -import junit.framework.TestCase; - import com.yahoo.component.ComponentId; import com.yahoo.component.chain.Chain; import com.yahoo.search.Query; |