omg

Author: millotp

scripts/cts/testServer/algoliaMock.ts

@@ -38,11 +38,15 @@ function addRoutes(app: Express): void {
     });
   });
 
+  // languages that just put the response in a map, there is no strict parsing or types to match.
+  const isLaxLanguage = (lang: string) => {
+    return lang === 'dart' || lang === 'javascript' || lang === 'python' || lang === 'php';
+  };
+
   app.get('/1/indexes/:indexName/settings', (req, res) => {
     const lang = req.params.indexName.match(/^cts_e2e_unknownField_(.*)$/)?.[1] as string;
     let unknown = {};
-    if (lang !== 'javascript' && lang !== 'python') {
-      // js and python just put the response in a map, there is no strict parsing.
+    if (!isLaxLanguage(lang)) {
       unknown = {
         unknownFieldNameThatWillNeverBeAddedToTheSpecIHope: 'hello',
       };
@@ -59,7 +63,7 @@ function addRoutes(app: Express): void {
   app.get('/1/indexes/:indexName/rules/:objectID', (req, res) => {
     const lang = req.params.indexName.match(/^cts_e2e_unknownFieldNested_(.*)$/)?.[1] as string;
     let unknown = {};
-    if (lang !== 'javascript' && lang !== 'python') {
+    if (!isLaxLanguage(lang)) {
       unknown = {
         unknownFieldNameThatWillNeverBeAddedToTheSpecIHope: 'hello',
       };

templates/kotlin/tests/client/tests.mustache

@@ -37,7 +37,7 @@ fun `{{#lambda.replaceBacktick}}{{{testName}}}{{/lambda.replaceBacktick}}`() = r
                 assertEquals({{#match}}{{> tests/param_value}}{{/match}}, it.url.host);
             {{/testHost}}        
           }{{/testResponse}}{{#testResponse}}
-            {{#isHelper}}response = {
+            response = {
             {{^match.isPrimitive}}
               assertNotNull(it)
               JSONAssert.assertEquals("""{{{match.value}}}""", Json.encodeToString(Json.encodeToJsonElement(it)), JSONCompareMode.STRICT)
@@ -50,11 +50,7 @@ fun `{{#lambda.replaceBacktick}}{{{testName}}}{{/lambda.replaceBacktick}}`() = r
                 assertEquals({{#match}}{{> tests/param_value}}{{/match}}, it)
               {{/match.isNull}}
             {{/match.isPrimitive}}
-            }{{/isHelper}}
-            {{^isHelper}}response = {
-                val response = Json.encodeToString(it)
-                assertEquals({{#match}}{{> tests/param_value}}{{/match}}, response)
-            }{{/isHelper}}
+            }
             {{/testResponse}}
     )
     {{/isMethod}}

templates/swift/tests/client/method.mustache

@@ -1,13 +1,9 @@
-{{#hasResponse}}let response{{#isGeneric}}: Response<{{#lambda.prefix}}{{{returnType}}}{{/lambda.prefix}}<{{#lambda.prefix}}Hit{{/lambda.prefix}}>>{{/isGeneric}} = {{> tests/method}}{{/hasResponse}}
-{{^hasResponse}}let _{{#isGeneric}}: Response<{{#lambda.prefix}}{{{returnType}}}{{/lambda.prefix}}<{{#lambda.prefix}}Hit{{/lambda.prefix}}>>{{/isGeneric}} = {{> tests/method}}{{/hasResponse}}
+{{#hasResponse}}let response{{#isGeneric}}: {{#useEchoRequester}}Response<{{/useEchoRequester}}{{#lambda.prefix}}{{{returnType}}}{{/lambda.prefix}}<{{#lambda.prefix}}Hit{{/lambda.prefix}}>{{#useEchoRequester}}>{{/useEchoRequester}}{{/isGeneric}} = {{> tests/method}}{{/hasResponse}}
+{{^hasResponse}}let _ = {{> tests/method}}{{/hasResponse}}
 {{^isHelper}}
 {{^isBenchmark}}
-let responseBodyData = try XCTUnwrap(response.bodyData)
 {{#useEchoRequester}}
-let echoResponse = try CodableHelper.jsonDecoder.decode(EchoResponse.self, from: responseBodyData)
-{{/useEchoRequester}}
-{{^useEchoRequester}}
-let responseBodyJSON = try XCTUnwrap(responseBodyData.jsonString)
+let echoResponse = try CodableHelper.jsonDecoder.decode(EchoResponse.self, from: XCTUnwrap(response.bodyData))
 {{/useEchoRequester}}
 {{/isBenchmark}}
 {{/isHelper}}

templates/swift/tests/client/tests.mustache

@@ -56,7 +56,7 @@
           {{^isHelper}}
             let comparableData = "{{#lambda.escapeQuotes}}{{{match.value}}}{{/lambda.escapeQuotes}}".data(using: .utf8)
             let comparableJSON = try XCTUnwrap(comparableData?.jsonString)
-            XCTAssertEqual(comparableJSON, responseBodyJSON);
+            XCTAssertEqual(comparableJSON, String(data: try CodableHelper.jsonEncoder.encode(response), encoding: .utf8)!);
           {{/isHelper}}
         {{/testResponse}}
         {{#shouldScope}}

templates/swift/tests/method.mustache

@@ -1,4 +1,4 @@
-try {{#isAsyncMethod}}await {{/isAsyncMethod}}client.{{method}}{{^isHelper}}{{^isGuide}}WithHTTPInfo{{/isGuide}}{{/isHelper}}({{#hasParams}}{{#parametersWithDataType}}{{> tests/generateParams }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}{{/hasParams}}{{#hasRequestOptions}}{{#requestOptions}}, requestOptions: RequestOptions(
+try {{#isAsyncMethod}}await {{/isAsyncMethod}}client.{{method}}{{#useEchoRequester}}WithHTTPInfo{{/useEchoRequester}}({{#hasParams}}{{#parametersWithDataType}}{{> tests/generateParams }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}{{/hasParams}}{{#hasRequestOptions}}{{#requestOptions}}, requestOptions: RequestOptions(
   {{#headers}}
   headers: [{{#parametersWithDataType}}"{{key}}": {{> tests/paramValue }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}]{{#queryParameters}},{{/queryParameters}}
   {{/headers}}