diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-29 16:14:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-29 16:14:08 +0200 |
| commit | e660b1ea6afce40f860dff17bbb80440e31942b7 (patch) | |
| tree | 1ba99b7910d27da02453bb5c87f7be76a62ae394 /jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java | |
| parent | 7eab85d1fc8d1978a48dce1851a05fa623fd4d2b (diff) | |
| parent | 3e1b096275ac3e57ab81d32fa7e836f02f035410 (diff) | |
Merge pull request #9228 from vespa-engine/balder/mockito-latest-1
Use latest mockito 1 series.
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java')
| -rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java index 77411fc080e..1bf6ef2a598 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java @@ -23,9 +23,9 @@ import org.apache.http.util.EntityUtils; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; import java.net.URI; import java.nio.ByteBuffer; |