Pull request #185: 1) Keystore file path change

Merge in EDELIVERY/smp from smpAutomation to development

* commit '21d67a6461c06793fbf672583b449fb5bcb8d0e7':
  Keystore file path change
  Keystore file path change
  1) Keystore file path change
  1) Keystore file path change

smp-ui-tests/src/main/java/pages/keystore/KeyStoreImportDialog.java

@@ -60,8 +60,9 @@ public class KeyStoreImportDialog extends PageComponent{
         waitForElementToBeGone(closeBtn);
         return new KeyStoreEditDialog(driver);
     }
-    public void chooseKeystoreFile() {
-        chooseKeystore.sendKeys(System.getProperty("user.dir")+"\\target\\classes\\keystore\\keystore_dummy1.jks");
+    public void chooseKeystoreFile(String relativePath) {
+        String path =new File(relativePath).getAbsolutePath() ;
+        chooseKeystore.sendKeys(path);
     }
     public void fillPassword(String password)
     {

smp-ui-tests/src/test/java/ui/DomainPgTest.java

@@ -371,7 +371,7 @@ public class DomainPgTest extends BaseTest {
 		KeyStoreEditDialog keyStoreEdit = page.clickEditKeyStore();
 		int keyStoreRowBeforeAddition = keyStoreEdit.grid().getRowsNo();
 		KeyStoreImportDialog keyStoreImport = keyStoreEdit.clickImportKeystore();
-		keyStoreImport.chooseKeystoreFile();
+		keyStoreImport.chooseKeystoreFile("src/main/resources/keystore/keystore_dummy1.jks");
 		Assert.assertEquals(keyStoreImport.getKeyStoreFileName(),"keystore_dummy1.jks","the keystore file name is not correct");
 		keyStoreImport.fillPassword(pass);
 		keyStoreImport.clickImportBtn();
@@ -399,7 +399,7 @@ public class DomainPgTest extends BaseTest {
 			KeyStoreEditDialog keyStoreEdit = page.clickEditKeyStore();
 			int keyStoreRowBeforeAddition = keyStoreEdit.grid().getRowsNo();
 			KeyStoreImportDialog keyStoreImport = keyStoreEdit.clickImportKeystore();
-			keyStoreImport.chooseKeystoreFile();
+			keyStoreImport.chooseKeystoreFile("src/main/resources/keystore/keystore_dummy1.jks");
 			Assert.assertEquals(keyStoreImport.getKeyStoreFileName(),"keystore_dummy1.jks","the keystore file name is not correct");
 			keyStoreImport.fillPassword(pass);
 			keyStoreImport.clickImportBtn();
@@ -410,7 +410,7 @@ public class DomainPgTest extends BaseTest {
 			soft.assertEquals(keyStoreRowAfterAddition,keyStoreRowBeforeAddition+1, "KeyStore is not added to the grid");
 		keyStoreRowBeforeAddition = keyStoreRowAfterAddition;
 		keyStoreImport = keyStoreEdit.clickImportKeystore();
-		keyStoreImport.chooseKeystoreFile();
+		keyStoreImport.chooseKeystoreFile("src/main/resources/keystore/keystore_dummy1.jks");
 		Assert.assertEquals(keyStoreImport.getKeyStoreFileName(),"keystore_dummy1.jks","the keystore file name is not correct");
 		keyStoreImport.fillPassword(pass);
 		keyStoreImport.clickImportBtn();

smp-ui-tests/src/test/java/ui/UsersPgTest.java

@@ -439,7 +439,6 @@ public class UsersPgTest extends BaseTest {
         SoftAssert soft = new SoftAssert();
         String userName = Generator.randomAlphaNumeric(10);
         String validPass = "QW!@qw12";
-       // String errorMsg = "×\n" + "The operation 'update' not completed successfully. Unexpected technical error occurred.";
         UsersPage page = new UsersPage(driver);
 
         soft.assertTrue(page.isNewButtonEnabled(), "New button should be enabled");