Merge pull request #9228 from vespa-engine/balder/mockito-latest-1

Use latest mockito 1 series.

1 files changed, 5 insertions, 5 deletions

diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterResponseTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterResponseTest.java
index d7c01cda5ad..a2bc2badea3 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterResponseTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterResponseTest.java
@@ -4,12 +4,12 @@ package com.yahoo.jdisc.http.filter;
 import com.yahoo.jdisc.http.Cookie;
 import com.yahoo.jdisc.http.HttpHeaders;
 import com.yahoo.jdisc.http.servlet.ServletResponse;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.util.Arrays;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author gjoranv
@@ -23,8 +23,8 @@ public class ServletFilterResponseTest {
     private DiscFilterResponse filterResponse;
     private ServletResponse parentResponse;
 
-    @BeforeMethod
-    private void init() throws Exception {
+    @Before
+    public void init() throws Exception {
         filterResponse = new ServletFilterResponse(newServletResponse());
         parentResponse = ((ServletFilterResponse)filterResponse).getServletResponse();