Update to Mockito v2

scm-webapp/src/test/java/sonia/scm/api/rest/resources/AbstractManagerResourceTest.java

@@ -6,7 +6,7 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.Manager;
 import sonia.scm.ModelObject;
 

scm-webapp/src/test/java/sonia/scm/api/v2/FieldContainerResponseFilterTest.java

@@ -7,7 +7,7 @@ import com.google.common.io.Resources;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
@@ -100,7 +100,6 @@ public class FieldContainerResponseFilterTest {
 
   private JsonNode applyEntity(String name) throws IOException {
     JsonNode node = readJson(name);
-    when(responseContext.hasEntity()).thenReturn(Boolean.TRUE);
     when(responseContext.getEntity()).thenReturn(node);
     return node;
   }

scm-webapp/src/test/java/sonia/scm/api/v2/JsonMarshallingResponseFilterTest.java

@@ -10,7 +10,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.web.JsonEnricher;
 import sonia.scm.web.VndMediaType;
 
@@ -114,7 +114,6 @@ public class JsonMarshallingResponseFilterTest {
   @Test
   public void testFilterWithNonVndEntity() {
     when(responseContext.hasEntity()).thenReturn(Boolean.TRUE);
-    when(responseContext.getEntity()).thenReturn(new JsonMarshallingResponseFilterTest.Sample("one-two-three"));
     when(responseContext.getMediaType()).thenReturn(MediaType.APPLICATION_JSON_TYPE);
 
     filter.filter(requestContext, responseContext);

scm-webapp/src/test/java/sonia/scm/api/v2/resources/AuthenticationResourceTest.java

@@ -14,7 +14,7 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.security.AccessToken;
 import sonia.scm.security.AccessTokenBuilder;

scm-webapp/src/test/java/sonia/scm/filter/AdminSecurityFilterTest.java

@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.config.ScmConfiguration;
 
 /**
@@ -82,4 +82,4 @@ public class AdminSecurityFilterTest {
     assertFalse(securityFilter.hasPermission(SecurityUtils.getSubject()));
   }
 
-}
+}

scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java

@@ -33,30 +33,33 @@ package sonia.scm.filter;
 
 import com.github.sdorra.shiro.ShiroRule;
 import com.github.sdorra.shiro.SubjectAware;
-import java.io.IOException;
-import java.util.Map;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.MDC;
+import sonia.scm.AbstractTestBase;
+
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-import org.junit.Rule;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.slf4j.MDC;
-import sonia.scm.AbstractTestBase;
+import java.io.IOException;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.when;
 
 /**
  * Unit tests for {@link MDCFilter}.
  * 
  * @author Sebastian Sdorra <sebastian.sdorra@gmail.com>
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class MDCFilterTest extends AbstractTestBase {
   
   @Rule
@@ -127,4 +130,4 @@ public class MDCFilterTest extends AbstractTestBase {
     
   }
 
-}
+}

scm-webapp/src/test/java/sonia/scm/filter/SecurityFilterTest.java

@@ -51,7 +51,7 @@ import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import static org.mockito.Mockito.*;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.SCMContext;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.user.User;

scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpClientTest.java

@@ -40,7 +40,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.net.TrustAllHostnameVerifier;

scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpResponseTest.java

@@ -45,7 +45,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import sonia.scm.config.ScmConfiguration;
 

scm-webapp/src/test/java/sonia/scm/plugin/DefaultUberWebResourceLoaderTest.java

@@ -36,34 +36,28 @@ package sonia.scm.plugin;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.collect.Lists;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.hamcrest.Matchers.*;
-
-import static org.junit.Assert.*;
-
-import static org.mockito.Mockito.*;
-
-//~--- JDK imports ------------------------------------------------------------
+import org.mockito.junit.MockitoJUnitRunner;
 
+import javax.servlet.ServletContext;
 import java.io.File;
 import java.io.IOException;
-
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import java.nio.file.Path;
-
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.ServletContext;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.when;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
@@ -107,8 +101,6 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
   @Test
   public void testGetResourceFromCache() throws MalformedURLException
   {
-    when(servletContext.getResource("/myresource")).thenReturn(SCM_MANAGER);
-
     DefaultUberWebResourceLoader resourceLoader =
       new DefaultUberWebResourceLoader(servletContext,
         new ArrayList<PluginWrapper>());

scm-webapp/src/test/java/sonia/scm/plugin/MultiParentClassLoaderTest.java

@@ -48,7 +48,7 @@ import org.mockito.Mock;
 import static org.mockito.Mockito.*;
 import static org.hamcrest.Matchers.*;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 
 /**

scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java

@@ -51,7 +51,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.Type;
 import sonia.scm.cache.GuavaCacheManager;

scm-webapp/src/test/java/sonia/scm/resources/AbstractResourceManagerTest.java

@@ -41,7 +41,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import static org.hamcrest.Matchers.*;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.plugin.PluginLoader;
 
 /**

scm-webapp/src/test/java/sonia/scm/resources/DefaultResourceManagerTest.java

@@ -32,21 +32,23 @@
 package sonia.scm.resources;
 
 import com.google.common.collect.ImmutableSet;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * Unit tests for {@link DefaultResourceManager}.
  * 
  * @author Sebastian Sdorra
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class DefaultResourceManagerTest extends ResourceManagerTestBase {
 
   private DefaultResourceManager resourceManager;
@@ -73,4 +75,4 @@ public class DefaultResourceManagerTest extends ResourceManagerTestBase {
     assertEquals(1, resources.size());
   }
 
-}
+}

scm-webapp/src/test/java/sonia/scm/schedule/InjectionEnabledJobTest.java

@@ -40,7 +40,7 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
@@ -165,4 +165,4 @@ public class InjectionEnabledJobTest {
     verify(context).runAsAdmin(Mockito.any(PrivilegedAction.class));
   }
 
-}
+}

scm-webapp/src/test/java/sonia/scm/schedule/QuartzSchedulerTest.java

@@ -42,7 +42,7 @@ import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.quartz.CronTrigger;
 import org.quartz.JobDetail;
 import org.quartz.SchedulerException;
@@ -219,4 +219,4 @@ public class QuartzSchedulerTest {
     }
     
   }
-}
+}

scm-webapp/src/test/java/sonia/scm/schedule/QuartzTaskTest.java

@@ -39,7 +39,7 @@ import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.quartz.JobKey;
 import org.quartz.SchedulerException;
 
@@ -87,4 +87,4 @@ public class QuartzTaskTest {
     task.cancel();
   }
 
-}
+}

scm-webapp/src/test/java/sonia/scm/security/BearerRealmTest.java

@@ -41,41 +41,38 @@ import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwsHeader;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.PrincipalCollection;
-
+import org.hamcrest.Matchers;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.group.GroupDAO;
 import sonia.scm.user.User;
 import sonia.scm.user.UserDAO;
 import sonia.scm.user.UserTestData;
 
-import static org.junit.Assert.*;
-
-import static org.mockito.Mockito.*;
-
-//~--- JDK imports ------------------------------------------------------------
-
+import javax.crypto.spec.SecretKeySpec;
 import java.security.SecureRandom;
-
 import java.util.Date;
 import java.util.Set;
 
-import javax.crypto.spec.SecretKeySpec;
-import org.hamcrest.Matchers;
-import org.junit.Rule;
-import org.junit.rules.ExpectedException;
-import org.mockito.InjectMocks;
-import org.mockito.Mockito;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.when;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  * Unit tests for {@link BearerRealm}.
@@ -156,7 +153,6 @@ public class BearerRealmTest
   {
     SecureKey key = createSecureKey();
     User marvin = UserTestData.createMarvin();
-    when(userDAO.get(marvin.getName())).thenReturn(marvin);
 
     resolveKey(key);
 
@@ -182,8 +178,6 @@ public class BearerRealmTest
   {
     User trillian = UserTestData.createTrillian();
 
-    when(userDAO.get(trillian.getName())).thenReturn(trillian);
-
     SecureKey key = createSecureKey();
 
     resolveKey(key);
@@ -216,10 +210,6 @@ public class BearerRealmTest
   @Test(expected = AuthenticationException.class)
   public void testDoGetAuthenticationInfoWithoutSignature()
   {
-    User trillian = UserTestData.createTrillian();
-
-    when(userDAO.get(trillian.getName())).thenReturn(trillian);
-
     String compact = Jwts.builder().setSubject("test").compact();
 
     realm.doGetAuthenticationInfo(BearerToken.valueOf(compact));

scm-webapp/src/test/java/sonia/scm/security/DefaultAuthorizationCollectorTest.java

@@ -49,7 +49,7 @@ import static org.mockito.Mockito.*;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import org.junit.Rule;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.cache.Cache;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.group.GroupNames;

scm-webapp/src/test/java/sonia/scm/security/DefaultRealmTest.java

@@ -54,7 +54,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import sonia.scm.group.Group;
 import sonia.scm.group.GroupDAO;

scm-webapp/src/test/java/sonia/scm/security/JwtAccessTokenBuilderTest.java

@@ -47,7 +47,7 @@ import org.junit.Rule;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import static org.mockito.Mockito.*;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit test for {@link JwtAccessTokenBuilder}.
@@ -157,4 +157,4 @@ public class JwtAccessTokenBuilderTest {
     return new SecureKey(bytes, System.currentTimeMillis());
   }
 
-}
+}

scm-webapp/src/test/java/sonia/scm/security/JwtAccessTokenResolverTest.java

@@ -56,7 +56,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import static org.mockito.Mockito.*;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit tests for {@link JwtAccessTokenResolver}.
@@ -236,4 +236,4 @@ public class JwtAccessTokenResolverTest {
   }
 
 
-}
+}

scm-webapp/src/test/java/sonia/scm/security/SecureKeyResolverTest.java

@@ -42,7 +42,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import sonia.scm.store.ConfigurationEntryStore;
 import sonia.scm.store.ConfigurationEntryStoreFactory;

scm-webapp/src/test/java/sonia/scm/security/SecurityRequestsTest.java

@@ -3,7 +3,7 @@ package sonia.scm.security;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import javax.servlet.http.HttpServletRequest;
 

scm-webapp/src/test/java/sonia/scm/security/XsrfAccessTokenEnricherTest.java

@@ -31,16 +31,20 @@
 
 package sonia.scm.security;
 
-import javax.servlet.http.HttpServletRequest;
-import org.junit.Test;
 import org.junit.Before;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import static org.mockito.Mockito.*;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.util.HttpUtil;
 
+import javax.servlet.http.HttpServletRequest;
+
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 /**
  * Unit tests for {@link XsrfAccessTokenEnricher}.
  * 
@@ -96,8 +100,7 @@ public class XsrfAccessTokenEnricherTest {
   public void testEnrichWithDisabledXsrf() {
     // prepare
     configuration.setEnabledXsrfProtection(false);
-    when(request.getHeader(HttpUtil.HEADER_SCM_CLIENT)).thenReturn(HttpUtil.SCM_CLIENT_WUI);
-    
+
     // execute
     enricher.enrich(builder);
     
@@ -120,4 +123,4 @@ public class XsrfAccessTokenEnricherTest {
     verify(builder, never()).custom(Xsrf.TOKEN_KEY, "42");
   }
 
-}
+}

scm-webapp/src/test/java/sonia/scm/security/XsrfTokenClaimsValidatorTest.java

@@ -40,7 +40,7 @@ import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import static org.mockito.Mockito.*;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Tests {@link XsrfTokenClaimsValidator}.
@@ -115,4 +115,4 @@ public class XsrfTokenClaimsValidatorTest {
     // execute and assert
     assertTrue(validator.validate(claims));
   }
-}
+}

scm-webapp/src/test/java/sonia/scm/user/UserEventHackTest.java

@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
 
 import org.mockito.InOrder;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import sonia.scm.HandlerEventType;
 

scm-webapp/src/test/java/sonia/scm/web/BasicWebTokenGeneratorTest.java

@@ -43,7 +43,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.hamcrest.Matchers.*;
 

scm-webapp/src/test/java/sonia/scm/web/BearerWebTokenGeneratorTest.java

@@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.*;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import static org.mockito.Mockito.*;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.security.BearerToken;
 
 /**
@@ -76,4 +76,4 @@ public class BearerWebTokenGeneratorTest {
     assertThat(bt.getCredentials(), equalTo("asd"));
   }
 
-}
+}

scm-webapp/src/test/java/sonia/scm/web/CookieBearerWebTokenGeneratorTest.java

@@ -39,7 +39,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import sonia.scm.security.BearerToken;