diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/api/APIDeploymentSteps.java b/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/api/APIDeploymentSteps.java index 5c28abc47..529051fcc 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/api/APIDeploymentSteps.java +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/api/APIDeploymentSteps.java @@ -462,9 +462,9 @@ public void iHaveValidGraphQLDefinition() throws Exception { String multipartForm = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); // Log the multipart form - logger.info("Multipart Form Data:\n{}"+ multipartForm); - logger.info("Validator URL: " + Utils.getGQLSchemaValidatorURL()); - logger.info("Publisher Token: " + sharedContext.getPublisherAccessToken()); + logger.debug("Multipart Form Data:\n{}"+ multipartForm); + logger.debug("Validator URL: " + Utils.getGQLSchemaValidatorURL()); + logger.debug("Publisher Token: " + sharedContext.getPublisherAccessToken()); HttpResponse response = sharedContext.getHttpClient().doPostWithMultipart(Utils.getGQLSchemaValidatorURL(), multipartEntity, headers); diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/APILevelInterceptor.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/APILevelInterceptor.feature index 2d2f91ebb..28f98f84c 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/APILevelInterceptor.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/APILevelInterceptor.feature @@ -11,6 +11,7 @@ Feature: API Policy Addition(Interceptor Service) And the response body should contain "IntercepterServiceAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -60,6 +61,7 @@ Feature: API Policy Addition(Interceptor Service) And the response body should contain "IntercepterServiceAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -108,6 +110,7 @@ Feature: API Policy Addition(Interceptor Service) And the response body should contain "ReqandResIntercepterServiceAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -157,6 +160,7 @@ Feature: API Policy Addition(Interceptor Service) And the response body should contain "ParamVarIntercepterServiceAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/APIVersion.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/APIVersion.feature index bf30be4f0..d02944f05 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/APIVersion.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/APIVersion.feature @@ -11,6 +11,7 @@ Feature: Creating new versions of the APIs And the response body should contain "SwaggerPetstore" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -75,6 +76,7 @@ Feature: Creating new versions of the APIs And the response body should contain "StarWarsAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/BackendSecurity.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/BackendSecurity.feature index 098856f3b..a334781a3 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/BackendSecurity.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/BackendSecurity.feature @@ -16,6 +16,7 @@ Feature: Backend Security for APIs And I have a valid Devportal access token And make the Application Creation request with the name "SampleApp" Then the response status code should be 201 + Then I wait for 40 seconds And the response body should contain "SampleApp" And I have a KeyManager And make the Generate Keys request @@ -63,6 +64,7 @@ Feature: Backend Security for APIs And the response body should contain "StarWarsAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/BackendSupport.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/BackendSupport.feature index ed5b50f7c..d481aa269 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/BackendSupport.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/BackendSupport.feature @@ -11,6 +11,7 @@ Feature: Backend Support for APIs And the response body should contain "SwaggerPetstore" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -68,6 +69,7 @@ Feature: Backend Support for APIs And the response body should contain "StarwarsAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/CORS.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/CORS.feature index e313076cc..7035855d3 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/CORS.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/CORS.feature @@ -11,6 +11,7 @@ Feature: CORS Policy handling And the response body should contain "test-cors" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -95,6 +96,7 @@ Feature: CORS Policy handling And the response body should contain "StarWarsAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/DefaultVersion.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/DefaultVersion.feature index d3abb1313..c1c02514b 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/DefaultVersion.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/DefaultVersion.feature @@ -11,6 +11,7 @@ Feature: API Default Version And the response body should contain "SwaggerPetstore" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -59,6 +60,7 @@ Feature: API Default Version When I use the Payload file "artifacts/payloads/gql_default_version.json" Then I make the import GraphQLAPI Creation request Then the response status code should be 201 + Then I wait for 40 seconds And the response body should contain "StarwarsAPI" And make the API Revision Deployment request Then the response status code should be 201 diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Deployment.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Deployment.feature index 002f4f1de..4ea911359 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Deployment.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Deployment.feature @@ -11,6 +11,7 @@ Feature: API Deployment And the response body should contain "SwaggerPetstore" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -59,6 +60,7 @@ Feature: API Deployment And the response body should contain "StarwarsAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/InternalKey.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/InternalKey.feature index 1ef9e7d81..303df5080 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/InternalKey.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/InternalKey.feature @@ -11,6 +11,7 @@ Feature: Testing the internal-key generation and invocation And the response body should contain "SwaggerPetstore" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 Then I make an internal key generation request @@ -42,6 +43,7 @@ Feature: Testing the internal-key generation and invocation And the response body should contain "StarwarsAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 Then I make an internal key generation request diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature index 600272dab..88724c180 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature @@ -15,6 +15,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -89,6 +90,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -142,6 +144,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -196,6 +199,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 Then I set headers @@ -228,6 +232,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I set "invlaidToken" as the new access token @@ -262,6 +267,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he # Then the response status code should be 201 # And make the API Revision Deployment request # Then the response status code should be 201 + # Then I wait for 40 seconds # And make the Change Lifecycle request # Then the response status code should be 200 # Then I set headers @@ -295,6 +301,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he And the response body should contain "EmployeeServiceAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I send "GET" request to "https://default.gw.wso2.com:9095/mtls/3.14/employee" with body "" @@ -325,6 +332,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -394,6 +402,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature index 3cb49dc8e..e8f1eae83 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature @@ -15,6 +15,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -71,6 +72,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -134,6 +136,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -186,6 +189,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -242,6 +246,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 Then I set "invalidToken" as the new access token @@ -276,6 +281,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -333,6 +339,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 Then I set "invalidToken" as the new access token @@ -365,6 +372,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I send "GET" request to "https://default.gw.wso2.com:9095/mtls/3.14/employee/" with body "" diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Ratelimit.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Ratelimit.feature index 694f02e1e..76dcf2075 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Ratelimit.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Ratelimit.feature @@ -14,6 +14,7 @@ Feature: Testing Ratelimit feature And the response body should contain "SimpleRateLimitAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -78,6 +79,7 @@ Feature: Testing Ratelimit feature And the response body should contain "\"throttlingPolicy\":\"TestRatelimit\"" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -151,6 +153,7 @@ Feature: Testing Ratelimit feature And the response body should contain "StarwarsAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/ResourceLevelInterceptor.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/ResourceLevelInterceptor.feature index 7467e30ba..cffaf524b 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/ResourceLevelInterceptor.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/ResourceLevelInterceptor.feature @@ -14,6 +14,7 @@ Feature: API Policy Addition(Interceptor Service) Then the response status code should be 200 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Scopes.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Scopes.feature index ec4747479..25e1be6b7 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Scopes.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/Scopes.feature @@ -11,6 +11,7 @@ Feature: Invoking APIs with scopes enabled And the response body should contain "SwaggerPetstore" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -63,6 +64,7 @@ Feature: Invoking APIs with scopes enabled And the response body should contain "StarWarsAPI" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/SubscriptionBlocking.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/SubscriptionBlocking.feature index d2339d2e8..ecf3051db 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/SubscriptionBlocking.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/SubscriptionBlocking.feature @@ -11,6 +11,7 @@ Feature: Blocking the subscription for a selected application And the response body should contain "SwaggerPetstore" And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/graphQLmTLS.feature b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/graphQLmTLS.feature index 13fc9c30a..ef2a0c22e 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/graphQLmTLS.feature +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/resources/tests/api/graphQLmTLS.feature @@ -1,7 +1,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in header Background: Given The system is ready - Scenario: Deploying APK conf using a valid GraphQL API definition with mTLS mandatory and valid certificate + Scenario: Deploying GraphQL API with mTLS mandatory and valid certificate And I have a DCR application And I have a valid Publisher access token When the definition file "artifacts/definitions/schema_graphql.graphql" @@ -14,6 +14,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -56,7 +57,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he |200| - Scenario: Deploying APK conf using a valid GraphQL API definition with mTLS mandatory and no certificate + Scenario: Deploying GraphQL API with mTLS mandatory and no certificate And I have a DCR application And I have a valid Publisher access token When the definition file "artifacts/definitions/schema_graphql.graphql" @@ -69,6 +70,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token @@ -109,7 +111,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he And I eventually receive 404 response code, not accepting |200| - Scenario: Deploying APK conf using a valid GraphQL API definition with OAuth2 mandatory mTLS optional + Scenario: Deploying GraphQL API with OAuth2 mandatory mTLS optional And I have a DCR application And I have a valid Publisher access token When the definition file "artifacts/definitions/schema_graphql.graphql" @@ -122,6 +124,7 @@ Feature: Test mTLS between client and gateway with client certificate sent in he Then the response status code should be 201 And make the API Revision Deployment request Then the response status code should be 201 + Then I wait for 40 seconds And make the Change Lifecycle request Then the response status code should be 200 And I have a valid Devportal access token