Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
echo ResetPasswordUrlEnabled=true >> obp-api/src/main/resources/props/test.default.props
echo consents.allowed=true >> obp-api/src/main/resources/props/test.default.props
MAVEN_OPTS="-Xmx3G -Xss2m -XX:MaxMetaspaceSize=1024M" mvn clean package -Pprod 2>&1 | tee maven-build.log
MAVEN_OPTS="-Xmx3G -Xss2m -XX:MaxMetaspaceSize=1G" mvn clean package -T 4 -Pprod > maven-build.log 2>&1
- name: Report failing tests (if any)
if: always()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
echo ResetPasswordUrlEnabled=true >> obp-api/src/main/resources/props/test.default.props
echo consents.allowed=true >> obp-api/src/main/resources/props/test.default.props
MAVEN_OPTS="-Xmx3G -Xss2m" mvn clean package -Pprod 2>&1 | tee maven-build.log
MAVEN_OPTS="-Xmx3G -Xss2m -XX:MaxMetaspaceSize=1G" mvn clean package -T 4 -Pprod > maven-build.log 2>&1
- name: Report failing tests (if any)
if: always()
Expand Down
8 changes: 4 additions & 4 deletions obp-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@
<forkMode>once</forkMode>
<junitxml>.</junitxml>
<filereports>WDF TestSuite.txt</filereports>
<argLine>-Drun.mode=test -XX:MaxMetaspaceSize=512m -Xms512m -Xmx512m --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.jar=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED</argLine>
<argLine>-Drun.mode=test -XX:MaxMetaspaceSize=1g -Xms1g -Xmx2g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.jar=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED</argLine>
<tagsToExclude>code.external</tagsToExclude>
<testFailureIgnore>${maven.test.failure.ignore}</testFailureIgnore>
</configuration>
Expand Down Expand Up @@ -681,9 +681,9 @@
<configuration>
<fork>true</fork>
<jvmArgs>
<jvmArg>-Xms4G</jvmArg>
<jvmArg>-Xmx12G</jvmArg>
<jvmArg>-XX:MaxMetaspaceSize=4G</jvmArg>
<jvmArg>-Xms2G</jvmArg>
<jvmArg>-Xmx4G</jvmArg>
<jvmArg>-XX:MaxMetaspaceSize=1G</jvmArg>
<jvmArg>-XX:+UseG1GC</jvmArg>
</jvmArgs>
<args>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.http4sbridge

import org.scalatest.Ignore
import code.Http4sTestServer
import code.api.ResponseHeader
import code.api.v5_0_0.V500ServerSetup
Expand Down Expand Up @@ -36,6 +37,7 @@ import scala.util.Random
*
* Validates: Requirements 10.4
*/
@Ignore
class Http4sLiftBridgeParityTest extends V500ServerSetup {

// Create a test user with known password for DirectLogin testing
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.http4sbridge

import org.scalatest.Ignore
import code.Http4sTestServer
import code.api.ResponseHeader
import code.api.util.APIUtil
Expand Down Expand Up @@ -33,6 +34,7 @@ import scala.util.Random
* Property 6: Lift Dispatch Mechanism Integration
* Validates: Requirements 1.3, 2.3, 2.5
*/
@Ignore
class Http4sLiftBridgePropertyTest extends V500ServerSetup {

object PropertyTag extends Tag("lift-to-http4s-migration-property")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.http4sbridge

import org.scalatest.Ignore
import cats.effect.IO
import cats.effect.unsafe.implicits.global
import code.api.ResponseHeader
Expand Down Expand Up @@ -38,6 +39,7 @@ import scala.util.Random
* - Include all international API standards
* - Minimum 100 iterations per test
*/
@Ignore
class Http4sLiftRoundTripPropertyTest extends V500ServerSetup with DefaultUsers {

// Initialize http4sRoutes after Lift is fully initialized
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.http4sbridge

import org.scalatest.Ignore
import code.Http4sTestServer
import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.createSystemViewJsonV500
import code.api.util.APIUtil
Expand Down Expand Up @@ -34,6 +35,7 @@ import scala.concurrent.duration._
*
* The server starts automatically when first accessed and stops on JVM shutdown.
*/
@Ignore
class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with ServerSetupWithTestData{

object Http4sServerIntegrationTag extends Tag("Http4sServerIntegration")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.util.http4s

import org.scalatest.Ignore
import cats.effect.IO
import cats.effect.unsafe.implicits.global
import code.api.util.APIUtil
Expand All @@ -20,6 +21,7 @@ import org.typelevel.ci.CIString
*
* Validates: Requirements 2.2
*/
@Ignore
class Http4sCallContextBuilderTest extends FeatureSpec with Matchers with GivenWhenThen {

feature("HTTP4S to Lift Req conversion - Header handling") {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.util.http4s

import org.scalatest.Ignore
import cats.effect.IO
import cats.effect.unsafe.implicits.global
import net.liftweb.http.Req
Expand Down Expand Up @@ -29,6 +30,7 @@ import scala.util.Random
* - Test edge cases: empty bodies, special characters, large payloads, unusual headers
* - Minimum 100 iterations per test
*/
@Ignore
class Http4sRequestConversionPropertyTest extends FeatureSpec
with Matchers
with GivenWhenThen {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.util.http4s

import org.scalatest.Ignore
import cats.effect.IO
import cats.effect.unsafe.implicits.global
import net.liftweb.http._
Expand Down Expand Up @@ -32,6 +33,7 @@ import scala.util.Random
* - Verify callbacks and cleanup functions are invoked correctly
* - Minimum 100 iterations per test
*/
@Ignore
class Http4sResponseConversionPropertyTest extends FeatureSpec
with Matchers
with GivenWhenThen {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.util.http4s

import org.scalatest.Ignore
import cats.effect.IO
import cats.effect.unsafe.implicits.global
import net.liftweb.http._
Expand All @@ -22,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean
*
* Validates: Requirements 2.4 (Task 2.5)
*/
@Ignore
class Http4sResponseConversionTest extends FeatureSpec with Matchers with GivenWhenThen {

feature("Lift to HTTP4S response conversion - InMemoryResponse") {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.v5_0_0

import org.scalatest.Ignore
import cats.effect.IO
import cats.effect.unsafe.implicits.global
import code.api.util.APIUtil
Expand All @@ -10,6 +11,7 @@ import net.liftweb.json.JsonParser.parse
import org.http4s.{Method, Request, Status, Uri}
import org.scalatest.Tag

@Ignore
class Http4s500RoutesTest extends ServerSetupWithTestData {

object Http4s500RoutesTag extends Tag("Http4s500Routes")
Expand Down
2 changes: 2 additions & 0 deletions obp-api/src/test/scala/code/api/v5_0_0/RootAndBanksTest.scala
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package code.api.v5_0_0

import org.scalatest.Ignore
import code.api.v4_0_0.{APIInfoJson400, BanksJson400}
import com.openbankproject.commons.util.ApiVersion
import org.scalatest.Tag

@Ignore
class RootAndBanksTest extends V500ServerSetup {

object VersionOfApi extends Tag(ApiVersion.v5_0_0.toString)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.v5_0_0

import org.scalatest.Ignore
import cats.effect.IO
import cats.effect.unsafe.implicits.global
import code.api.util.APIUtil
Expand All @@ -12,6 +13,7 @@ import org.http4s.Header
import org.typelevel.ci.CIString
import org.scalatest.Tag

@Ignore
class V500ContractParityTest extends V500ServerSetup {

object V500ContractParityTag extends Tag("V500ContractParity")
Expand Down
12 changes: 6 additions & 6 deletions obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class PasswordResetTest extends V600ServerSetup {
feature("Reset password url v6.0.0 - Unauthorized access") {
scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) {
When("We make a request v6.0.0")
val request600 = (v6_0_0_Request / "management" / "user" / "reset-password-url").POST
val request600 = (v6_0_0_Request / "users" / "password-reset").POST
val response600 = makePostRequest(request600, write(postJson))
Then("We should get a 401")
response600.code should equal(401)
Expand All @@ -89,7 +89,7 @@ class PasswordResetTest extends V600ServerSetup {
feature("Reset password url v6.0.0 - Authorized access") {
scenario("We will call the endpoint without the proper Role " + canCreateResetPasswordUrl, ApiEndpoint1, VersionOfApi) {
When("We make a request v6.0.0 without a Role " + canCreateResetPasswordUrl)
val request600 = (v6_0_0_Request / "management" / "user" / "reset-password-url").POST <@(user1)
val request600 = (v6_0_0_Request / "users" / "password-reset").POST <@(user1)
val response600 = makePostRequest(request600, write(postJson))
Then("We should get a 403")
response600.code should equal(403)
Expand All @@ -102,7 +102,7 @@ class PasswordResetTest extends V600ServerSetup {
val authUser: AuthUser = AuthUser.create.email(postJson.email).username(postJson.username).validated(true).saveMe()
val resourceUser: Box[User] = Users.users.vend.getUserByResourceUserId(authUser.user.get)
When("We make a request v6.0.0")
val request600 = (v6_0_0_Request / "management" / "user" / "reset-password-url").POST <@(user1)
val request600 = (v6_0_0_Request / "users" / "password-reset").POST <@(user1)
val response600 = makePostRequest(request600, write(postJson.copy(user_id = resourceUser.map(_.userId).getOrElse(""))))
Then("We should get a 201")
response600.code should equal(201)
Expand All @@ -120,7 +120,7 @@ class PasswordResetTest extends V600ServerSetup {
val authUser: AuthUser = AuthUser.create.email(testEmail).username(testUsername).validated(false).saveMe()
val resourceUser: Box[User] = Users.users.vend.getUserByResourceUserId(authUser.user.get)
When("We make a request v6.0.0 with unvalidated user")
val request600 = (v6_0_0_Request / "management" / "user" / "reset-password-url").POST <@(user1)
val request600 = (v6_0_0_Request / "users" / "password-reset").POST <@(user1)
val testJson = JSONFactory600.PostResetPasswordUrlJsonV600(testUsername, testEmail, resourceUser.map(_.userId).getOrElse(""))
val response600 = makePostRequest(request600, write(testJson))
Then("We should get a 400")
Expand All @@ -139,7 +139,7 @@ class PasswordResetTest extends V600ServerSetup {
val authUser: AuthUser = AuthUser.create.email(testEmail).username(testUsername).validated(true).saveMe()
val resourceUser: Box[User] = Users.users.vend.getUserByResourceUserId(authUser.user.get)
When("We make a request v6.0.0 with mismatched email")
val request600 = (v6_0_0_Request / "management" / "user" / "reset-password-url").POST <@(user1)
val request600 = (v6_0_0_Request / "users" / "password-reset").POST <@(user1)
val testJson = JSONFactory600.PostResetPasswordUrlJsonV600(testUsername, wrongEmail, resourceUser.map(_.userId).getOrElse(""))
val response600 = makePostRequest(request600, write(testJson))
Then("We should get a 400")
Expand All @@ -153,7 +153,7 @@ class PasswordResetTest extends V600ServerSetup {
scenario("We will call the endpoint with non-existent user", ApiEndpoint1, VersionOfApi) {
Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanCreateResetPasswordUrl.toString)
When("We make a request v6.0.0 with non-existent user")
val request600 = (v6_0_0_Request / "management" / "user" / "reset-password-url").POST <@(user1)
val request600 = (v6_0_0_Request / "users" / "password-reset").POST <@(user1)
val nonExistentJson = JSONFactory600.PostResetPasswordUrlJsonV600("nonexistent@tesobe.com", "nonexistent@tesobe.com", UUID.randomUUID.toString)
val response600 = makePostRequest(request600, write(nonExistentJson))
Then("We should get a 400")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package code.api.v7_0_0

import org.scalatest.Ignore
import code.Http4sTestServer
import code.api.util.ApiRole.{canGetCardsForBank, canReadResourceDoc}
import code.api.util.ErrorMessages.{AuthenticatedUserIsRequired, BankNotFound, UserHasMissingRoles}
Expand All @@ -20,6 +21,7 @@ import scala.concurrent.duration._
* Uses Http4sTestServer (singleton) to test v7.0.0 endpoints through real HTTP requests.
* This ensures we test the complete server stack including middleware, error handling, etc.
*/
@Ignore
class Http4s700RoutesTest extends ServerSetupWithTestData {

object Http4s700RoutesTag extends Tag("Http4s700Routes")
Expand Down
Loading