Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test fixes for berlin test framework #222

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Test fixes for berlin test framework #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...src/main/java/com.wso2.openbanking.test.framework/automation/BasicAuthAutomationStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ public void execute(RemoteWebDriver webDriver, BrowserAutomation.AutomationConte
webDriver.navigate().to(authorizeUrl);
WebElement username;

//Enter Username
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
//Enter User Name
if (TestConstants.APIM_VERSION_420.equals(com.wso2.openbanking.test.framework.util.ConfigParser.getInstance().getAPIMVersion())) {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID_420));
} else {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
}

username.clear();
username.sendKeys(PsuConfigReader.getPSU());
Expand Down
7 changes: 6 additions & 1 deletion ...ork/src/main/java/com.wso2.openbanking.test.framework/automation/BasicAuthRejectStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,12 @@ public void execute(RemoteWebDriver webDriver, BrowserAutomation.AutomationConte
WebElement username;
WebDriverWait wait = new WebDriverWait(webDriver, 30);

username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
if (TestConstants.APIM_VERSION_420.equals(com.wso2.openbanking.test.framework.util.ConfigParser.getInstance()
.getAPIMVersion())) {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID_420));
} else {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
}

username.clear();
username.sendKeys(PsuConfigReader.getPSU());
Expand Down
7 changes: 6 additions & 1 deletion ...in/java/com.wso2.openbanking.test.framework/automation/BasicWithdrawalAutomationStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ public void execute(RemoteWebDriver webDriver, BrowserAutomation.AutomationConte
webDriver.navigate().to(consentWithdrawalUrl);
WebElement username;

username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
if (TestConstants.APIM_VERSION_420.equals(com.wso2.openbanking.test.framework.util.ConfigParser.getInstance()
.getAPIMVersion())) {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID_420));
} else {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
}

username.clear();
username.sendKeys(PsuConfigReader.getPSU());
Expand Down
6 changes: 5 additions & 1 deletion ...a/com.wso2.openbanking.test.framework/automation/ConfigurableBasicAuthAutomationStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ public void execute(RemoteWebDriver webDriver, BrowserAutomation.AutomationConte
webDriver.navigate().to(authorizeUrl);
WebElement username;

username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
if (TestConstants.APIM_VERSION_420.equals(com.wso2.openbanking.test.framework.util.ConfigParser.getInstance().getAPIMVersion())) {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID_420));
} else {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
}

username.clear();
username.sendKeys(userName);
Expand Down
6 changes: 5 additions & 1 deletion .../java/com.wso2.openbanking.test.framework/automation/ConfigurableBasicAuthRejectStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ public void execute(RemoteWebDriver webDriver, BrowserAutomation.AutomationConte
WebElement username;
WebDriverWait wait = new WebDriverWait(webDriver, 30);

username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
if (TestConstants.APIM_VERSION_420.equals(com.wso2.openbanking.test.framework.util.ConfigParser.getInstance().getAPIMVersion())) {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID_420));
} else {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
}

username.clear();
username.sendKeys(userName);
Expand Down
16 changes: 13 additions & 3 deletions ...work/src/main/java/com.wso2.openbanking.test.framework/automation/DevPortalLoginStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ public void execute(RemoteWebDriver webDriver, BrowserAutomation.AutomationConte
WebElement username;

//Enter User Name
username = webDriver.findElement(By.id(TestConstants.APIM_USERNAME));
if (TestConstants.APIM_VERSION_420.equals(ConfigParser.getInstance().getAPIMVersion())) {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID_420));
} else {
username = webDriver.findElement(By.id(TestConstants.USERNAME_FIELD_ID));
}
username.clear();
username.sendKeys(ConfigParser.getInstance().getTppUserName());

Expand All @@ -63,7 +67,13 @@ public void execute(RemoteWebDriver webDriver, BrowserAutomation.AutomationConte
webDriver.findElement(By.xpath(TestConstants.BTN_APIM_CONTINUE)).submit();

WebDriverWait wait = new WebDriverWait(webDriver, 30);
wait.until(ExpectedConditions.invisibilityOfElementLocated(
By.id(TestConstants.APIM_USERNAME)));

if (TestConstants.APIM_VERSION_420.equals(ConfigParser.getInstance().getAPIMVersion())) {
wait.until(ExpectedConditions.invisibilityOfElementLocated(
By.id(TestConstants.USERNAME_FIELD_ID_420)));
} else {
wait.until(ExpectedConditions.invisibilityOfElementLocated(
By.id(TestConstants.USERNAME_FIELD_ID)));
}
}
}
20 changes: 0 additions & 20 deletions ...rk/src/main/java/com.wso2.openbanking.test.framework/model/ApplicationAccessTokenDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,31 +158,11 @@ public String getPayload(String clientId) throws TestFrameworkException {
setScopes(TestConstants.ACCOUNTS_DEFAULT_SCOPES);
}

if (clientAssertionType == null) {
setClientAssertionType(TestConstants.CLIENT_ASSERTION_TYPE);
}

if (clientAssertion == null) {
if (accessTokenJwtDto == null) {
setAccessTokenJwtDto(new AccessTokenJwtDto());
}
if (clientId == null) {
setClientAssertion(accessTokenJwtDto.getJwt());
} else {
//use jwk thumbprint
setClientAssertion(accessTokenJwtDto.getJwt(clientId));
}
}

String payload = "";
String delimiter = "&";
return payload.concat(TestConstants.GRANT_TYPE_KEY + "=" + getGrantType() + delimiter)
.concat(TestConstants.SCOPE_KEY + "="
+ TestUtil.getParamListAsString(getScopes(), ' ') + delimiter)
.concat(TestConstants.CLIENT_ASSERTION_TYPE_KEY + "="
+ getClientAssertionType() + delimiter)
.concat(TestConstants.CLIENT_ASSERTION_KEY + "=" + getClientAssertion() + delimiter)
.concat(TestConstants.REDIRECT_URI_KEY + "=" + getRedirectUri() + delimiter)
.concat(TestConstants.CLIENT_ID + "=" + clientId);
}

Expand Down
8 changes: 1 addition & 7 deletions ...test-framework/src/main/java/com.wso2.openbanking.test.framework/request/AccessToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,7 @@ public static Response getApplicationAccessToken(
ApplicationAccessTokenDto applicationAccessTokenDto, String clientId)
throws TestFrameworkException {

String payload;

if (clientId == null) {
payload = applicationAccessTokenDto.getPayload();
} else {
payload = applicationAccessTokenDto.getPayload(clientId);
}
String payload = applicationAccessTokenDto.getPayload(clientId);
return TestSuite.buildRequest().contentType(TestConstants.ACCESS_TOKEN_CONTENT_TYPE)
.body(payload)
.baseUri(ConfigParser.getInstance().getAuthorisationServerURL())
Expand Down
4 changes: 4 additions & 0 deletions ...g-test-framework/src/main/java/com.wso2.openbanking.test.framework/util/ConfigParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,10 @@ public String getSolutionVersion() {
return String.valueOf(ConfigParser.getInstance().getConfiguration().get("SolutionVersion"));
}

public String getAPIMVersion() {
return String.valueOf(ConfigParser.getInstance().getConfiguration().get("APIMVersion"));
}

public String getOBSpec() {
return String.valueOf(ConfigParser.getInstance().getConfiguration().get("OBSpec"));
}
Expand Down
4 changes: 3 additions & 1 deletion ...-test-framework/src/main/java/com.wso2.openbanking.test.framework/util/TestConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public class TestConstants {
public static final String SOLUTION_VERSION_130 = "1.3.0";
public static final String SOLUTION_VERSION_140 = "1.4.0";
public static final String SOLUTION_VERSION_150 = "1.5.0";
public static final String APIM_VERSION_420 = "4.2.0";

public static final String CLIENT_CREDENTIALS = "client_credentials";
public static final String AUTH_CODE = "authorization_code";
Expand Down Expand Up @@ -116,7 +117,8 @@ public class TestConstants {
public static final String PASSWORD = "password";

//Selenium constants
public static final String USERNAME_FIELD_ID = "username";
public static final String USERNAME_FIELD_ID = "usernameUserInput";
public static final String USERNAME_FIELD_ID_420 = "username";
public static final String PASSWORD_FIELD_ID = "password";
public static final String HEADLESS_TAG = "--headless";
public static final String ACCOUNT_SELECT_DROPDOWN_XPATH = "//*[@id=\"accselect\"]";
Expand Down
6 changes: 1 addition & 5 deletions ...tils/src/main/groovy/com/wso2/openbanking/berlin/common/utils/BerlinRequestBuilder.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,9 @@ class BerlinRequestBuilder {

ClientID clientID = new ClientID(AppConfigReader.getClientId())

String assertionString = new AccessTokenJwtDto().getJwt()

ClientAuthentication clientAuth = new PrivateKeyJWT(SignedJWT.parse(assertionString))

URI tokenEndpoint = new URI("${config.getAuthorisationServerURL()}/oauth2/token")

TokenRequest request = new TokenRequest(tokenEndpoint, clientAuth, codeGrant)
TokenRequest request = new TokenRequest(tokenEndpoint, clientID, codeGrant);

HTTPRequest httpRequest = request.toHTTPRequest()

Expand Down
2 changes: 1 addition & 1 deletion ...st.accounts/common_test/Accounts_Authorization_Tests/AccountsExplicitAuthorisation.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class AccountsExplicitAuthorisation extends AbstractAccountsFlow{
//Check the Authorisation status
getAuthorizationStatus(consentPath)
String scaStatus = authorisationResponse.jsonPath().get(BerlinConstants.SCA_STATUS_PARAM)
Assert.assertEquals(scaStatus, AccountsConstants.CONSENT_STATUS_PSUAUTHENTICATED)
Assert.assertEquals(scaStatus, AccountsConstants.SCA_STATUS_FINALISED)
}

@Test(groups = ["SmokeTest", "1.3.6"], dependsOnMethods = ["Authenticate PSU on SCA Flow"])
Expand Down
6 changes: 2 additions & 4 deletions ...ments/common_test/Payments_Initiation_Tests/InitiationRequestHeaderValidationTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ class InitiationRequestHeaderValidationTests extends AbstractPaymentsFlow{
}
}

//todo: fix https://github.com/wso2-enterprise/financial-open-banking/issues/7561
// @Test (groups = ["1.3.3", "1.3.6"], dataProvider = "PaymentsTypes", dataProviderClass = PaymentsDataProviders.class)
@Test (groups = ["1.3.3", "1.3.6"], dataProvider = "PaymentsTypes", dataProviderClass = PaymentsDataProviders.class)
void "TC0301014_Initiation Request without Authorization Header"(String consentPath, List<String> paymentProducts,
String payload) {

Expand All @@ -287,8 +286,7 @@ class InitiationRequestHeaderValidationTests extends AbstractPaymentsFlow{
}
}

//todo: fix https://github.com/wso2-enterprise/financial-open-banking/issues/7561
// @Test (groups = ["1.3.3", "1.3.6"], dataProvider = "PaymentsTypes", dataProviderClass = PaymentsDataProviders.class)
@Test (groups = ["1.3.3", "1.3.6"], dataProvider = "PaymentsTypes", dataProviderClass = PaymentsDataProviders.class)
void "TC0301015_Initiation Request with invalid Authorization Header"(String consentPath, List<String> paymentProducts,
String payload) {

Expand Down
Loading