From 870895003d1c4348443bdf03468e862ff9bccf30 Mon Sep 17 00:00:00 2001
From: monhaso <sonali.mohanty@ext.ec.europa.eu>
Date: Thu, 3 Mar 2022 21:14:40 +0100
Subject: [PATCH] 1) Changes are done accoring to comment.
---
.../java/pages/components/grid/BasicGrid.java | 10 ---
.../main/java/pages/domain/DomainPopup.java | 2 +-
.../java/pages/keystore/KeyStoreGrid.java | 71 +------------------
.../main/java/utils/enums/SMPMessages.java | 11 +--
.../src/test/java/ui/DomainPgTest.java | 14 ----
5 files changed, 10 insertions(+), 98 deletions(-)
diff --git a/smp-ui-tests/src/main/java/pages/components/grid/BasicGrid.java b/smp-ui-tests/src/main/java/pages/components/grid/BasicGrid.java
index 680bf6566..6b7bbc777 100644
--- a/smp-ui-tests/src/main/java/pages/components/grid/BasicGrid.java
+++ b/smp-ui-tests/src/main/java/pages/components/grid/BasicGrid.java
@@ -21,7 +21,6 @@ public class BasicGrid extends PageComponent {
super(driver);
log.info("Loading basic grid");
-// waitToLoad();
waitForRowsToLoad();
PageFactory.initElements( new DefaultElementLocatorFactory(container) , this);
@@ -31,15 +30,6 @@ public class BasicGrid extends PageComponent {
}
-// private void waitToLoad(){
-// try {
-// waitForXMillis(500);
-// waitForElementToBeGone(driver.findElement(loadingBar));
-// } catch (Exception e) {
-//
-// }
-// }
-
@FindBy(css = "datatable-header div.datatable-row-center datatable-header-cell")
diff --git a/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java b/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java
index 2300cb252..de3b5367c 100644
--- a/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java
+++ b/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java
@@ -120,7 +120,7 @@ public class DomainPopup extends PageComponent {
}
public void clearAndFillDomainCodeInput(String domainCode) {
- log.info("filling only domain code data for new domain");
+ log.info("clear and fill domain code data");
clearAndFillInput(domainCodeInput, domainCode);
}
diff --git a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreGrid.java b/smp-ui-tests/src/main/java/pages/keystore/KeyStoreGrid.java
index b85ccdf59..0236d8c23 100644
--- a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreGrid.java
+++ b/smp-ui-tests/src/main/java/pages/keystore/KeyStoreGrid.java
@@ -17,84 +17,19 @@ import pages.domain.DomainRow;
import java.util.ArrayList;
import java.util.List;
-public class KeyStoreGrid extends PageComponent {
+public class KeyStoreGrid extends BasicGrid {
public KeyStoreGrid(WebDriver driver, WebElement container) {
- super(driver);
+ super(driver,container);
log.info("Loading KeyStoreGrid");
waitForRowsToLoad();
PageFactory.initElements(new DefaultElementLocatorFactory(container), this);
- for (int i = 0; i < gridHeaders.size(); i++) {
- headerTxt.add(gridHeaders.get(i).getText().trim());
- }
}
- @FindBy(css = "#keystoreTable_id datatable-header div.datatable-row-center datatable-header-cell")
- protected List<WebElement> gridHeaders;
- @FindBy(css = "#keystoreTable_id datatable-body-row > div.datatable-row-center.datatable-row-group")
- protected List<WebElement> gridRows;
+ private By cellSelector = By.cssSelector("#keystoreTable_id datatable-body-cell");
- protected ArrayList<String> headerTxt = new ArrayList<String>();
- private By cellSelector = By.cssSelector("#keystoreTable_id datatable-body-cell");
-
-// public List<KeyStoreRow> getKeyStoreRowsInfo() {
-// log.info("getting all the rows information");
-// List<KeyStoreRow> rowInfos = new ArrayList<>();
-//
-// for (WebElement gridRow : gridRows) {
-// List<WebElement> cells = gridRow.findElements(cellSelector);
-//
-// KeyStoreRow row = new KeyStoreRow();
-//
-// for (int i = 0; i < headerTxt.size(); i++) {
-// switch (headerTxt.get(i)) {
-// case "Alias":
-// row.setAlias(cells.get(i).getText().trim());
-// break;
-// case "Certificate id":
-// row.setCertificateId(cells.get(i).getText().trim());
-// break;
-// }
-// }
-// rowInfos.add(row);
-// }
-//
-// return rowInfos;
-// }
-
- public void doubleClickRow(int rowNumber) {
- log.info("double clicking row ... " + rowNumber);
- waitForXMillis(500);
- if (rowNumber >= gridRows.size()) {
- return;
- }
- Actions action = new Actions(driver);
- action.doubleClick(gridRows.get(rowNumber)).perform();
- }
-
- public int getColumnsNo() {
- log.info("getting number of columns");
- return gridHeaders.size();
- }
-
- public int getRowsNo() {
- return gridRows.size();
- }
-
- /*public boolean isKeyStoreCreated(int rowNum, String keyStoreName) {
- WebElement gridRow = gridRows.get(rowNum);
- List<WebElement> cells = gridRow.findElements(cellSelector);
- for (int i = 0; i < headerTxt.size(); i++) {
- if (headerTxt.get(i).equals("Alias")) {
- if (cells.get(i).getText().trim().contains(keyStoreName)) {
- return true;
- }
- }
- }
- return false;
- }*/
public ConfirmationDialog deleteKeyStore(int rowNum) {
WebElement gridRow = gridRows.get(rowNum);
diff --git a/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java b/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java
index 68fc52a3e..ce4c9fbf9 100644
--- a/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java
+++ b/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java
@@ -1,5 +1,9 @@
package utils.enums;
+import utils.TestDataProvider;
+
+import java.util.Map;
+
public class SMPMessages {
public static final String MSG_1 = "The username/password combination you provided are not valid. Please try again or contact your administrator.";
@@ -75,9 +79,6 @@ public class SMPMessages {
public static final String PASS_NO_MATCH_MESSAGE = "Passwords do not match";
public static final String PASS_NO_EMPTY_MESSAGE = "You should type a password";
- public static final String KEYSTORE_IMPORTED_MSG = "Keystore keystore_dummy1.jks imported!";
- public static final String KEYSTORE_DELETION_MSG = "Certificate sample_key_dummy1 deleted!";
-
-
-
+ public static final String KEYSTORE_IMPORTED_MSG = "Keystore %s imported!";
+ public static final String KEYSTORE_DELETION_MSG = "Certificate %s deleted!";
}
diff --git a/smp-ui-tests/src/test/java/ui/DomainPgTest.java b/smp-ui-tests/src/test/java/ui/DomainPgTest.java
index fc95ef7d2..f7024fa13 100644
--- a/smp-ui-tests/src/test/java/ui/DomainPgTest.java
+++ b/smp-ui-tests/src/test/java/ui/DomainPgTest.java
@@ -306,7 +306,6 @@ public class DomainPgTest extends BaseTest {
public void onlyDomainCodeSavingMsgVerify() {
SoftAssert soft = new SoftAssert();
DomainPage page = new DomainPage(driver);
-// String errorMsg = "The domain should have a defined signature CertAlias.";
soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
int index = page.grid().scrollToSmlDomain("");
if (index >= 0) {
@@ -334,9 +333,6 @@ public class DomainPgTest extends BaseTest {
page.grid().scrollRow(index);
}
int rowNumber = index + 1;
- page.grid().mouseHoverOnDomainCode(rowNumber);
-// WebElement text = driver.findElement(By.xpath("//*[text()='The domain should have a defined signature CertAlias.']"));
-// soft.assertEquals(text.getText(),errorMsg, "the message 'The domain should have a defined signature CertAlias.' is not displayed");
soft.assertAll();
}
@@ -344,7 +340,6 @@ public class DomainPgTest extends BaseTest {
public void onlyDomainCodeAndSMLDomainSavingMsgVerify() {
SoftAssert soft = new SoftAssert();
DomainPage page = new DomainPage(driver);
-// String errorMsg = "The domain should have a defined signature CertAlias.";
soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
String rndString = Generator.randomAlphaNumeric(10);
DomainPopup popup = page.clickNew();
@@ -364,8 +359,6 @@ public class DomainPgTest extends BaseTest {
}
int rowNumber = index + 1;
page.grid().mouseHoverOnDomainCode(rowNumber);
-// WebElement text = driver.findElement(By.xpath("//*[text()='The domain should have a defined signature CertAlias.']"));
-// soft.assertEquals(text.getText(),errorMsg, "the message 'The domain should have a defined signature CertAlias.' is not displayed");
soft.assertAll();
}
@@ -380,8 +373,6 @@ public class DomainPgTest extends BaseTest {
KeyStoreImportDialog keyStoreImport = keyStoreEdit.clickImportKeystore();
keyStoreImport.chooseKeystoreFile();
Assert.assertEquals(keyStoreImport.getKeyStoreFileName(),"keystore_dummy1.jks","the keystore file name is not correct");
- //String keyStoreFileNameWithExt = keyStoreImport.getKeyStoreFileName();
- // String keyStoreFileName = keyStoreFileNameWithExt.substring(0,keyStoreFileNameWithExt.lastIndexOf("."));
keyStoreImport.fillPassword(pass);
keyStoreImport.clickImportBtn();
keyStoreEdit.clickCloseInKeystore();
@@ -389,7 +380,6 @@ public class DomainPgTest extends BaseTest {
keyStoreEdit = page.clickEditKeyStore();
int keyStoreRowAfterAddition = keyStoreEdit.grid().getRowsNo();
soft.assertEquals(keyStoreRowAfterAddition,keyStoreRowBeforeAddition+1, "KeyStore is not added to the grid");
-// soft.assertTrue(keyStoreEdit.grid().isKeyStoreCreated(keyStoreRowAfterAddition-1, keyStoreFileName),keyStoreFileName +" is not present in keystore grid");
if(keyStoreRowAfterAddition > 1){
keyStoreEdit.grid().deleteKeyStore(keyStoreRowAfterAddition-1).confirm();
int keyStoreRowAfterDeletion = keyStoreEdit.grid().getRowsNo();
@@ -411,8 +401,6 @@ public class DomainPgTest extends BaseTest {
KeyStoreImportDialog keyStoreImport = keyStoreEdit.clickImportKeystore();
keyStoreImport.chooseKeystoreFile();
Assert.assertEquals(keyStoreImport.getKeyStoreFileName(),"keystore_dummy1.jks","the keystore file name is not correct");
- //String keyStoreFileNameWithExt = keyStoreImport.getKeyStoreFileName();
- //String keyStoreFileName = keyStoreFileNameWithExt.substring(0,keyStoreFileNameWithExt.lastIndexOf("."));
keyStoreImport.fillPassword(pass);
keyStoreImport.clickImportBtn();
keyStoreEdit.clickCloseInKeystore();
@@ -424,8 +412,6 @@ public class DomainPgTest extends BaseTest {
keyStoreImport = keyStoreEdit.clickImportKeystore();
keyStoreImport.chooseKeystoreFile();
Assert.assertEquals(keyStoreImport.getKeyStoreFileName(),"keystore_dummy1.jks","the keystore file name is not correct");
- //String keyStoreFileNameWithExt = keyStoreImport.getKeyStoreFileName();
- //String keyStoreFileName = keyStoreFileNameWithExt.substring(0,keyStoreFileNameWithExt.lastIndexOf("."));
keyStoreImport.fillPassword(pass);
keyStoreImport.clickImportBtn();
keyStoreEdit.clickCloseInKeystore();
--
GitLab