diff --git a/application-admintools-test/application-admintools-test-docker/pom.xml b/application-admintools-test/application-admintools-test-docker/pom.xml
index 3c4ece91..224af0ec 100644
--- a/application-admintools-test/application-admintools-test-docker/pom.xml
+++ b/application-admintools-test/application-admintools-test-docker/pom.xml
@@ -105,6 +105,12 @@
${project.version}
test
+
+ org.xwiki.platform
+ xwiki-platform-panels-test-pageobjects
+ ${platform.version}
+ test
+
src/test/it
diff --git a/application-admintools-test/application-admintools-test-docker/src/test/it/com/xwiki/admintools/test/ui/AdminToolsIT.java b/application-admintools-test/application-admintools-test-docker/src/test/it/com/xwiki/admintools/test/ui/AdminToolsIT.java
index d80a6a10..08761d47 100644
--- a/application-admintools-test/application-admintools-test-docker/src/test/it/com/xwiki/admintools/test/ui/AdminToolsIT.java
+++ b/application-admintools-test/application-admintools-test-docker/src/test/it/com/xwiki/admintools/test/ui/AdminToolsIT.java
@@ -22,6 +22,7 @@
import java.util.Arrays;
import java.util.List;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order;
@@ -29,9 +30,11 @@
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.xwiki.model.reference.DocumentReference;
+import org.xwiki.panels.test.po.ApplicationsPanel;
import org.xwiki.test.docker.junit5.TestConfiguration;
import org.xwiki.test.docker.junit5.UITest;
import org.xwiki.test.ui.TestUtils;
+import org.xwiki.test.ui.po.ViewPage;
import com.xwiki.admintools.test.po.AdminToolsHomePage;
import com.xwiki.admintools.test.po.DashboardConfigurationSectionView;
@@ -88,6 +91,15 @@ void goToPage()
@Test
@Order(1)
+ void appEntryRedirectsToHomePage()
+ {
+ ApplicationsPanel applicationPanel = ApplicationsPanel.gotoPage();
+ ViewPage vp = applicationPanel.clickApplication("Admin Tools");
+ Assertions.assertTrue(AdminToolsHomePage.isCurrentPage(vp));
+ }
+
+ @Test
+ @Order(2)
void adminToolsHomePageBackend(TestConfiguration testConfiguration)
{
DashboardConfigurationSectionView configurationSectionView = AdminToolsHomePage.getConfigurationSection();
@@ -106,7 +118,7 @@ void adminToolsHomePageBackend(TestConfiguration testConfiguration)
}
@Test
- @Order(2)
+ @Order(3)
void adminToolViewLastLogLinesModal(TestUtils testUtils)
{
DashboardConfigurationSectionView configurationSectionView = AdminToolsHomePage.getConfigurationSection();
@@ -120,7 +132,7 @@ void adminToolViewLastLogLinesModal(TestUtils testUtils)
}
@Test
- @Order(3)
+ @Order(4)
void adminToolsHomePageFiles(TestUtils testUtils)
{
excludeContent(testUtils, excludedLines);
@@ -135,7 +147,7 @@ void adminToolsHomePageFiles(TestUtils testUtils)
}
@Test
- @Order(4)
+ @Order(5)
void adminToolDownloadArchiveModal()
{
DashboardFilesSectionView filesSectionView = AdminToolsHomePage.getFilesSection();
@@ -167,7 +179,7 @@ void adminToolDownloadArchiveModal()
}
@Test
- @Order(5)
+ @Order(6)
void adminToolsHomePageFilesNotAdmin(TestUtils testUtils)
{
testUtils.login(USER_NAME, PASSWORD);
diff --git a/application-admintools-test/application-admintools-test-pageobjects/src/main/java/com/xwiki/admintools/test/po/AdminToolsHomePage.java b/application-admintools-test/application-admintools-test-pageobjects/src/main/java/com/xwiki/admintools/test/po/AdminToolsHomePage.java
index c3752ddb..51252a14 100644
--- a/application-admintools-test/application-admintools-test-pageobjects/src/main/java/com/xwiki/admintools/test/po/AdminToolsHomePage.java
+++ b/application-admintools-test/application-admintools-test-pageobjects/src/main/java/com/xwiki/admintools/test/po/AdminToolsHomePage.java
@@ -59,5 +59,15 @@ public static DashboardFilesSectionView getFilesSection()
gotoPage();
return new DashboardFilesSectionView();
}
+
+ /**
+ * Check if the page is the same as Admin Tools WebHome.
+ */
+ public static boolean isCurrentPage(ViewPage vp)
+ {
+ return vp.getMetaDataValue("page").equals(ADMIN_TOOLS_PAGE) && vp.getMetaDataValue("space")
+ .equals(ADMIN_TOOLS_SPACE);
+ }
+
}