[Misc] Removed deprecated method and classes

xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-tests/src/test/it/org/xwiki/panels/test/ui/NewPagePanelTest.java

@@ -20,10 +20,11 @@
 package org.xwiki.panels.test.ui;
 
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
 import org.xwiki.panels.test.po.NewPagePanel;
-import org.xwiki.test.ui.AbstractGuestTest;
-import org.xwiki.test.ui.AbstractStandardUserAuthenticatedTest;
+import org.xwiki.test.ui.AbstractTest;
+import org.xwiki.test.ui.AuthenticationRule;
 import org.xwiki.test.ui.browser.IgnoreBrowser;
 import org.xwiki.test.ui.browser.IgnoreBrowsers;
 import org.xwiki.test.ui.po.editor.WYSIWYGEditPage;
@@ -34,8 +35,12 @@
  * @version $Id$
  * @since 2.5RC1
  */
-public class NewPagePanelTest extends AbstractStandardUserAuthenticatedTest
+public class NewPagePanelTest extends AbstractTest
 {
+    @Rule
+    public AuthenticationRule authenticationRule =
+        new AuthenticationRule("TestUser", "TestPassword", getUtil(), getDriver());
+
     /**
      * Tests if a new page can be created using the create page panel.
      */

xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-tests/src/test/it/org/xwiki/panels/test/ui/PanelWizardTest.java

@@ -21,7 +21,6 @@
 
 import org.junit.*;
 import org.xwiki.administration.test.po.AdministrationPage;
-import org.xwiki.test.ui.AbstractAdminAuthenticatedTest;
 import org.xwiki.test.ui.AbstractTest;
 import org.xwiki.test.ui.SuperAdminAuthenticationRule;
 

xwiki-platform-core/xwiki-platform-test/src/main/java/org/xwiki/test/ui/AbstractAdminAuthenticatedTest.java

-/*
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.xwiki.test.ui;
-
-import org.junit.Before;
-
-/**
- * Helper class to be extended by tests requiring an Admin user logged in.
- * 
- * @version $Id$
- * @since 3.2M3
- */
-public abstract class AbstractAdminAuthenticatedTest extends AbstractTest
-{
-    @Before
-    public void setUp() throws Exception
-    {
-        loginAdminUser();
-    }
-
-    /**
-     * @since 4.3M2
-     */
-    public static void loginAdminUser()
-    {
-        if (!"Admin".equals(getUtil().getLoggedInUserName())) {
-            // Log in and direct to a non existent page so that it loads very fast and we don't incur the time cost of
-            // going to the home page for example.
-            getDriver().get(getUtil().getURLToLoginAsAdminAndGotoPage(getUtil().getURLToNonExistentPage()));
-            getUtil().recacheSecretToken();
-        }
-    }
-}

xwiki-platform-core/xwiki-platform-test/src/main/java/org/xwiki/test/ui/AbstractStandardUserAuthenticatedTest.java

-/*
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.xwiki.test.ui;
-
-import org.junit.Before;
-
-/**
- * Helper class to be extended by tests requiring a standard user logged in.
- * 
- * @version $Id$
- * @since 5.0M2
- */
-public abstract class AbstractStandardUserAuthenticatedTest extends AbstractTest
-{
-    @Before
-    public void setUp() throws Exception
-    {
-        loginStandardUser();
-    }
-
-    public static void loginStandardUser()
-    {
-        if (!"TestUser".equals(getUtil().getLoggedInUserName())) {
-            // Log in and direct to a non existent page so that it loads very fast and we don't incur the time cost of
-            // going to the home page for example.
-            getUtil().registerLoginAndGotoPage("TestUser", "TestPassword", getUtil().getURLToNonExistentPage());
-            getUtil().recacheSecretToken();
-        }
-    }
-}

xwiki-platform-core/xwiki-platform-test/src/main/java/org/xwiki/test/ui/AdminAuthenticationRule.java

@@ -26,7 +26,6 @@
  *
  * @version $Id$
  * @since 5.1M1
- * @todo decide if we want this way of authenticating to replace {@link AbstractAdminAuthenticatedTest}
  */
 public class AdminAuthenticationRule extends AuthenticationRule
 {

xwiki-platform-core/xwiki-platform-test/src/main/java/org/xwiki/test/ui/AuthenticationRule.java

@@ -29,7 +29,6 @@
  *
  * @version $Id$
  * @since 5.1M1
- * @todo decide if we want this way of authenticating to replace {@link AbstractStandardUserAuthenticatedTest}
  */
 public class AuthenticationRule implements MethodRule
 {

xwiki-platform-core/xwiki-platform-test/src/main/java/org/xwiki/test/ui/TestUtils.java

@@ -327,16 +327,6 @@ public void createUser(final String username, final String password, String redi
         }
     }
 
-    /**
-     * @deprecated starting with 5.0M2 use {@link #createUserAndLogin(String, String, Object...)} instead
-     */
-    @Deprecated
-    public void registerLoginAndGotoPage(final String username, final String password, final String pageURL)
-    {
-        createUserAndLogin(username, password);
-        getDriver().get(pageURL);
-    }
-
     public ViewPage gotoPage(String space, String page)
     {
         gotoPage(space, page, "view");