[Misc] Convert one more JUnit4-based rendering tests to JUnit5, removing the jmock usage

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml

@@ -72,7 +72,20 @@
       <groupId>net.sourceforge.cssparser</groupId>
       <artifactId>cssparser</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-icon-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-localization-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
     <!-- Testing dependencies -->
     <dependency>
       <groupId>org.xwiki.rendering</groupId>
@@ -105,25 +118,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-icon-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-localization-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <!--dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>test</scope>
-    </dependency-->
   </dependencies>
   <build>
     <plugins>

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/test/java/org/xwiki/rendering/IntegrationTests.java

@@ -19,17 +19,16 @@
  */
 package org.xwiki.rendering;
 
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.runner.RunWith;
-import org.xwiki.component.descriptor.DefaultComponentDescriptor;
-import org.xwiki.component.manager.ComponentManager;
+import org.xwiki.component.util.DefaultParameterizedType;
 import org.xwiki.model.reference.AttachmentReference;
 import org.xwiki.model.reference.AttachmentReferenceResolver;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.rendering.test.MockWikiModel;
-import org.xwiki.rendering.test.integration.RenderingTestSuite;
+import org.xwiki.rendering.test.integration.junit5.RenderingTests;
+import org.xwiki.test.annotation.AllComponents;
+import org.xwiki.test.mockito.MockitoComponentManager;
+
+import static org.mockito.Mockito.when;
 
 /**
  * Run all tests found in {@code *.test} files located in the classpath. These {@code *.test} files must follow the
@@ -38,26 +37,17 @@
  * @version $Id$
  * @since 3.0RC1
  */
-@RunWith(RenderingTestSuite.class)
-public class IntegrationTests
+@AllComponents
+public class IntegrationTests implements RenderingTests
 {
-    @RenderingTestSuite.Initialized
-    public void initialize(ComponentManager componentManager) throws Exception
+    @RenderingTests.Initialized
+    public void initialize(MockitoComponentManager componentManager) throws Exception
     {
-        Mockery mockery = new JUnit4Mockery();
-
         // Attachment Reference Resolver Mock
-        final AttachmentReferenceResolver<String> mockResolver = mockery.mock(AttachmentReferenceResolver.class);
-        mockery.checking(new Expectations() {{
-            allowing(mockResolver).resolve("Space.ExistingPage@my.png");
-            will(returnValue(
-                new AttachmentReference("my.png", new DocumentReference("wiki", "Space", "ExistingPage"))));
-        }});
-        DefaultComponentDescriptor<AttachmentReferenceResolver<String>> descriptorARS =
-            new DefaultComponentDescriptor<AttachmentReferenceResolver<String>>();
-        descriptorARS.setRoleType(AttachmentReferenceResolver.TYPE_STRING);
-        descriptorARS.setRoleHint("current");
-        componentManager.registerComponent(descriptorARS, mockResolver);
+        AttachmentReferenceResolver<String> ar = componentManager.registerMockComponent(
+            new DefaultParameterizedType(null, AttachmentReferenceResolver.class, String.class), "current");
+        when(ar.resolve("Space.ExistingPage@my.png")).thenReturn(
+            new AttachmentReference("my.png", new DocumentReference("wiki", "Space", "ExistingPage")));
 
         // WikiModel Mock
         componentManager.registerComponent(MockWikiModel.getComponentDescriptor());