fixed failing tests due to ui changes.

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();
     }

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() {

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;
     }

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;
     }
 

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;
     }
 

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());

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();

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();
     }

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();
 

domismp-tests/domismp-tests-ui/testng.xml

 <!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