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/servlet/JDiscFilterForServletTest.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/servlet/JDiscFilterForServletTest.java')
| -rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/JDiscFilterForServletTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/JDiscFilterForServletTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/JDiscFilterForServletTest.java index 82f37d6b416..5ad76c6348f 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/JDiscFilterForServletTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/JDiscFilterForServletTest.java @@ -18,7 +18,7 @@ import com.yahoo.jdisc.http.server.jetty.FilterInvoker; import com.yahoo.jdisc.http.server.jetty.SimpleHttpClient.ResponseValidator; import com.yahoo.jdisc.http.server.jetty.TestDriver; import com.yahoo.jdisc.http.server.jetty.TestDrivers; -import org.testng.annotations.Test; +import org.junit.Test; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; |