diff --git a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreImportDialog.java b/smp-ui-tests/src/main/java/pages/keystore/KeyStoreImportDialog.java index a2700890d520c08a94720d02cbcf45a1d6a2bfac..9e68fd573668798e1db67d64eb97ebc9b3f473c4 100644 --- a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreImportDialog.java +++ b/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() { - String path =System.getProperty("user.dir")+ File.separator +"target"+ File.separator + "classes" + File.separator + "keystore" + File.separator + "keystore_dummy1.jks"; + public void chooseKeystoreFile(String relativePath) { + //String path =new File("src/main/resources/keystore/keystore_dummy1.jks").getAbsolutePath() ; + String path =new File(relativePath).getAbsolutePath() ; chooseKeystore.sendKeys(path); } public void fillPassword(String password) diff --git a/smp-ui-tests/src/test/java/ui/DomainPgTest.java b/smp-ui-tests/src/test/java/ui/DomainPgTest.java index f7024fa139e843e1e6ba74e74b0e87ddd3019c2f..044fa36a39dd7f036ca22f5923e23d8a4aa414cf 100644 --- a/smp-ui-tests/src/test/java/ui/DomainPgTest.java +++ b/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(); diff --git a/smp-ui-tests/src/test/java/ui/UsersPgTest.java b/smp-ui-tests/src/test/java/ui/UsersPgTest.java index f1a2d248308d64cf4944db3d96df37f5d1922aac..47fd13702fb65355b83c996976e60c9227e3f4f0 100644 --- a/smp-ui-tests/src/test/java/ui/UsersPgTest.java +++ b/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");