diff --git a/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentPage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentPage.java
index c01201a5d8c84be356fd93c0dffa98242a069ae0..f93b3e3e8d610ddbafa3695734fd19aec1b9304f 100644
--- a/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentPage.java
+++ b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentPage.java
@@ -15,7 +15,8 @@ import java.util.List;
*/
public class EditResourceDocumentPage extends DomiSMPPage {
private final static Logger LOG = LoggerFactory.getLogger(EditResourceDocumentPage.class);
-
+ @FindBy(id = "newVersion_id")
+ private WebElement newVersionBtn;
@FindBy(id = "GenerateResource_id")
private WebElement generateBtn;
@FindBy(id = "validateResource_id")
@@ -67,6 +68,9 @@ public class EditResourceDocumentPage extends DomiSMPPage {
return formatedDoc;
}
+ public void clickOnNewVersion() {
+ weToDButton(newVersionBtn).click();
+ }
public void clickOnGenerate() {
weToDButton(generateBtn).click();
}
diff --git a/domismp-tests/domismp-tests-ui/src/main/java/rest/BaseRestClient.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/BaseRestClient.java
index 26fec38e0f2ac13e6cef5a85204f89ec049e3bbf..464cff6410a868365d790db35197cc36b378a076 100644
--- a/domismp-tests/domismp-tests-ui/src/main/java/rest/BaseRestClient.java
+++ b/domismp-tests/domismp-tests-ui/src/main/java/rest/BaseRestClient.java
@@ -139,9 +139,9 @@ public class BaseRestClient {
if (response != 200) {
log.debug("Connected endpoint returns " + response);
-
+ return false;
}
- return (!(response == 401));
+ return true;
}
public void startSession() {
diff --git a/domismp-tests/domismp-tests-ui/src/main/java/rest/models/MemberModel.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/MemberModel.java
index 4fb44bc7ff1129639ed46f6de0544b9daad20da7..83e680fa8099942c55a9f0988b8d974e083b710b 100644
--- a/domismp-tests/domismp-tests-ui/src/main/java/rest/models/MemberModel.java
+++ b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/MemberModel.java
@@ -7,6 +7,16 @@ public class MemberModel {
private String memberId;
private String username;
+ public boolean isHasPermissionReview() {
+ return hasPermissionReview;
+ }
+
+ public void setHasPermissionReview(boolean hasPermissionReview) {
+ this.hasPermissionReview = hasPermissionReview;
+ }
+
+ private boolean hasPermissionReview = false;
+
public String getFullName() {
return fullName;
}
diff --git a/domismp-tests/domismp-tests-ui/src/main/java/rest/models/ResourceModel.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/ResourceModel.java
index 04084d33480e902ad5e9362ed3db542ec6dbbedc..55bb50647b8adcd1c6cba964f55dac8f342ce976 100644
--- a/domismp-tests/domismp-tests-ui/src/main/java/rest/models/ResourceModel.java
+++ b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/ResourceModel.java
@@ -21,12 +21,32 @@ public class ResourceModel {
private Long status;
private String visibility;
+ public Boolean getHasCurrentUserReviewPermission() {
+ return hasCurrentUserReviewPermission;
+ }
+
+ public void setHasCurrentUserReviewPermission(Boolean hasCurrentUserReviewPermission) {
+ this.hasCurrentUserReviewPermission = hasCurrentUserReviewPermission;
+ }
+
+ public Boolean getReviewEnabled() {
+ return reviewEnabled;
+ }
+
+ public void setReviewEnabled(Boolean reviewEnabled) {
+ this.reviewEnabled = reviewEnabled;
+ }
+
+ private Boolean hasCurrentUserReviewPermission= false;
+ private Boolean reviewEnabled = false;
+
public static ResourceModel generatePublicResource() {
ResourceModel resourceModel = new ResourceModel();
resourceModel.resourceTypeIdentifier = StringUtils.lowerCase(Utils.randomEnum(getAllEnumValues(ResourceTypes.class)).getName());
resourceModel.identifierValue = ("AUT_resourceIdentifier_" + Generator.randomAlphaNumericValue(4)).toLowerCase();
resourceModel.identifierScheme = Generator.randomAlphabeticalValue(4).toLowerCase() + "-" + Generator.randomAlphaNumericValue(4).toLowerCase() + "-" + Generator.randomAlphaNumericValue(4).toLowerCase();
resourceModel.visibility = "PUBLIC";
+ resourceModel.reviewEnabled= false;
return resourceModel;
}
diff --git a/domismp-tests/domismp-tests-ui/src/main/java/rest/models/UserModel.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/UserModel.java
index 64fd115e8317016d24668525d5d3a9e12519b922..7602dfa540cf60faf58ebb6293229dd03e3ae89f 100644
--- a/domismp-tests/domismp-tests-ui/src/main/java/rest/models/UserModel.java
+++ b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/UserModel.java
@@ -102,7 +102,7 @@ public class UserModel {
userModel.emailAddress = "AUT_email_" + Generator.randomAlphaNumericValue(4) + "@automation.com";
userModel.fullName = "AUT_fullname_" + Generator.randomAlphaNumericValue(4);
userModel.smpTheme = SMPThemes.getRandomTheme();
- userModel.smpLocale = "English";
+ userModel.smpLocale = "en";
return userModel;
}
@@ -114,7 +114,7 @@ public class UserModel {
userModel.emailAddress = "AUT_email_" + Generator.randomAlphaNumericValue(4) + "@automation.com";
userModel.fullName = "AUT_fullname_" + Generator.randomAlphaNumericValue(4);
userModel.smpTheme = SMPThemes.getRandomTheme();
- userModel.smpLocale = "English";
+ userModel.smpLocale = "en";
return userModel;
}
@@ -123,7 +123,7 @@ public class UserModel {
userModel.emailAddress = "AUT_email_" + Generator.randomAlphaNumericValue(4) + "@automation.com";
userModel.fullName = "AUT_fullname_" + Generator.randomAlphaNumericValue(4);
userModel.smpTheme = SMPThemes.getRandomTheme();
- userModel.smpLocale = "English";
+ userModel.smpLocale = "en";
return userModel;
}
diff --git a/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/DomainsPgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/DomainsPgTests.java
index 62fae7c3fe5de1a4317d62d23585fb9a907839c1..782e0272cdd97512f33f4d020667abf9150eb2be 100644
--- a/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/DomainsPgTests.java
+++ b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/DomainsPgTests.java
@@ -75,7 +75,7 @@ public class DomainsPgTests extends SeleniumTest {
domainsPage.getSMLIntegrationTab().registerToSML();
alert = domainsPage.getAlertMessageAndClose();
- soft.assertEquals(alert, "Domain [" + domainModel.getDomainCode() + "] registered to sml!");
+ soft.assertEquals(alert, "Domain [" + domainModel.getDomainCode() + "] registered to SML!");
//Go to SML
driver.get(data.getSMLUrl());
diff --git a/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/EditResourcePgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/EditResourcePgTests.java
index c453e54a2e0ce3caba585b4bdd2e13515b967185..062ef7747dac341fc859a4f8c7a6b3d83821d6f1 100644
--- a/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/EditResourcePgTests.java
+++ b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/EditResourcePgTests.java
@@ -133,6 +133,7 @@ public class EditResourcePgTests extends SeleniumTest {
editResourcePage.selectDomain(domainModel, groupModel, resourceModelOasis3);
editResourcePage.goToTab("Resource details");
EditResourceDocumentPage editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
+ editResourceDocumentPage.clickOnNewVersion();
editResourceDocumentPage.clickOnGenerate();
editResourceDocumentPage.clickOnSave();
editResourceDocumentPage.getAlertArea().closeAlert();
@@ -158,6 +159,7 @@ public class EditResourcePgTests extends SeleniumTest {
editResourcePage.selectDomain(domainModel, groupModel, resourceModelOasis2);
editResourcePage.goToTab("Resource details");
editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
+ editResourceDocumentPage.clickOnNewVersion();
editResourceDocumentPage.clickOnGenerate();
editResourceDocumentPage.clickOnSave();
editResourceDocumentPage.getAlertArea().closeAlert();
@@ -181,6 +183,7 @@ public class EditResourcePgTests extends SeleniumTest {
editResourcePage.selectDomain(domainModel, groupModel, resourceModelOasis1);
editResourcePage.goToTab("Resource details");
editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
+ editResourceDocumentPage.clickOnNewVersion();
editResourceDocumentPage.clickOnGenerate();
editResourceDocumentPage.clickOnSave();
editResourceDocumentPage.getAlertArea().closeAlert();
@@ -212,6 +215,7 @@ public class EditResourcePgTests extends SeleniumTest {
editResourcePage.goToTab("Resource details");
EditResourceDocumentPage editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
+ editResourceDocumentPage.clickOnNewVersion();
editResourceDocumentPage.clickOnGenerate();
editResourceDocumentPage.clickOnSave();
editResourceDocumentPage.getAlertArea().closeAlert();
diff --git a/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/KeystorePgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/KeystorePgTests.java
index 3b69f5803e5430ec509ce4e310351981b7e880d2..6d2bf923969e87f9502f5d9a9881726c19769f1b 100644
--- a/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/KeystorePgTests.java
+++ b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/KeystorePgTests.java
@@ -45,6 +45,7 @@ public class KeystorePgTests extends SeleniumTest {
if(keystorePage.getLeftSideGrid().isValuePresentInColumn("Alias", "blue_gw")){
keystorePage.getLeftSideGrid().searchAndClickElementInColumn("Alias", "blue_gw");
keystorePage.deleteandConfirm();
+ keystorePage.getAlertMessageAndClose();
}
KeyStoreImportDialog keyStoreImportDialog = keystorePage.clickImportkeyStoreBtn();
keyStoreImportDialog.addCertificate(path, KeyStoreTypes.JKS, "test123");
@@ -78,9 +79,16 @@ public class KeystorePgTests extends SeleniumTest {
soft.assertAll();
}
- @Test(description = "KEYS-04 SSystem admin is able to import duplicated keystore", priority = 1)
- public void systemAdminIsAbleToImportDuplicatedKeyStores(){
+ @Test(description = "KEYS-04 SSystem admin is NOT able to import duplicated keystore", priority = 1)
+ public void systemAdminIsNOTAbleToImportDuplicatedKeyStores(){
String path = FileUtils.getAbsoluteKeystorePath("valid_keystore.jks");
+ try{
+ keystorePage.getLeftSideGrid().searchAndClickElementInColumn("Alias", "blue_gw");
+ keystorePage.deleteandConfirm();
+ } catch (Exception e) {
+
+ }
+
KeyStoreImportDialog keyStoreImportDialog = keystorePage.clickImportkeyStoreBtn();
keyStoreImportDialog.addCertificate(path, KeyStoreTypes.JKS, "test123");
@@ -92,9 +100,9 @@ public class KeystorePgTests extends SeleniumTest {
keyStoreImportDialog = keystorePage.clickImportkeyStoreBtn();
keyStoreImportDialog.addCertificate(path, KeyStoreTypes.JKS, "test123");
keyStoreImportDialog.clickImport();
+
String duplicatedAlertMessage = keystorePage.getAlertArea().getAlertMessage();
- String duplicatedAlias = Utils.getAliasFromMessage(duplicatedAlertMessage);
- soft.assertTrue(keystorePage.getLeftSideGrid().isValuePresentInColumn("Alias", duplicatedAlias));
+ soft.assertTrue(duplicatedAlertMessage.contains("The following aliases have been ignored because they were already present in the current keystore:") );
soft.assertAll();
}
diff --git a/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/UsersPgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/UsersPgTests.java
index 8301f79754c6e7f885fb2c64cbc3c29c35fae67f..b95cc9a3263938e634cb5fada311b550085a2a3f 100644
--- a/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/UsersPgTests.java
+++ b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/UsersPgTests.java
@@ -44,7 +44,7 @@ public class UsersPgTests extends SeleniumTest {
soft.assertEquals(usersPage.getEmailValue(), adminNewUserData.getEmailAddress());
soft.assertEquals(usersPage.getSelectedThemeValue(), adminNewUserData.getSmpTheme());
- soft.assertEquals(usersPage.getSelectedLocaleValue(), adminNewUserData.getSmpLocale());
+ soft.assertEquals(usersPage.getSelectedLocaleValue(), "English");
soft.assertAll();
diff --git a/domismp-tests/domismp-tests-ui/testng.xml b/domismp-tests/domismp-tests-ui/testng.xml
index 90ae71527e06ba13940657dcd27c22eb524ee265..df447d33c2bd63ec0f2b938c01d79e78a7b7dc53 100644
--- a/domismp-tests/domismp-tests-ui/testng.xml
+++ b/domismp-tests/domismp-tests-ui/testng.xml
@@ -1,8 +1,18 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
<suite name="SELENIUM" parallel="classes" thread-count="1">
- <groups>
- <run>
- </run>
- </groups>
+ <test thread-count="1" name="domismp-tests-ui">
+ <classes>
+ <class name="domiSMPTests.SeleniumTest"/>
+ <class name="domiSMPTests.ui.UsersPgTests"/>
+ <class name="domiSMPTests.ui.DomainsPgTests"/>
+ <class name="domiSMPTests.ui.ProfilePgTests"/>
+ <class name="domiSMPTests.ui.KeystorePgTests"/>
+ <class name="domiSMPTests.ui.TrustorePgTests"/>
+ <class name="domiSMPTests.ui.EditGroupsPgTests"/>
+ <class name="domiSMPTests.ui.PropertiesPgTests"/>
+ <class name="domiSMPTests.ui.EditDomainsPgTests"/>
+ <class name="domiSMPTests.ui.EditResourcePgTests"/>
+ </classes>
+ </test> <!-- domismp-tests-ui -->
</suite>
\ No newline at end of file