Add functional tests xwikisas#16

* removed unnecessary code * code refactoring
ChiuchiuSorin · Mar 28, 2024 · eec7de8 · eec7de8
1 parent 292a560
commit eec7de8
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 41 deletions.
diff --git a/...s-default/src/main/java/com/xwiki/admintools/internal/data/ConfigurationDataProvider.java b/...s-default/src/main/java/com/xwiki/admintools/internal/data/ConfigurationDataProvider.java
@@ -92,7 +92,6 @@ public Map<String, String> getDataAsJSON() throws Exception
             systemInfo.put("databaseName", dbMetadata.get(METADATA_NAME));
             systemInfo.put("databaseVersion", dbMetadata.get(METADATA_VERSION));
             systemInfo.put("xwikiCfgPath", getCurrentServer().getXwikiCfgFolderPath());
-            systemInfo.put("serverPath", getCurrentServer().getServerPath());
             systemInfo.put("tomcatConfPath", this.getCurrentServer().getServerCfgPath());
             systemInfo.put("javaVersion", this.getJavaVersion());
             Map<String, String> serverMetadata = this.usageDataProvider.getServerMetadata();

diff --git a/application-admintools-default/src/main/resources/templates/filesSectionTemplate.vm b/application-admintools-default/src/main/resources/templates/filesSectionTemplate.vm
@@ -33,14 +33,12 @@
         $escapetool.xml($services.localization.render('adminTools.dashboard.download.view.description'))
         <ul>
           <li>
-            <a href="$adminToolsFilesPath/xwikiConfig"
-            target="_blank">
+            <a href="$adminToolsFilesPath/xwikiConfig" id="xwiki-config-file" target="_blank">
               $escapetool.xml($services.localization.render('adminTools.dashboard.download.view.configuration'))
             </a>
           </li>
           <li>
-            <a href="$adminToolsFilesPath/xwikiProperties"
-            target="_blank">
+            <a href="$adminToolsFilesPath/xwikiProperties" id="xwiki-properties-file" target="_blank">
               $escapetool.xml($services.localization.render('adminTools.dashboard.download.view.properties'))
             </a>
           </li>

diff --git a/application-admintools-test/application-admintools-test-docker/pom.xml b/application-admintools-test/application-admintools-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>com.xwiki.admintools</groupId>
     <artifactId>application-admintools-test</artifactId>
-    <version>1.0-rc-2-SNAPSHOT</version>
+    <version>1.0-rc-3-SNAPSHOT</version>
   </parent>
   <artifactId>application-admintools-test-docker</artifactId>
   <name>Admin Tools Application - Tests - Functional Docker Tests</name>

diff --git a/...ication-admintools-test-docker/src/test/it/com/xwiki/admintools/test/ui/AdminToolsIT.java b/...ication-admintools-test-docker/src/test/it/com/xwiki/admintools/test/ui/AdminToolsIT.java
@@ -184,17 +184,9 @@ void adminToolsHomePageFilesNotAdmin(TestUtils testUtils)
     {
         testUtils.login(USER_NAME, PASSWORD);
 
-        DashboardFilesSectionView filesSectionView = AdminToolsHomePage.getFilesSection();
-        WebElement filesSectionNonAdminView = filesSectionView.getNonAdminUserView();
+        WebElement filesSectionNonAdminView = AdminToolsHomePage.gotoPage().getNonAdminUserView();
         assertTrue(filesSectionNonAdminView.getText().contains(
-            "[Access denied when checking [admin] access to [xwiki:AdminTools.WebHome] for user [xwiki:XWiki."
-                + USER_NAME + "]]"));
-
-        DashboardConfigurationSectionView configurationSectionView = AdminToolsHomePage.getConfigurationSection();
-        WebElement configurationSectionNonAdminView = configurationSectionView.getNonAdminUserView();
-        assertTrue(configurationSectionNonAdminView.getText().contains(
-            "[Access denied when checking [admin] access to [xwiki:AdminTools.WebHome] for user [xwiki:XWiki."
-                + USER_NAME + "]]"));
+            "Access denied due to missing admin rights!"));
     }
 
     /**

diff --git a/application-admintools-test/application-admintools-test-pageobjects/pom.xml b/application-admintools-test/application-admintools-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>com.xwiki.admintools</groupId>
     <artifactId>application-admintools-test</artifactId>
-    <version>1.0-rc-2-SNAPSHOT</version>
+    <version>1.0-rc-3-SNAPSHOT</version>
   </parent>
   <artifactId>application-admintools-test-pageobjects</artifactId>
   <name>Admin Tools Application - Tests - Page Objects</name>

diff --git a/...tools-test-pageobjects/src/main/java/com/xwiki/admintools/test/po/AdminToolsHomePage.java b/...tools-test-pageobjects/src/main/java/com/xwiki/admintools/test/po/AdminToolsHomePage.java
@@ -20,6 +20,7 @@
 package com.xwiki.admintools.test.po;
 
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
 import org.xwiki.test.ui.po.ViewPage;
 
 /**
@@ -69,5 +70,12 @@ public static boolean isCurrentPage(ViewPage vp)
             .equals(ADMIN_TOOLS_SPACE);
     }
 
+    /**
+     * Get the view for a user that does not have admin rights.
+     */
+    public WebElement getNonAdminUserView()
+    {
+        return this.getDriver().findElement(By.cssSelector(".errormessage"));
+    }
 }
 
diff --git a/...objects/src/main/java/com/xwiki/admintools/test/po/DashboardConfigurationSectionView.java b/...objects/src/main/java/com/xwiki/admintools/test/po/DashboardConfigurationSectionView.java
@@ -60,9 +60,4 @@ public LastNLinesModalView clickViewLastLogsModal()
         return new LastNLinesModalView(By.id("configurationViewLastNLinesModal"),
             BACKEND_SECTION_VIEW_LAST_LOGS_MODAL_ID);
     }
-
-    public WebElement getNonAdminUserView()
-    {
-        return this.getDriver().findElement(By.cssSelector(".gadget-content .xwikirenderingerror"));
-    }
 }
diff --git a/...est-pageobjects/src/main/java/com/xwiki/admintools/test/po/DashboardFilesSectionView.java b/...est-pageobjects/src/main/java/com/xwiki/admintools/test/po/DashboardFilesSectionView.java
@@ -51,19 +51,14 @@ public DownloadArchiveModalView clickDownloadModalHyperlink()
      */
     public void clickPropertiesHyperlink()
     {
-        filesContent.findElement(By.id("filesProperties")).click();
+        filesContent.findElement(By.id("xwiki-properties-file")).click();
     }
 
     /**
      * Navigate and click the link for viewing XWiki configuration file.
      */
     public void clickConfigurationHyperlink()
     {
-        filesContent.findElement(By.id("filesConfig")).click();
-    }
-
-    public WebElement getNonAdminUserView()
-    {
-        return this.getDriver().findElement(By.cssSelector(".gadget-content .xwikirenderingerror"));
+        filesContent.findElement(By.id("xwiki-config-file")).click();
     }
 }
diff --git a/application-admintools-test/pom.xml b/application-admintools-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>com.xwiki.admintools</groupId>
     <artifactId>application-admintools</artifactId>
-    <version>1.0-rc-2-SNAPSHOT</version>
+    <version>1.0-rc-3-SNAPSHOT</version>
   </parent>
   <artifactId>application-admintools-test</artifactId>
   <name>Admin Tools Application - Tests - Parent POM</name>

diff --git a/application-admintools-ui/src/main/resources/AdminTools/Code/Macros.xml b/application-admintools-ui/src/main/resources/AdminTools/Code/Macros.xml
@@ -37,17 +37,6 @@
   <syntaxId>xwiki/2.1</syntaxId>
   <hidden>true</hidden>
   <content>{{velocity output='false'}}
-#macro (databaseIsSupported $databaseName $isSupported)
-  #set ($supportedDatabases = $services.admintools.getSupportedDatabases())
-  #set ($isSupported = false)
-  #set($lowercaseDBName = $databaseName.toLowerCase())
-  #foreach ($database in $supportedDatabases)
-    #if ($lowercaseDBName.contains($database.toLowerCase()))
-      #set ($isSupported = true)
-      #break
-    #end
-  #end
-#end
 #macro (viewLastNLinesMoldal $id)
   #set ($modalId = $id + 'ViewLastNLinesModal')
   &lt;div class="modal fade" id="${modalId}" tabindex="-1" role="dialog" aria-labelledby="${modalId}Label"&gt;