[misc] Fix xwiki-platform-eventstream-default unit tests

xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-default/src/main/java/org/xwiki/eventstream/internal/DefaultModelBridge.java

@@ -23,7 +23,6 @@
 import java.util.Map;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 

xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-default/src/test/java/org/xwiki/eventstream/internal/DefaultModelBridgeTest.java

@@ -34,7 +34,6 @@
 import org.xwiki.model.reference.DocumentReferenceResolver;
 import org.xwiki.model.reference.EntityReference;
 import org.xwiki.model.reference.LocalDocumentReference;
-import org.xwiki.security.authorization.AuthorizationManager;
 import org.xwiki.test.mockito.MockitoComponentMockingRule;
 
 import com.xpn.xwiki.XWiki;
@@ -44,6 +43,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -61,18 +61,14 @@ public class DefaultModelBridgeTest
 
     private Provider<XWikiContext> contextProvider;
 
-    private AuthorizationManager authorizationManager;
-
-    private DocumentReferenceResolver documentReferenceResolver;
+    private DocumentReferenceResolver<String> documentReferenceResolver;
 
     @Before
     public void setUp() throws Exception
     {
         this.contextProvider = this.mocker.getInstance(XWikiContext.TYPE_PROVIDER);
 
-        this.authorizationManager = this.mocker.registerMockComponent(AuthorizationManager.class);
-
-        this.documentReferenceResolver = this.mocker.registerMockComponent(DocumentReferenceResolver.class);
+        this.documentReferenceResolver = this.mocker.getInstance(DocumentReferenceResolver.TYPE_STRING);
     }
 
     @Test
@@ -119,7 +115,7 @@ public void testCheckXObjectPresenceWithPresentXObject() throws Exception
         LocalDocumentReference localDocumentReferenceType1 = mock(LocalDocumentReference.class);
 
         when(resolvedType1.getLocalDocumentReference()).thenReturn(localDocumentReferenceType1);
-        when(this.documentReferenceResolver.resolve("type1")).thenReturn(resolvedType1);
+        when(this.documentReferenceResolver.resolve(eq("type1"))).thenReturn(resolvedType1);
         when(document.getXObjects()).thenReturn(documentXObjects);
 
         when(documentReferenceFromDocumentXObjects.getLocalDocumentReference()).thenReturn(localDocumentReferenceType1);