add cts

Author: millotp

generators/src/main/java/com/algolia/codegen/cts/tests/RequestOptions.java

@@ -6,13 +6,19 @@ public class RequestOptions {
 
   public Map<String, Object> queryParameters;
   public Map<String, String> headers;
+  public Long readTimeout;
+  public Long writeTimeout;
+  public Long connectTimeout;
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class RequestOptions {\n");
     sb.append("    queryParameters: ").append(queryParameters).append("\n");
     sb.append("    headers: ").append(headers).append("\n");
+    sb.append("    readTimeout: ").append(readTimeout).append("\n");
+    sb.append("    writeTimeout: ").append(writeTimeout).append("\n");
+    sb.append("    connectTimeout: ").append(connectTimeout).append("\n");
     sb.append("}");
     return sb.toString();
   }

generators/src/main/java/com/algolia/codegen/cts/tests/Step.java

@@ -8,6 +8,7 @@ public class Step {
   public String method;
   public int times;
   public Map<String, Object> parameters;
+  public RequestOptions requestOptions;
   public Expected expected;
 
   public String toString() {
@@ -17,6 +18,7 @@ public String toString() {
     sb.append("    method: ").append(method).append("\n");
     sb.append("    times: ").append(times).append("\n");
     sb.append("    parameters: ").append(parameters).append("\n");
+    sb.append("    requestOptions: ").append(requestOptions).append("\n");
     sb.append("    expected: ").append(expected).append("\n");
     sb.append("}");
     return sb.toString();

generators/src/main/java/com/algolia/codegen/cts/tests/TestsClient.java

@@ -138,6 +138,26 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
               // default to true because most api calls are asynchronous
               testOut.put("isAsyncMethod", (boolean) ope.vendorExtensions.getOrDefault("x-asynchronous-helper", true));
 
+              if (step.requestOptions != null) {
+                stepOut.put("hasRequestOptions", true);
+                Map<String, Object> requestOptions = new HashMap<>();
+                if (step.requestOptions.queryParameters != null) {
+                  Map<String, Object> queryParameters = new HashMap<>();
+                  paramsType.enhanceParameters(step.requestOptions.queryParameters, queryParameters);
+                  requestOptions.put("queryParameters", queryParameters);
+                }
+                if (step.requestOptions.headers != null) {
+                  Map<String, Object> headers = new HashMap<>();
+                  // convert the headers to an acceptable type
+                  paramsType.enhanceParameters(new HashMap<String, Object>(step.requestOptions.headers), headers);
+                  requestOptions.put("headers", headers);
+                }
+                requestOptions.put("readTimeout", step.requestOptions.readTimeout);
+                requestOptions.put("writeTimeout", step.requestOptions.writeTimeout);
+                requestOptions.put("connectTimeout", step.requestOptions.connectTimeout);
+                stepOut.put("requestOptions", requestOptions);
+              }
+
               methodCount++;
             }
 

generators/src/main/java/com/algolia/codegen/cts/tests/TestsRequest.java

@@ -170,6 +170,9 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
               paramsType.enhanceParameters(new HashMap<String, Object>(req.requestOptions.headers), headers);
               requestOptions.put("headers", headers);
             }
+            requestOptions.put("readTimeout", req.requestOptions.readTimeout);
+            requestOptions.put("writeTimeout", req.requestOptions.writeTimeout);
+            requestOptions.put("connectTimeout", req.requestOptions.connectTimeout);
             test.put("requestOptions", requestOptions);
           }
 

templates/java/tests/client/client.mustache

@@ -12,6 +12,7 @@ import com.algolia.api.{{client}};
 import com.algolia.model.{{import}}.*;
 import com.algolia.config.*;
 import java.util.*;
+import java.time.Duration;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

templates/java/tests/e2e/e2e.mustache

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import io.github.cdimascio.dotenv.Dotenv;
 import java.util.*;
+import java.time.Duration;
 import org.junit.jupiter.api.*;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;

templates/java/tests/method.mustache

@@ -5,4 +5,13 @@ client.{{method}}({{#parametersWithDataType}}{{> tests/generateParams}}{{^-last}
   {{#requestOptions.headers.parametersWithDataType}}
     .addExtraHeader("{{{key}}}", "{{{value}}}")
   {{/requestOptions.headers.parametersWithDataType}}
+  {{#requestOptions.readTimeout}}
+    .setReadTimeout(Duration.ofMillis({{requestOptions.readTimeout}}L))
+  {{/requestOptions.readTimeout}}
+  {{#requestOptions.connectTimeout}}
+    .setConnectTimeout(Duration.ofMillis({{requestOptions.connectTimeout}}L))
+  {{/requestOptions.connectTimeout}}
+  {{#requestOptions.writeTimeout}}
+    .setWriteTimeout(Duration.ofMillis({{requestOptions.writeTimeout}}L))
+  {{/requestOptions.writeTimeout}}
 {{/hasRequestOptions}})

templates/java/tests/requests/requests.mustache

@@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import java.util.*;
+import java.time.Duration;
 import org.junit.jupiter.api.*;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;

tests/CTS/client/ingestion/api.json

@@ -76,5 +76,52 @@
         }
       }
     ]
+  },
+  {
+    "testName": "endpoint level timeout",
+    "steps": [
+      {
+        "type": "method",
+        "method": "validateSourceBeforeUpdate",
+        "parameters": {
+          "sourceID": "6c02aeb1-775e-418e-870b-1faccd4b2c0f",
+          "sourceUpdate": {
+            "name": "newName"
+          }
+        },
+        "expected": {
+          "type": "timeouts",
+          "match": {
+            "connectTimeout": 180000,
+            "responseTimeout": 180000
+          }
+        }
+      }
+    ]
+  },
+  {
+    "testName": "can override endpoint level timeout",
+    "steps": [
+      {
+        "type": "method",
+        "method": "validateSourceBeforeUpdate",
+        "parameters": {
+          "sourceID": "6c02aeb1-775e-418e-870b-1faccd4b2c0f",
+          "sourceUpdate": {
+            "name": "newName"
+          }
+        },
+        "requestOptions": {
+          "connectTimeout": 1234
+        },
+        "expected": {
+          "type": "timeouts",
+          "match": {
+            "connectTimeout": 1234,
+            "responseTimeout": 180000
+          }
+        }
+      }
+    ]
   }
 ]