[felix-dev] branch master updated: Remove usage of deprecated test utility methods

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 814f33b  Remove usage of deprecated test utility methods
814f33b is described below

commit 814f33bfce886ac5864e702bcd6ee89395e8c9ef
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Dec 30 10:05:41 2021 +0100

    Remove usage of deprecated test utility methods
---
 .../http/jetty/internal/JettyServiceTest.java      | 20 +++++++-------
 .../http/jetty/internal/RequestLogTrackerTest.java | 31 +++++++++++-----------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git 
a/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyServiceTest.java
 
b/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyServiceTest.java
index 7dba53f..0aa3f97 100644
--- 
a/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyServiceTest.java
+++ 
b/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyServiceTest.java
@@ -50,7 +50,7 @@ import org.eclipse.jetty.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -93,15 +93,15 @@ public class JettyServiceTest
         when(ref.getProperty(Constants.SERVICE_ID)).thenReturn(1L);
         final ServiceRegistration reg = mock(ServiceRegistration.class);
         when(reg.getReference()).thenReturn(ref);
-        
when(mockBundleContext.registerService((Class<ServletContextHelper>)Matchers.isNotNull(),
-                
(ServiceFactory<ServletContextHelper>)Matchers.any(ServiceFactory.class),
-                Matchers.any(Dictionary.class))).thenReturn(reg);
-        when(mockBundleContext.registerService(Matchers.<String[]>any(),
-                Matchers.any(ServiceFactory.class),
-                Matchers.any(Dictionary.class))).thenReturn(reg);
-        
when(mockBundleContext.registerService((Class<HttpServiceRuntime>)Matchers.isNotNull(),
-                Matchers.any(HttpServiceRuntime.class),
-                Matchers.any(Dictionary.class))).thenReturn(reg);
+        
when(mockBundleContext.registerService((Class<ServletContextHelper>)ArgumentMatchers.isNotNull(),
+                
(ServiceFactory<ServletContextHelper>)ArgumentMatchers.any(ServiceFactory.class),
+                ArgumentMatchers.any(Dictionary.class))).thenReturn(reg);
+        
when(mockBundleContext.registerService(ArgumentMatchers.<String[]>any(),
+                ArgumentMatchers.any(ServiceFactory.class),
+                ArgumentMatchers.any(Dictionary.class))).thenReturn(reg);
+        
when(mockBundleContext.registerService((Class<HttpServiceRuntime>)ArgumentMatchers.isNotNull(),
+                ArgumentMatchers.any(HttpServiceRuntime.class),
+                ArgumentMatchers.any(Dictionary.class))).thenReturn(reg);
 
         httpServiceController = new HttpServiceController(mockBundleContext);
         jettyService = new JettyService(mockBundleContext, 
httpServiceController);
diff --git 
a/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/RequestLogTrackerTest.java
 
b/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/RequestLogTrackerTest.java
index 4e4b0ff..47ffd55 100644
--- 
a/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/RequestLogTrackerTest.java
+++ 
b/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/RequestLogTrackerTest.java
@@ -16,28 +16,28 @@
  */
 package org.apache.felix.http.jetty.internal;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.RequestLog;
 import org.eclipse.jetty.server.Response;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.osgi.framework.*;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.Version;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
-
-@RunWith(MockitoJUnitRunner.class)
 public class RequestLogTrackerTest {
-    
-    @Mock
-    BundleContext context;
-    
+
     @Test
     public void testInvokeRequestLog() throws Exception {
+        BundleContext context = mock(BundleContext.class);
         RequestLogTracker tracker = new RequestLogTracker(context, null);
 
         RequestLog mockRequestLog = mock(RequestLog.class);
@@ -61,11 +61,12 @@ public class RequestLogTrackerTest {
         for (int i = 0; i < 50; i++)
             tracker.log(null, null);
 
-        verify(mockRequestLog, times(15)).log(isNull(Request.class), 
isNull(Response.class));
+        verify(mockRequestLog, 
times(15)).log(org.mockito.ArgumentMatchers.isNull(), 
org.mockito.ArgumentMatchers.isNull());
     }
 
     @Test
     public void testNaughtyService() throws Exception {
+        BundleContext context = mock(BundleContext.class);
         RequestLogTracker tracker = new RequestLogTracker(context, null);
 
         AtomicInteger counter = new AtomicInteger(0);