[Misc] Simplify PageTest's setup

xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/src/main/java/org/xwiki/test/page/PageComponentList.java

@@ -92,6 +92,7 @@
 import org.xwiki.xml.internal.html.filter.ListItemFilter;
 
 import com.xpn.xwiki.doc.DefaultDocumentAccessBridge;
+import com.xpn.xwiki.internal.DefaultXWikiStubContextProvider;
 import com.xpn.xwiki.internal.localization.XWikiLocalizationContext;
 import com.xpn.xwiki.internal.security.authorization.DefaultAuthorExecutor;
 import com.xpn.xwiki.internal.sheet.ClassSheetBinder;
@@ -130,6 +131,9 @@
 @Retention(RUNTIME)
 @Target({ TYPE, METHOD, ANNOTATION_TYPE })
 @ComponentList({
+    // Request
+    DefaultXWikiStubContextProvider.class,
+
     // Rendering
     XWikiRenderingContext.class,
     DefaultTransformationManager.class,
@@ -140,7 +144,7 @@
     DefaultMacroContentParser.class,
     DefaultSyntaxRegistry.class,
 
-    //Resource
+    // Resource
     DefaultResourceReferenceManager.class,
 
     // Plain Syntax

xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/src/main/java/org/xwiki/test/page/URLFactorySetup.java

@@ -21,12 +21,9 @@
 
 import java.net.URL;
 
-import com.xpn.xwiki.XWiki;
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.web.XWikiServletURLFactory;
 
-import static org.mockito.Mockito.doReturn;
-
 /**
  * Set up URL Factory for Page Tests.
  *
@@ -35,8 +32,6 @@
  */
 public final class URLFactorySetup
 {
-    private static final String XWIKI = "xwiki";
-
     private URLFactorySetup()
     {
         // Utility class and thus no public constructor.
@@ -45,16 +40,12 @@ private URLFactorySetup()
     /**
      * Sets up a fake base URL and a fake Servlet URL Factory.
      *
-     * @param xwiki the stubbed XWiki instance
      * @param context the stubbed XWikiContext instance
      * @throws Exception when a setup error occurs
      */
-    public static void setUp(XWiki xwiki, XWikiContext context) throws Exception
+    public static void setUp(XWikiContext context) throws Exception
     {
-        doReturn(XWIKI).when(xwiki).getWebAppPath(context);
         context.setURL(new URL("http://localhost:8080/xwiki/bin/Main/WebHome"));
-        doReturn(true).when(xwiki).showViewAction(context);
         context.setURLFactory(new XWikiServletURLFactory(context));
-        doReturn("/bin/").when(xwiki).getServletPath(XWIKI, context);
     }
 }