diff --git a/smp-ui-tests/src/main/java/pages/domain/DomainGrid.java b/smp-ui-tests/src/main/java/pages/domain/DomainGrid.java
index fc63608506863e635c35ecaacf33a3ef1da5edd8..ba6cd51785ad71e00c9a8c17b3c5a19e20bf82a6 100644
--- a/smp-ui-tests/src/main/java/pages/domain/DomainGrid.java
+++ b/smp-ui-tests/src/main/java/pages/domain/DomainGrid.java
@@ -10,120 +10,119 @@ import java.util.ArrayList;
import java.util.List;
public class DomainGrid extends BasicGrid {
- public DomainGrid(WebDriver driver, WebElement container) {
- super(driver, container);
- }
-
- private By cellSelector = By.tagName("datatable-body-cell");
-
- public List<DomainRow> getRowsInfo() {
- log.info("getting all row info");
- List<DomainRow> rowInfos = new ArrayList<>();
-
- for (WebElement gridRow : gridRows) {
- List<WebElement> cells = gridRow.findElements(cellSelector);
-
- DomainRow row = new DomainRow();
-
- for (int i = 0; i < headerTxt.size(); i++) {
- switch (headerTxt.get(i)) {
- case "Domain code":
- row.setDomainCode(cells.get(i).getText().trim());
- break;
- case "SML Domain":
- row.setSmlDomain(cells.get(i).getText().trim());
- break;
- case "Signature CertAlias":
- row.setSignatureCertAlias(cells.get(i).getText().trim());
- break;
- case "SML SMP Id":
- row.setSmlSmpID(cells.get(i).getText().trim());
- break;
- }
-
- }
-
- rowInfos.add(row);
- }
-
- return rowInfos;
- }
-
- public void mouseHoverOnDomainCode(int rowNumber) {
- WebElement element = driver.findElement(By.cssSelector(".datatable-row-wrapper:nth-child(" + rowNumber + ") .datatable-body-cell:nth-child(1) .datatable-body-cell-label span"));
- Actions action = new Actions(driver);
- action.moveToElement(element).build().perform();
- }
-
- public boolean isDomainStillPresent(String domainCode) {
- boolean end = false;
- List<DomainRow> rows = new ArrayList<>();
- DomainPage page = new DomainPage(driver);
- page.pagination.skipToFirstPage();
-
- while (!end) {
- rows.addAll(page.grid().getRowsInfo());
- if (page.pagination.hasNextPage()) {
- page.pagination.goToNextPage();
- } else {
- end = true;
- }
- }
-
- boolean found = false;
- for (DomainRow row : rows) {
- if (row.getDomainCode().equalsIgnoreCase(domainCode)) {
- found = true;
- }
- }
- return found;
- }
-
- public int scrollToDomain(String domainCode) {
- DomainPage page = new DomainPage(driver);
- page.pagination.skipToFirstPage();
-
- boolean end = false;
- while (!end) {
- List<DomainRow> rows = page.grid().getRowsInfo();
- for (int i = 0; i < rows.size(); i++) {
- if (rows.get(i).getDomainCode().equalsIgnoreCase(domainCode)) {
- return i;
- }
- }
-
- if (page.pagination.hasNextPage()) {
- page.pagination.goToNextPage();
- } else {
- end = true;
- }
- }
-
- return -1;
- }
-
- public int scrollToSmlDomain(String smlDomain) {
- try {
- DomainPage page = new DomainPage(driver);
- List<DomainRow> rows;
- int count = 0;
- do {
- if (count != 0) {
- page.pagination.goToNextPage();
- }
- rows = page.grid().getRowsInfo();
- for (int i = 0; i < rows.size(); i++) {
- if (rows.get(i).getSmlDomain().equalsIgnoreCase(smlDomain)) {
- return i;
- }
- }
- count++;
- }
- while (page.pagination.hasNextPage());
- } catch (Exception e) {
- e.printStackTrace();
- }
- return -1;
- }
-
-}
\ No newline at end of file
+ public DomainGrid(WebDriver driver, WebElement container) {
+ super(driver, container);
+ }
+
+ private By cellSelector = By.tagName("datatable-body-cell");
+
+ public List<DomainRow> getRowsInfo(){
+ log.info("getting all row info");
+ List<DomainRow> rowInfos = new ArrayList<>();
+
+ for (WebElement gridRow : gridRows) {
+ List<WebElement> cells = gridRow.findElements(cellSelector);
+
+ DomainRow row = new DomainRow();
+
+ for (int i = 0; i < headerTxt.size(); i++) {
+ switch (headerTxt.get(i)){
+ case "Domain code":
+ row.setDomainCode(cells.get(i).getText().trim());
+ break;
+ case "SML Domain":
+ row.setSmlDomain(cells.get(i).getText().trim());
+ break;
+ case "Signature CertAlias":
+ row.setSignatureCertAlias(cells.get(i).getText().trim());
+ break;
+ case "SML SMP Id":
+ row.setSmlSmpID(cells.get(i).getText().trim());
+ break;
+ }
+
+ }
+
+ rowInfos.add(row);
+ }
+
+ return rowInfos;
+ }
+
+ public void mouseHoverOnDomainCode(int rowNumber) {
+ WebElement element = driver.findElement(By.cssSelector(".datatable-row-wrapper:nth-child(" + rowNumber + ") .datatable-body-cell:nth-child(1) .datatable-body-cell-label span"));
+ Actions action = new Actions(driver);
+ action.moveToElement(element).build().perform();
+ }
+
+ public boolean isDomainStillPresent(String domainCode) {
+ boolean end = false;
+ List<DomainRow> rows = new ArrayList<>();
+ DomainPage page = new DomainPage(driver);
+ page.pagination.skipToFirstPage();
+
+ while (!end) {
+ rows.addAll(page.grid().getRowsInfo());
+ if (page.pagination.hasNextPage()) {
+ page.pagination.goToNextPage();
+ } else {
+ end = true;
+ }
+ }
+
+ boolean found = false;
+ for (DomainRow row : rows) {
+ if (row.getDomainCode().equalsIgnoreCase(domainCode)) {
+ found = true;
+ }
+ }
+ return found;
+ }
+
+ public int scrollToDomain(String domainCode) {
+ DomainPage page = new DomainPage(driver);
+ page.pagination.skipToFirstPage();
+
+ boolean end = false;
+ while (!end) {
+ List<DomainRow> rows = page.grid().getRowsInfo();
+ for (int i = 0; i < rows.size(); i++) {
+ if (rows.get(i).getDomainCode().equalsIgnoreCase(domainCode)) {
+ return i;
+ }
+ }
+
+ if (page.pagination.hasNextPage()) {
+ page.pagination.goToNextPage();
+ } else {
+ end = true;
+ }
+ }
+
+ return -1;
+ }
+
+ public int scrollToSmlDomain(String smlDomain) {
+ try {
+ DomainPage page = new DomainPage(driver);
+ List<DomainRow> rows;
+ int count = 0;
+ do {
+ if (count != 0) {
+ page.pagination.goToNextPage();
+ }
+ rows = page.grid().getRowsInfo();
+ for (int i = 0; i < rows.size(); i++) {
+ if (rows.get(i).getSmlDomain().equalsIgnoreCase(smlDomain)) {
+ return i;
+ }
+ }
+ count++;
+ }
+ while (page.pagination.hasNextPage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return -1;
+ }
+}
diff --git a/smp-ui-tests/src/main/java/pages/users/UserPopup.java b/smp-ui-tests/src/main/java/pages/users/UserPopup.java
index 09320bb7a515a43503b9fd472af4cbd2bf8b4fc8..4f0d27d3e28b298e98d599eb9fef7f7ca2f6a28c 100644
--- a/smp-ui-tests/src/main/java/pages/users/UserPopup.java
+++ b/smp-ui-tests/src/main/java/pages/users/UserPopup.java
@@ -50,9 +50,6 @@ public class UserPopup extends PageComponent {
@FindBy(css = "mat-dialog-content > table > tbody > tr > td > button:nth-child(2)")
WebElement cancelBtn;
- @FindBy(css = ".mat-form-field-infix > div.has-error")
- WebElement passwordUnmatchingMsg;
-
@FindBy(css = "#role_id")
WebElement rolesSelectContainer;
public GenericSelect rolesSelect;
diff --git a/smp-ui-tests/src/main/java/pages/users/UsersPage.java b/smp-ui-tests/src/main/java/pages/users/UsersPage.java
index ad92dc2692a278d8ea4fc68a7fd70e28a09d09d8..5db580b6aaec13886a930f8724307e1ae60968ea 100644
--- a/smp-ui-tests/src/main/java/pages/users/UsersPage.java
+++ b/smp-ui-tests/src/main/java/pages/users/UsersPage.java
@@ -42,7 +42,6 @@ public class UsersPage extends SMPPage {
@FindBy(id = "deleteButton")
private WebElement deleteBtn;
-
public boolean isLoaded(){
@@ -129,7 +128,7 @@ public class UsersPage extends SMPPage {
}
}
-
+
diff --git a/smp-ui-tests/src/test/java/ui/DomainPgTest.java b/smp-ui-tests/src/test/java/ui/DomainPgTest.java
index 3b81fc70005d70ad60d19f47f8b3b49dd3db2628..ec90e010a82b8affdca4629fbf119bd4dca727f7 100644
--- a/smp-ui-tests/src/test/java/ui/DomainPgTest.java
+++ b/smp-ui-tests/src/test/java/ui/DomainPgTest.java
@@ -20,211 +20,211 @@ import java.util.Arrays;
import java.util.List;
public class DomainPgTest extends BaseTest {
+
+ @AfterMethod
+ public void logoutAndReset(){
+ genericLogoutProcedure();
+ }
- @AfterMethod
- public void logoutAndReset() {
- genericLogoutProcedure();
- }
-
+
+ @BeforeMethod
+ public void loginAndGoToDomainPage(){
+
+ SMPPage page = genericLoginProcedure("SYS_ADMIN");
- @BeforeMethod
- public void loginAndGoToDomainPage() {
+ logger.info("Going to Domain page");
+ page.sidebar.goToPage(DomainPage.class);
+ }
+
+ @Test(description = "DMN-0")
+ public void openDomainPage(){
+ SoftAssert soft = new SoftAssert();
+ DomainPage page = new DomainPage(driver);
- SMPPage page = genericLoginProcedure("SYS_ADMIN");
+ soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
+ DomainGrid grid = page.grid();
+ DomainRow row0 = grid.getRowsInfo().get(0);
+ grid.doubleClickRow(0);
+
+ DomainPopup popup = new DomainPopup(driver);
- logger.info("Going to Domain page");
- page.sidebar.goToPage(DomainPage.class);
- }
+ soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
- @Test(description = "DMN-0")
- public void openDomainPage() {
- SoftAssert soft = new SoftAssert();
- DomainPage page = new DomainPage(driver);
+ soft.assertTrue(!popup.isDomainCodeInputEnabled(), "On double click Domain Code input is disabled");
+ soft.assertTrue(!popup.isSMLDomainInputEnabled(), "On double click SML Domain input is disabled");
- soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
- DomainGrid grid = page.grid();
- DomainRow row0 = grid.getRowsInfo().get(0);
- grid.doubleClickRow(0);
+ popup.clickCancel();
+
+ soft.assertEquals(row0, page.grid().getRowsInfo().get(0), "Row is unchanged");
+ soft.assertTrue(!page.isSaveButtonEnabled(), "Save button is not enabled");
- DomainPopup popup = new DomainPopup(driver);
+ soft.assertAll();
+ }
- soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
+ @Test(description = "DMN-10")
+ public void editDomain(){
- soft.assertTrue(!popup.isDomainCodeInputEnabled(), "On double click Domain Code input is disabled");
- soft.assertTrue(!popup.isSMLDomainInputEnabled(), "On double click SML Domain input is disabled");
+ SoftAssert soft = new SoftAssert();
+ DomainPage page = new DomainPage(driver);
- popup.clickCancel();
+ soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
+ DomainGrid grid = page.grid();
+ DomainRow row0 = grid.getRowsInfo().get(0);
+ grid.doubleClickRow(0);
- soft.assertEquals(row0, page.grid().getRowsInfo().get(0), "Row is unchanged");
- soft.assertTrue(!page.isSaveButtonEnabled(), "Save button is not enabled");
+ DomainPopup popup = new DomainPopup(driver);
- soft.assertAll();
- }
-
- @Test(description = "DMN-10")
- public void editDomain() {
-
- SoftAssert soft = new SoftAssert();
- DomainPage page = new DomainPage(driver);
-
- soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
- DomainGrid grid = page.grid();
- DomainRow row0 = grid.getRowsInfo().get(0);
- grid.doubleClickRow(0);
-
- DomainPopup popup = new DomainPopup(driver);
-
- soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
+ soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
- soft.assertTrue(!popup.isDomainCodeInputEnabled(), "On double click Domain Code input is disabled");
- soft.assertTrue(!popup.isSMLDomainInputEnabled(), "On double click SML Domain input is disabled");
+ soft.assertTrue(!popup.isDomainCodeInputEnabled(), "On double click Domain Code input is disabled");
+ soft.assertTrue(!popup.isSMLDomainInputEnabled(), "On double click SML Domain input is disabled");
- String rndString = Generator.randomAlphaNumeric(10);
- popup.fillSMLSMPIdInput(rndString);
- popup.clickCancel();
+ String rndString = Generator.randomAlphaNumeric(10);
+ popup.fillSMLSMPIdInput(rndString);
+ popup.clickCancel();
- soft.assertEquals(row0, page.grid().getRowsInfo().get(0), "Row 0 is not changed");
+ soft.assertEquals(row0, page.grid().getRowsInfo().get(0), "Row 0 is not changed");
- page.grid().doubleClickRow(0);
- popup = new DomainPopup(driver);
- popup.fillSMLSMPIdInput(rndString);
- popup.clickOK();
+ page.grid().doubleClickRow(0);
+ popup = new DomainPopup(driver);
+ popup.fillSMLSMPIdInput(rndString);
+ popup.clickOK();
- soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
- soft.assertNotEquals(row0, page.grid().getRowsInfo().get(0), "Row 0 is changed");
+ soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
+ soft.assertNotEquals(row0, page.grid().getRowsInfo().get(0), "Row 0 is changed");
- page.clickSave().confirm();
+ page.clickSave().confirm();
- DomainRow newRow0 = page.grid().getRowsInfo().get(0);
- soft.assertNotEquals(row0, newRow0, "Row 0 is changed after save");
- soft.assertEquals(newRow0.getSmlSmpID(), rndString, "SML SMP ID is changed to the desired string");
+ DomainRow newRow0 = page.grid().getRowsInfo().get(0);
+ soft.assertNotEquals(row0, newRow0, "Row 0 is changed after save");
+ soft.assertEquals(newRow0.getSmlSmpID(), rndString, "SML SMP ID is changed to the desired string");
- soft.assertEquals(page.alertArea.getAlertMessage().getMessage(), SMPMessages.MSG_18, "Proper message displayed");
+ soft.assertEquals(page.alertArea.getAlertMessage().getMessage(), SMPMessages.MSG_18, "Proper message displayed");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "DMN-20")
- public void newDomain() {
- SoftAssert soft = new SoftAssert();
- DomainPage page = new DomainPage(driver);
+ @Test(description = "DMN-20")
+ public void newDomain(){
+ SoftAssert soft = new SoftAssert();
+ DomainPage page = new DomainPage(driver);
- soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
+ soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
- DomainPopup popup = page.clickNew();
- soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
+ DomainPopup popup = page.clickNew();
+ soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
- soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
- soft.assertTrue(popup.isSMLDomainInputEnabled(), "When defining new domain -SML Domain input is disabled");
+ soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
+ soft.assertTrue(popup.isSMLDomainInputEnabled(), "When defining new domain -SML Domain input is disabled");
- String rndString = Generator.randomAlphaNumeric(10);
+ String rndString = Generator.randomAlphaNumeric(10);
- popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
- popup.clickCancel();
+ popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
+ popup.clickCancel();
- soft.assertTrue(!page.isSaveButtonEnabled(), "Save button is NOT enabled");
+ soft.assertTrue(!page.isSaveButtonEnabled(), "Save button is NOT enabled");
- popup = page.clickNew();
- popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
- popup.clickOK();
+ popup = page.clickNew();
+ popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
+ popup.clickOK();
- soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
+ soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
- page.clickSave().confirm();
+ page.clickSave().confirm();
- soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18),
- "Success message is as expected");
+ soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18),
+ "Success message is as expected");
- List<DomainRow> rows = page.grid().getRowsInfo();
- while (page.pagination.hasNextPage()) {
- page.pagination.goToNextPage();
- rows.addAll(page.grid().getRowsInfo());
- }
+ List<DomainRow> rows = page.grid().getRowsInfo();
+ while (page.pagination.hasNextPage()){
+ page.pagination.goToNextPage();
+ rows.addAll(page.grid().getRowsInfo());
+ }
- boolean found = false;
- for (DomainRow row : rows) {
- if (row.getDomainCode().equalsIgnoreCase(rndString)) {
- found = true;
- break;
- }
- }
+ boolean found = false;
+ for (DomainRow row : rows) {
+ if(row.getDomainCode().equalsIgnoreCase(rndString)){
+ found = true;
+ break;
+ }
+ }
- soft.assertTrue(found, "Found new domain in the list of domains");
+ soft.assertTrue(found, "Found new domain in the list of domains");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "DMN-30")
- public void cancelNewDomainCreation() {
- SoftAssert soft = new SoftAssert();
- DomainPage page = new DomainPage(driver);
+ @Test(description = "DMN-30")
+ public void cancelNewDomainCreation(){
+ SoftAssert soft = new SoftAssert();
+ DomainPage page = new DomainPage(driver);
- soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
+ soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
- DomainPopup popup = page.clickNew();
- soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
+ DomainPopup popup = page.clickNew();
+ soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
- soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
- soft.assertTrue(popup.isSMLDomainInputEnabled(), "When defining new domain -SML Domain input is disabled");
+ soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
+ soft.assertTrue(popup.isSMLDomainInputEnabled(), "When defining new domain -SML Domain input is disabled");
- String rndString = Generator.randomAlphaNumeric(10);
+ String rndString = Generator.randomAlphaNumeric(10);
- popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
- popup.clickOK();
+ popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
+ popup.clickOK();
- soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
+ soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
- page.clickCancel().confirm();
- new ConfirmationDialog(driver).confirm();
+ page.clickCancel().confirm();
+ new ConfirmationDialog(driver).confirm();
- List<DomainRow> rows = page.grid().getRowsInfo();
- while (page.pagination.hasNextPage()) {
- page.pagination.goToNextPage();
- rows.addAll(page.grid().getRowsInfo());
- }
+ List<DomainRow> rows = page.grid().getRowsInfo();
+ while (page.pagination.hasNextPage()){
+ page.pagination.goToNextPage();
+ rows.addAll(page.grid().getRowsInfo());
+ }
- boolean found = false;
- for (DomainRow row : rows) {
- if (row.getDomainCode().equalsIgnoreCase(rndString)) {
- found = true;
- break;
- }
- }
+ boolean found = false;
+ for (DomainRow row : rows) {
+ if(row.getDomainCode().equalsIgnoreCase(rndString)){
+ found = true;
+ break;
+ }
+ }
- soft.assertTrue(!found, "New domain NOT in the list of domains");
+ soft.assertTrue(!found, "New domain NOT in the list of domains");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "DMN-40")
- public void deleteDomain() {
- String rndStr = Generator.randomAlphaNumeric(10);
- SMPRestClient.createDomain(rndStr);
+ @Test(description = "DMN-40")
+ public void deleteDomain(){
+ String rndStr = Generator.randomAlphaNumeric(10);
+ SMPRestClient.createDomain(rndStr);
- SoftAssert soft = new SoftAssert();
- DomainPage page = new DomainPage(driver);
+ SoftAssert soft = new SoftAssert();
+ DomainPage page = new DomainPage(driver);
- page.refreshPage();
+ page.refreshPage();
- soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
+ soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
int index = page.grid().scrollToDomain(rndStr);
- page.grid().selectRow(index);
+ page.grid().selectRow(index);
- soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row selected");
+ soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row selected");
- page.clickDelete();
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled (2)");
- soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled");
- soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
+ page.clickDelete();
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled (2)");
+ soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled");
+ soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
- page.clickCancel().confirm();
- new ConfirmationDialog(driver).confirm();
+ page.clickCancel().confirm();
+ new ConfirmationDialog(driver).confirm();
soft.assertTrue(page.grid().isDomainStillPresent(rndStr), "Row is still present");
@@ -236,40 +236,40 @@ public class DomainPgTest extends BaseTest {
soft.assertTrue(!page.grid().isDomainStillPresent(rndStr), "Row is still NOT present after delete");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "DMN-50")
- public void deleteDomainWithSG() {
+ @Test(description = "DMN-50")
+ public void deleteDomainWithSG(){
- String domainName = Generator.randomAlphaNumeric(10);
- String pi = Generator.randomAlphaNumeric(10);
- String ps = Generator.randomAlphaNumeric(10);
+ String domainName = Generator.randomAlphaNumeric(10);
+ String pi = Generator.randomAlphaNumeric(10);
+ String ps = Generator.randomAlphaNumeric(10);
- String expectedErrorMess = String.format("Delete validation error Could not delete domains used by Service groups! Domain: %s (%s ) uses by:1 SG.", domainName, domainName);
+ String expectedErrorMess = String.format("Delete validation error Could not delete domains used by Service groups! Domain: %s (%s ) uses by:1 SG.", domainName, domainName);
- SMPRestClient.createDomain(domainName);
- SMPRestClient.createServiceGroup(pi, ps, new ArrayList<>(Arrays.asList("smp")), new ArrayList<>(Arrays.asList(domainName)));
+ SMPRestClient.createDomain(domainName);
+ SMPRestClient.createServiceGroup(pi, ps, new ArrayList<>(Arrays.asList("smp")),new ArrayList<>(Arrays.asList(domainName)));
- SoftAssert soft = new SoftAssert();
+ SoftAssert soft = new SoftAssert();
- DomainPage page = new DomainPage(driver);
- page.refreshPage();
+ DomainPage page = new DomainPage(driver);
+ page.refreshPage();
int index = page.grid().scrollToDomain(domainName);
page.grid().selectRow(index);
soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
- page.clickDelete();
- AlertMessage message = page.alertArea.getAlertMessage();
- soft.assertTrue(message.isError(), "Page shows error message when deleting domain with SG");
- soft.assertTrue(message.getMessage().equalsIgnoreCase(expectedErrorMess), "Desired message appears");
+ page.clickDelete();
+ AlertMessage message = page.alertArea.getAlertMessage();
+ soft.assertTrue(message.isError(), "Page shows error message when deleting domain with SG");
+ soft.assertTrue(message.getMessage().equalsIgnoreCase(expectedErrorMess), "Desired message appears");
- SMPRestClient.deleteSG(pi);
- SMPRestClient.deleteDomain(domainName);
+ SMPRestClient.deleteSG(pi);
+ SMPRestClient.deleteDomain(domainName);
- soft.assertAll();
- }
+ soft.assertAll();
+ }
@Test(description = "DMN-60")
public void duplicateDomainCreation() {
diff --git a/smp-ui-tests/src/test/java/ui/UsersPgTest.java b/smp-ui-tests/src/test/java/ui/UsersPgTest.java
index e7a1ee177d7bb500fd2dceeba2cbd77d5e013763..a4e73ed755c681b93c0c5bf33a88bb23917a2f1e 100644
--- a/smp-ui-tests/src/test/java/ui/UsersPgTest.java
+++ b/smp-ui-tests/src/test/java/ui/UsersPgTest.java
@@ -22,166 +22,166 @@ import java.util.List;
public class UsersPgTest extends BaseTest {
- @AfterMethod
- public void logoutAndReset() {
- genericLogoutProcedure();
- }
+ @AfterMethod
+ public void logoutAndReset() {
+ genericLogoutProcedure();
+ }
- @BeforeMethod
- public void loginAndGoToUsersPage() {
+ @BeforeMethod
+ public void loginAndGoToUsersPage() {
- SMPPage page = genericLoginProcedure("SYS_ADMIN");
+ SMPPage page = genericLoginProcedure("SYS_ADMIN");
- logger.info("Going to Users page");
- page.sidebar.goToPage(UsersPage.class);
- }
+ logger.info("Going to Users page");
+ page.sidebar.goToPage(UsersPage.class);
+ }
- @Test(description = "USR-10")
- public void newUser() {
- String username = Generator.randomAlphaNumeric(10);
- String validPass = "QW!@qw12";
+ @Test(description = "USR-10")
+ public void newUser() {
+ String username = Generator.randomAlphaNumeric(10);
+ String validPass = "QW!@qw12";
- SoftAssert soft = new SoftAssert();
+ SoftAssert soft = new SoftAssert();
- UsersPage usersPage = new UsersPage(driver);
+ UsersPage usersPage = new UsersPage(driver);
- soft.assertTrue(usersPage.isNewButtonEnabled(), "New button should be enabled");
+// soft.assertTrue(usersPage.isNewButtonEnabled(), "New button should be enabled");
- UserPopup popup = usersPage.clickNew();
- soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
+ UserPopup popup = usersPage.clickNew();
+ soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
- popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
+ popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
- popup.clickUserDetailsToggle();
+ popup.clickUserDetailsToggle();
- popup.fillDetailsForm(username, validPass, validPass);
- popup.clickOK();
+ popup.fillDetailsForm(username, validPass, validPass);
+ popup.clickOK();
- soft.assertTrue(usersPage.isSaveButtonEnabled(), "Save button is enabled");
- soft.assertTrue(usersPage.isCancelButtonEnabled(), "Cancel button is enabled");
+ soft.assertTrue(usersPage.isSaveButtonEnabled(), "Save button is enabled");
+ soft.assertTrue(usersPage.isCancelButtonEnabled(), "Cancel button is enabled");
- usersPage.clickSave().confirm();
+ usersPage.clickSave().confirm();
- soft.assertTrue(!usersPage.alertArea.getAlertMessage().isError(), "Message listed is success");
- soft.assertTrue(usersPage.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message listed is as expected");
+ soft.assertTrue(!usersPage.alertArea.getAlertMessage().isError(), "Message listed is success");
+ soft.assertTrue(usersPage.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message listed is as expected");
soft.assertTrue(usersPage.grid().isUserListed(username), "User present in the page");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "USR-20")
- public void usernameValidation() {
- String username = Generator.randomAlphaNumeric(10);
- String validPass = "QW!@qw12";
+ @Test(description = "USR-20")
+ public void usernameValidation() {
+ String username = Generator.randomAlphaNumeric(10);
+ String validPass = "QW!@qw12";
- SoftAssert soft = new SoftAssert();
+ SoftAssert soft = new SoftAssert();
- UsersPage usersPage = new UsersPage(driver);
- UserPopup popup = usersPage.clickNew();
- soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
+ UsersPage usersPage = new UsersPage(driver);
+ UserPopup popup = usersPage.clickNew();
+ soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
- popup.rolesSelect.selectOptionWithText("SMP_ADMIN");
+ popup.rolesSelect.selectOptionWithText("SMP_ADMIN");
- popup.clickUserDetailsToggle();
+ popup.clickUserDetailsToggle();
- popup.fillDetailsForm("tst", validPass, validPass);
- soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup(2)");
- soft.assertEquals(popup.getUsernameValidationError(), SMPMessages.USERNAME_VALIDATION_MESSAGE, "Validation error message is displayed(2)");
- popup.fillDetailsForm("#$^&*^%&$#@%@$#%$", validPass, validPass);
- soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup(3)");
- soft.assertEquals(popup.getUsernameValidationError(), SMPMessages.USERNAME_VALIDATION_MESSAGE, "Validation error message is displayed(3)");
- //noinspection SpellCheckingInspection
- popup.fillDetailsForm("QWERQWERQWERQWERQWERQWERQWERQWE33", validPass, validPass);
- soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup(4)");
- soft.assertEquals(popup.getUsernameValidationError(), SMPMessages.USERNAME_VALIDATION_MESSAGE, "Validation error message is displayed(4)");
+ popup.fillDetailsForm("tst", validPass, validPass);
+ soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup(2)");
+ soft.assertEquals(popup.getUsernameValidationError(), SMPMessages.USERNAME_VALIDATION_MESSAGE, "Validation error message is displayed(2)");
+ popup.fillDetailsForm("#$^&*^%&$#@%@$#%$", validPass, validPass);
+ soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup(3)");
+ soft.assertEquals(popup.getUsernameValidationError(), SMPMessages.USERNAME_VALIDATION_MESSAGE, "Validation error message is displayed(3)");
+ //noinspection SpellCheckingInspection
+ popup.fillDetailsForm("QWERQWERQWERQWERQWERQWERQWERQWE33", validPass, validPass);
+ soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup(4)");
+ soft.assertEquals(popup.getUsernameValidationError(), SMPMessages.USERNAME_VALIDATION_MESSAGE, "Validation error message is displayed(4)");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @SuppressWarnings("SpellCheckingInspection")
- @Test(description = "USR-30")
- public void passwordValidation() {
+ @SuppressWarnings("SpellCheckingInspection")
+ @Test(description = "USR-30")
+ public void passwordValidation() {
- ArrayList<String> passToValidate = new ArrayList<>(Arrays.asList("qwqw",
- "QWERQWERQWERQWERQWERQWERQWERQWE33",
+ ArrayList<String> passToValidate = new ArrayList<>(Arrays.asList("qwqw",
+ "QWERQWERQWERQWERQWERQWERQWERQWE33",
// "QWERTYUIOP",
// "qwertyuiop",
// "321654987",
// "~!@#$%^&*()_",
// "~1Aa#",
- "~1a#2d2dds"));
+ "~1a#2d2dds"));
- SoftAssert soft = new SoftAssert();
+ SoftAssert soft = new SoftAssert();
- UsersPage usersPage = new UsersPage(driver);
+ UsersPage usersPage = new UsersPage(driver);
- for (String pass : passToValidate) {
+ for (String pass : passToValidate) {
// usersPage.refreshPage();
- usersPage.clickVoidSpace();
+ usersPage.clickVoidSpace();
- UserPopup popup = usersPage.clickNew();
- popup.rolesSelect.selectOptionWithText("SMP_ADMIN");
- popup.clickUserDetailsToggle();
+ UserPopup popup = usersPage.clickNew();
+ popup.rolesSelect.selectOptionWithText("SMP_ADMIN");
+ popup.clickUserDetailsToggle();
- popup.fillDetailsForm("test11", pass, pass);
- soft.assertTrue(!popup.isOKButtonActive(), String.format("OK button should be disabled until valid data is filled in the popup - %s ", pass));
- soft.assertEquals(popup.getPassValidationError(), SMPMessages.PASS_POLICY_MESSAGE, String.format("Pass policy message is displayed - %s", pass));
- }
+ popup.fillDetailsForm("test11", pass, pass);
+ soft.assertTrue(!popup.isOKButtonActive(), String.format("OK button should be disabled until valid data is filled in the popup - %s ", pass));
+ soft.assertEquals(popup.getPassValidationError(), SMPMessages.PASS_POLICY_MESSAGE, String.format("Pass policy message is displayed - %s", pass));
+ }
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "USR-40")
- public void listedRoles() {
+ @Test(description = "USR-40")
+ public void listedRoles() {
- ArrayList<String> expectedRoleValues = new ArrayList<>(Arrays.asList("SYSTEM_ADMIN", "SMP_ADMIN", "SERVICE_GROUP_ADMIN"));
+ ArrayList<String> expectedRoleValues = new ArrayList<>(Arrays.asList("SYSTEM_ADMIN", "SMP_ADMIN", "SERVICE_GROUP_ADMIN"));
- SoftAssert soft = new SoftAssert();
+ SoftAssert soft = new SoftAssert();
- UsersPage usersPage = new UsersPage(driver);
- UserPopup popup = usersPage.clickNew();
- List<String> listedRoles = popup.rolesSelect.getOptionTexts();
+ UsersPage usersPage = new UsersPage(driver);
+ UserPopup popup = usersPage.clickNew();
+ List<String> listedRoles = popup.rolesSelect.getOptionTexts();
- soft.assertTrue(expectedRoleValues.size() == listedRoles.size(), "Number of roles is the same as expected");
+ soft.assertTrue(expectedRoleValues.size() == listedRoles.size(), "Number of roles is the same as expected");
- for (String expected : expectedRoleValues) {
- boolean found = false;
- for (String listedRole : listedRoles) {
- if (listedRole.equalsIgnoreCase(expected)) {
- found = true;
- }
- }
- soft.assertTrue(found, "Role found in page " + expected);
- }
+ for (String expected : expectedRoleValues) {
+ boolean found = false;
+ for (String listedRole : listedRoles) {
+ if (listedRole.equalsIgnoreCase(expected)) {
+ found = true;
+ }
+ }
+ soft.assertTrue(found, "Role found in page " + expected);
+ }
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "USR-50")
- public void deleteSYS_ADMIN() {
+ @Test(description = "USR-50")
+ public void deleteSYS_ADMIN() {
- String username = Generator.randomAlphaNumeric(10);
- SMPRestClient.createUser(username, "SYSTEM_ADMIN");
- SoftAssert soft = new SoftAssert();
+ String username = Generator.randomAlphaNumeric(10);
+ SMPRestClient.createUser(username, "SYSTEM_ADMIN");
+ SoftAssert soft = new SoftAssert();
- log.info("created user " + username);
- UsersPage page = new UsersPage(driver);
- page.refreshPage();
+ log.info("created user " + username);
+ UsersPage page = new UsersPage(driver);
+ page.refreshPage();
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
int index = page.grid().scrollToUser(username);
page.grid().selectRow(index);
soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
- page.clickDelete();
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted");
- soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted");
- soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted");
+ page.clickDelete();
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted");
+ soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted");
+ soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted");
page.clickCancel().confirm();
new ConfirmationDialog(driver).confirm();
@@ -192,99 +192,99 @@ public class UsersPgTest extends BaseTest {
page.grid().selectRow(index);
soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select(2)");
- page.clickDelete();
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
- soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
- soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
+ page.clickDelete();
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
+ soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
+ soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
- page.clickSave().confirm();
+ page.clickSave().confirm();
soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message listed is as expected");
soft.assertTrue(!page.grid().isUserListed(username), "After saving deleted user is not listed");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "USR-60")
- public void changeRoleSYS_ADMIN() {
+ @Test(description = "USR-60")
+ public void changeRoleSYS_ADMIN() {
- SoftAssert soft = new SoftAssert();
+ SoftAssert soft = new SoftAssert();
UsersPage page = new UsersPage(driver);
int index = page.grid().scrollToUserWithRole("SYSTEM_ADMIN");
- page.grid().selectRow(index);
- UserPopup popup = page.clickEdit();
- List<String> options = popup.rolesSelect.getOptionTexts();
- soft.assertTrue(options.size() == 1, "Role dropdown has only one value");
- soft.assertTrue(options.get(0).equalsIgnoreCase("SYSTEM_ADMIN"), "Role dropdown has only one value and that is \"SYSTEM_ADMIN\"");
+ page.grid().selectRow(index);
+ UserPopup popup = page.clickEdit();
+ List<String> options = popup.rolesSelect.getOptionTexts();
+ soft.assertTrue(options.size() == 1, "Role dropdown has only one value");
+ soft.assertTrue(options.get(0).equalsIgnoreCase("SYSTEM_ADMIN"), "Role dropdown has only one value and that is \"SYSTEM_ADMIN\"");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "USR-70")
- public void changeRoleNON_SYS_ADMIN() {
+ @Test(description = "USR-70")
+ public void changeRoleNON_SYS_ADMIN() {
- SoftAssert soft = new SoftAssert();
+ SoftAssert soft = new SoftAssert();
UsersPage page = new UsersPage(driver);
int index = page.grid().scrollToUserWithRole("SMP_ADMIN");
- page.grid().selectRow(index);
- UserPopup popup = page.clickEdit();
+ page.grid().selectRow(index);
+ UserPopup popup = page.clickEdit();
- List<String> options = popup.rolesSelect.getOptionTexts();
- soft.assertTrue(options.size() == 2, "Role dropdown has only two values");
- soft.assertTrue(options.get(0).equalsIgnoreCase("SMP_ADMIN"), "Role dropdown has value \"SMP_ADMIN\"");
- soft.assertTrue(options.get(1).equalsIgnoreCase("SERVICE_GROUP_ADMIN"), "Role dropdown has value \"SERVICE_GROUP_ADMIN\"");
+ List<String> options = popup.rolesSelect.getOptionTexts();
+ soft.assertTrue(options.size() == 2, "Role dropdown has only two values");
+ soft.assertTrue(options.get(0).equalsIgnoreCase("SMP_ADMIN"), "Role dropdown has value \"SMP_ADMIN\"");
+ soft.assertTrue(options.get(1).equalsIgnoreCase("SERVICE_GROUP_ADMIN"), "Role dropdown has value \"SERVICE_GROUP_ADMIN\"");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "USR-80")
- public void deleteOWNUserRecord() {
+ @Test(description = "USR-80")
+ public void deleteOWNUserRecord() {
- String username = new TestDataProvider().getUserWithRole("SYS_ADMIN").get("username");
+ String username = new TestDataProvider().getUserWithRole("SYS_ADMIN").get("username");
- SoftAssert soft = new SoftAssert();
+ SoftAssert soft = new SoftAssert();
- UsersPage page = new UsersPage(driver);
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
+ UsersPage page = new UsersPage(driver);
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
int index = page.grid().scrollToUser(username);
page.grid().selectRow(index);
soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
- page.clickDelete();
- AlertMessage message = page.alertArea.getAlertMessage();
- soft.assertTrue(message.isError(), "Listed message is error");
- soft.assertTrue(message.getMessage().equalsIgnoreCase(SMPMessages.USER_OWN_DELETE_ERR), "Listed message has appropriate text");
+ page.clickDelete();
+ AlertMessage message = page.alertArea.getAlertMessage();
+ soft.assertTrue(message.isError(), "Listed message is error");
+ soft.assertTrue(message.getMessage().equalsIgnoreCase(SMPMessages.USER_OWN_DELETE_ERR), "Listed message has appropriate text");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "USR-90")
- public void deleteSMP_ADMIN() {
+ @Test(description = "USR-90")
+ public void deleteSMP_ADMIN() {
- String username = Generator.randomAlphaNumeric(10);
- SMPRestClient.createUser(username, "SMP_ADMIN");
- SoftAssert soft = new SoftAssert();
+ String username = Generator.randomAlphaNumeric(10);
+ SMPRestClient.createUser(username, "SMP_ADMIN");
+ SoftAssert soft = new SoftAssert();
- log.info("Created username " + username);
+ log.info("Created username " + username);
- UsersPage page = new UsersPage(driver);
- page.refreshPage();
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
+ UsersPage page = new UsersPage(driver);
+ page.refreshPage();
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
int index = page.grid().scrollToUser(username);
page.grid().selectRow(index);
soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
- page.clickDelete();
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted");
- soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted");
- soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted");
+ page.clickDelete();
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted");
+ soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted");
+ soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted");
page.clickCancel().confirm();
new ConfirmationDialog(driver).confirm();
@@ -295,44 +295,44 @@ public class UsersPgTest extends BaseTest {
page.grid().selectRow(index);
soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select(2)");
- page.clickDelete();
- page.waitForXMillis(200);
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
- soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
- soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
+ page.clickDelete();
+ page.waitForXMillis(200);
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
+ soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
+ soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
- page.clickSave().confirm();
+ page.clickSave().confirm();
soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message is as expected");
soft.assertTrue(!page.grid().isUserListed(username), "After saving deleted user is not listed");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "USR-100")
- public void deleteSERVICE_GROUP_ADMIN() {
+ @Test(description = "USR-100")
+ public void deleteSERVICE_GROUP_ADMIN() {
- String username = Generator.randomAlphaNumeric(10);
- SMPRestClient.createUser(username, "SERVICE_GROUP_ADMIN");
- log.info("Created username" + username);
- SoftAssert soft = new SoftAssert();
+ String username = Generator.randomAlphaNumeric(10);
+ SMPRestClient.createUser(username, "SERVICE_GROUP_ADMIN");
+ log.info("Created username" + username);
+ SoftAssert soft = new SoftAssert();
- UsersPage page = new UsersPage(driver);
- page.refreshPage();
- page.waitForRowsToLoad();
+ UsersPage page = new UsersPage(driver);
+ page.refreshPage();
+ page.waitForRowsToLoad();
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
int index =page.grid(). scrollToUser(username);
page.grid().selectRow(index);
soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
- page.clickDelete();
- page.waitForRowsToLoad();
+ page.clickDelete();
+ page.waitForRowsToLoad();
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted");
- soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted");
- soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted");
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted");
+ soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted");
+ soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted");
page.clickCancel().confirm();
new ConfirmationDialog(driver).confirm();
@@ -343,94 +343,94 @@ public class UsersPgTest extends BaseTest {
index = page.grid().scrollToUser(username);
page.grid().selectRow(index);
- soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select(2)");
+ soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select(2)");
- page.clickDelete();
- page.waitForRowsToLoad();
- soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
- soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
- soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
+ page.clickDelete();
+ page.waitForRowsToLoad();
+ soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
+ soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
+ soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
- page.clickSave().confirm();
+ page.clickSave().confirm();
soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message is as expected");
soft.assertTrue(!page.grid().isUserListed(username), "After saving deleted user is not listed");
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "USR-110")
- public void deleteSG_ADMINWithSG() {
+ @Test(description = "USR-110")
+ public void deleteSG_ADMINWithSG() {
- String username = Generator.randomAlphaNumeric(10);
- String pi = Generator.randomAlphaNumeric(10);
- String ps = Generator.randomAlphaNumeric(10);
+ String username = Generator.randomAlphaNumeric(10);
+ String pi = Generator.randomAlphaNumeric(10);
+ String ps = Generator.randomAlphaNumeric(10);
- String expectedErrorMess = String.format("Delete validation error Could not delete user with ownerships! User: %s owns SG count: 1.", username);
+ String expectedErrorMess = String.format("Delete validation error Could not delete user with ownerships! User: %s owns SG count: 1.", username);
- SMPRestClient.createUser(username, "SERVICE_GROUP_ADMIN");
- SMPRestClient.createServiceGroup(pi, ps,
- new ArrayList<>(Arrays.asList(username)),
- new ArrayList<>(Arrays.asList(createdDomains.get(0)))
- );
+ SMPRestClient.createUser(username, "SERVICE_GROUP_ADMIN");
+ SMPRestClient.createServiceGroup(pi, ps,
+ new ArrayList<>(Arrays.asList(username)),
+ new ArrayList<>(Arrays.asList(createdDomains.get(0)))
+ );
- log.info("Created username " + username);
- log.info("Created service group " + pi);
+ log.info("Created username " + username);
+ log.info("Created service group " + pi);
- SoftAssert soft = new SoftAssert();
+ SoftAssert soft = new SoftAssert();
- UsersPage page = new UsersPage(driver);
- page.refreshPage();
+ UsersPage page = new UsersPage(driver);
+ page.refreshPage();
int index = page.grid().scrollToUser(username);
page.grid().selectRow(index);
soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
- page.clickDelete();
- AlertMessage message = page.alertArea.getAlertMessage();
- soft.assertTrue(message.isError(), "Page shows error message when deleting user with SG");
- soft.assertTrue(message.getMessage().equalsIgnoreCase(expectedErrorMess), "Desired message appears");
+ page.clickDelete();
+ AlertMessage message = page.alertArea.getAlertMessage();
+ soft.assertTrue(message.isError(), "Page shows error message when deleting user with SG");
+ soft.assertTrue(message.getMessage().equalsIgnoreCase(expectedErrorMess), "Desired message appears");
- SMPRestClient.deleteSG(pi);
- SMPRestClient.deleteUser(username);
+ SMPRestClient.deleteSG(pi);
+ SMPRestClient.deleteUser(username);
- soft.assertAll();
- }
+ soft.assertAll();
+ }
- @Test(description = "USR-120")
- public void deleteSMP_ADMINWithSG() {
+ @Test(description = "USR-120")
+ public void deleteSMP_ADMINWithSG() {
- String username = Generator.randomAlphaNumeric(10);
- String pi = Generator.randomAlphaNumeric(10);
- String ps = Generator.randomAlphaNumeric(10);
+ String username = Generator.randomAlphaNumeric(10);
+ String pi = Generator.randomAlphaNumeric(10);
+ String ps = Generator.randomAlphaNumeric(10);
- String expectedErrorMess = String.format("Delete validation error Could not delete user with ownerships! User: %s owns SG count: 1.", username);
+ String expectedErrorMess = String.format("Delete validation error Could not delete user with ownerships! User: %s owns SG count: 1.", username);
- SMPRestClient.createUser(username, "SMP_ADMIN");
- SMPRestClient.createServiceGroup(pi, ps,
- new ArrayList<>(Arrays.asList(username)),
- new ArrayList<>(Arrays.asList(createdDomains.get(0)))
- );
+ SMPRestClient.createUser(username, "SMP_ADMIN");
+ SMPRestClient.createServiceGroup(pi, ps,
+ new ArrayList<>(Arrays.asList(username)),
+ new ArrayList<>(Arrays.asList(createdDomains.get(0)))
+ );
- log.info("Created username " + username);
+ log.info("Created username "+ username);
- SoftAssert soft = new SoftAssert();
+ SoftAssert soft = new SoftAssert();
- UsersPage page = new UsersPage(driver);
- page.refreshPage();
+ UsersPage page = new UsersPage(driver);
+ page.refreshPage();
int index = page.grid().scrollToUser(username);
page.grid().selectRow(index);
soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
- page.clickDelete();
- page.waitForXMillis(500);
- AlertMessage message = page.alertArea.getAlertMessage();
- soft.assertTrue(message.isError(), "Page shows error message when deleting user with SG");
- soft.assertTrue(message.getMessage().equalsIgnoreCase(expectedErrorMess), "Desired message appears");
+ page.clickDelete();
+ page.waitForXMillis(500);
+ AlertMessage message = page.alertArea.getAlertMessage();
+ soft.assertTrue(message.isError(), "Page shows error message when deleting user with SG");
+ soft.assertTrue(message.getMessage().equalsIgnoreCase(expectedErrorMess), "Desired message appears");
- SMPRestClient.deleteSG(pi);
- SMPRestClient.deleteUser(username);
+ SMPRestClient.deleteSG(pi);
+ SMPRestClient.deleteUser(username);
soft.assertAll();
}
@@ -487,8 +487,4 @@ public class UsersPgTest extends BaseTest {
soft.assertAll();
}
-
-
-
-
}