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/ErrorResponseContentCreatorTest.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/ErrorResponseContentCreatorTest.java')
| -rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java index 437d3228311..d66f22801f7 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java @@ -1,13 +1,15 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.server.jetty; -import org.testng.annotations.Test; + +import org.junit.Test; import javax.servlet.http.HttpServletResponse; import java.nio.charset.StandardCharsets; import java.util.Optional; -import static org.testng.Assert.assertEquals; +import static org.junit.Assert.assertEquals; + /** * @author bjorncs |