Update Integration tests with Sem Versions in the API context

Signed-off-by: Renuka Fernando <[email protected]>
wso2 · Aug 31, 2023 · 9425334 · 9425334
1 parent 7f7ab87
commit 9425334
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/adapter/internal/oasparser/envoyconf/envoyconf_internal_test.go b/adapter/internal/oasparser/envoyconf/envoyconf_internal_test.go
@@ -396,6 +396,12 @@ func TestGenerateRegex(t *testing.T) {
 			message:       "when the resource ends with *, trailing characters substitution passes",
 			isMatched:     false,
 		},
+		{
+			inputpath:     "/v2.0.0/pet/{petId}/images/*",
+			userInputPath: "/v2x0x0/pet/123/images/123-foo.png",
+			message:       "when the version is semver, the dot should not matched with any character",
+			isMatched:     false,
+		},
 		{
 			inputpath:     "/v2/pet/{petId}/images/*",
 			userInputPath: "/v2/pet/123/images/123-foo.png",
@@ -416,8 +422,8 @@ func TestGenerateRegex(t *testing.T) {
 		},
 		{
 			inputpath:     "/v2/pet/{petId}/images)/*",
-			userInputPath: "/v2/pet123/images/123-foo.png",
-			message:       "when the resource ends with *, special char in the path and path params in the middle fails",
+			userInputPath: "/v2/pet/123/images/123-foo.png",
+			message:       "when the resource ends with *, path params in the middle and special char in the path should exists",
 			isMatched:     false,
 		},
 		{
@@ -458,7 +464,8 @@ func TestGenerateRegex(t *testing.T) {
 		if item.message == "when the resource ends with *" {
 			log.Default().Println(resultPattern, item.userInputPath, err)
 		}
-		assert.Equal(t, item.isMatched, resultIsMatching, item.message)
+		assert.Equal(t, item.isMatched, resultIsMatching, item.message,
+			map[string]string{"inputpath": item.inputpath, "resultPattern": resultPattern, "userInputPath": item.userInputPath})
 		assert.Nil(t, err)
 	}
 }

diff --git a/...g/wso2/choreo/connect/tests/testcases/standalone/ratelimit/ApiLevelRatelimitTestCase.java b/...g/wso2/choreo/connect/tests/testcases/standalone/ratelimit/ApiLevelRatelimitTestCase.java
@@ -44,7 +44,7 @@ public class ApiLevelRatelimitTestCase {
     public void createApiProject() throws Exception {
         API api = new API();
         api.setName("ratelimit");
-        api.setContext("v2/ratelimitService");
+        api.setContext("v1.0.0/ratelimitService");
         api.setVersion("1.0.0");
         api.setProvider("admin");
 
@@ -55,7 +55,7 @@ public void createApiProject() throws Exception {
 
         testKey = TokenUtil.getJWT(api, applicationDto, "Unlimited", TestConstant.KEY_TYPE_PRODUCTION,
                 3600, null, true);
-        endpointURL = Utils.getServiceURLHttps("/v2/ratelimitService/pet/findByStatus");
+        endpointURL = Utils.getServiceURLHttps("/v1.0.0/ratelimitService/pet/findByStatus");
         headers.put("Internal-Key", testKey);
     }
 

diff --git a/.../choreo/connect/tests/testcases/standalone/ratelimit/OperationLevelRatelimitTestCase.java b/.../choreo/connect/tests/testcases/standalone/ratelimit/OperationLevelRatelimitTestCase.java
@@ -41,7 +41,7 @@ public class OperationLevelRatelimitTestCase {
     public void createApiProject() throws Exception {
         API api = new API();
         api.setName("ratelimit");
-        api.setContext("v2/operationLevelRL");
+        api.setContext("v1.0.0/operationLevelRL");
         api.setVersion("1.0.0");
         api.setProvider("admin");
 
@@ -57,7 +57,7 @@ public void createApiProject() throws Exception {
 
     @Test(description = "Test operation level 3 permin rate-limiting with envoy rate-limit service")
     public void testRateLimitsWithEnvoyRateLimitService3PerMin() throws Exception {
-        String endpointURL = Utils.getServiceURLHttps("/v2/operationLevelRL/pet/findByStatus");
+        String endpointURL = Utils.getServiceURLHttps("/v1.0.0/operationLevelRL/pet/findByStatus");
         Assert.assertTrue(RateLimitUtils.isThrottled(
                         RateLimitUtils.sendMultipleRequests(endpointURL, headers, 4)),
                 "Operation level rate-limit 3 per min testcase failed.");
@@ -66,8 +66,8 @@ public void testRateLimitsWithEnvoyRateLimitService3PerMin() throws Exception {
     @Test(description = "Test operation level 5 per min rate-limiting with envoy rate-limit service")
     public void testRateLimitsWithEnvoyRateLimitService5PerMin() throws Exception {
         String requestData = "Payload to create pet 5";
-        String endpointURL1 = Utils.getServiceURLHttps("/v2/operationLevelRL/pet/3");
-        String endpointURL2 = Utils.getServiceURLHttps("/v2/operationLevelRL/pet/4");
+        String endpointURL1 = Utils.getServiceURLHttps("/v1.0.0/operationLevelRL/pet/3");
+        String endpointURL2 = Utils.getServiceURLHttps("/v1.0.0/operationLevelRL/pet/4");
         RateLimitUtils.sendMultipleRequests(endpointURL2, headers, 2);
         Assert.assertTrue(RateLimitUtils.isThrottled(
                         RateLimitUtils.sendMultipleRequests(endpointURL1, headers, 4))
@@ -81,7 +81,7 @@ public void testRateLimitsWithEnvoyRateLimitService5PerMin() throws Exception {
 
     @Test(description = "Test an operation without defining envoy rate-limits")
     public void testOperationWithoutEnvoyRateLimits() throws Exception {
-        String endpointURL = Utils.getServiceURLHttps("/v2/operationLevelRL/pets/findByTags");
+        String endpointURL = Utils.getServiceURLHttps("/v1.0.0/operationLevelRL/pets/findByTags");
         HttpResponse response = HttpsClientRequest.doGet(endpointURL, headers);
         Map<String,String> responseHeadersMap = response.getHeaders();
         Assert.assertTrue(!responseHeadersMap.containsKey("x-ratelimit-limit"), "x-ratelimit-limit header available");

diff --git a/integration/test-integration/src/test/resources/apiYaml/operation_level_ratelimit_api.yaml b/integration/test-integration/src/test/resources/apiYaml/operation_level_ratelimit_api.yaml
@@ -3,7 +3,7 @@ version: v4.1.0
 data:
   id: 2b547d7c-4f7b-4f31-ad6b-05b4960dc123
   name: operationLevelRateLimit
-  context: /v2/operationLevelRL
+  context: /v1.0.0/operationLevelRL
   version: 1.0.0
   provider: admin
   lifeCycleStatus: PUBLISHED

diff --git a/integration/test-integration/src/test/resources/apiYaml/ratelimit_api.yaml b/integration/test-integration/src/test/resources/apiYaml/ratelimit_api.yaml
@@ -3,7 +3,7 @@ version: v4.1.0
 data:
   id: 2b547d7c-4f7b-4f31-ad6b-05b4960dcbf1
   name: ratelimit
-  context: /v2/ratelimitService
+  context: /v1.0.0/ratelimitService
   version: 1.0.0
   apiThrottlingPolicy: 5PerMinute
   throttlingLimit:

diff --git a/...ation/test-integration/src/test/resources/openAPIs/operation_level_ratelimit_openAPI.yaml b/...ation/test-integration/src/test/resources/openAPIs/operation_level_ratelimit_openAPI.yaml
@@ -24,7 +24,7 @@ x-wso2-endpoints:
       urls:
         - http://mockBackend:2390/v2 # same base path as x-wso2-production-endpoints
       type: loadbalance
-x-wso2-basePath: /v2/operationLevelRL
+x-wso2-basePath: /v1.0.0/operationLevelRL
 schemes:
   - http
 paths:

diff --git a/integration/test-integration/src/test/resources/openAPIs/ratelimit_openAPI.yaml b/integration/test-integration/src/test/resources/openAPIs/ratelimit_openAPI.yaml
@@ -24,7 +24,7 @@ x-wso2-endpoints:
       urls:
         - http://mockBackend:2390/v2 # same base path as x-wso2-production-endpoints
       type: loadbalance
-x-wso2-basePath: /v2/ratelimitService
+x-wso2-basePath: /v1.0.0/ratelimitService
 schemes:
   - http
 paths: