From 6ead9eade73a6b363ac15d4f6dfe16b212633dc1 Mon Sep 17 00:00:00 2001
From: monhaso <sonali.mohanty@ext.ec.europa.eu>
Date: Thu, 24 Mar 2022 09:27:05 +0100
Subject: [PATCH] Keystore file path change
---
.../src/main/java/pages/keystore/KeyStoreImportDialog.java | 5 +++--
smp-ui-tests/src/test/java/ui/DomainPgTest.java | 6 +++---
smp-ui-tests/src/test/java/ui/UsersPgTest.java | 1 -
3 files changed, 6 insertions(+), 6 deletions(-)
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 a2700890d..9e68fd573 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 f7024fa13..044fa36a3 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 f1a2d2483..47fd13702 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");
--
GitLab