Skip to content

Commit 2a59b67

Browse files
committed
prepare for #3844
1 parent 6215f28 commit 2a59b67

File tree

13 files changed

+20
-20
lines changed

13 files changed

+20
-20
lines changed

generators/src/main/java/com/algolia/codegen/cts/lambda/DynamicSnippetLambda.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio
7676
Map<String, Object> context = (Map<String, Object>) fragment.context();
7777
snippet.addMethodCall(context, paramsType, operation);
7878

79-
writer.write(adaptor.compileTemplate(executor, context, "tests/client/method.mustache"));
79+
writer.write(adaptor.compileTemplate(executor, context, "tests/method.mustache"));
8080
}
8181
}

generators/src/main/java/com/algolia/codegen/cts/manager/CSharpCTSManager.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
2929
@Override
3030
public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
3131
supportingFiles.add(new SupportingFile("snippets/src.csproj.mustache", output + "/csharp/src/src.csproj"));
32-
supportingFiles.add(new SupportingFile("snippets/Program.mustache", output + "/csharp/src/Program.cs"));
3332
supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", output + "/csharp/.gitignore"));
3433
supportingFiles.add(new SupportingFile("snippets/Algolia.mustache", output + "/csharp/Algolia.sln"));
3534
supportingFiles.add(new SupportingFile("snippets/dotnet-tools.mustache", output + "/csharp/.config/dotnet-tools.json"));
35+
36+
if (output.equals("snippets")) {
37+
supportingFiles.add(new SupportingFile("snippets/Program.mustache", output + "/csharp/src/Program.cs"));
38+
}
3639
}
3740

3841
@Override

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public class Snippet {
1313

1414
public String testName;
1515
public boolean isSnippet;
16-
public boolean ignoreResponse;
1716

1817
public String method;
1918
public Map<String, Object> parameters;
@@ -34,7 +33,6 @@ public String toString() {
3433
sb.append("class Request {\n");
3534
sb.append(" testName: ").append(testName).append("\n");
3635
sb.append(" isSnippet").append(isSnippet).append("\n");
37-
sb.append(" ignoreResponse").append(ignoreResponse).append("\n");
3836
sb.append(" method: ").append(method).append("\n");
3937
sb.append(" parameters: ").append(parameters).append("\n");
4038
sb.append(" requestOptions: ").append(requestOptions).append("\n");
@@ -75,13 +73,10 @@ public void addMethodCall(Map<String, Object> context, ParametersWithDataType pa
7573

7674
// Determines whether the endpoint is expected to return a response payload deserialized
7775
// and therefore a variable to store it into.
78-
if (!ignoreResponse) {
79-
context.put("hasResponse", true);
80-
81-
for (CodegenResponse response : ope.responses) {
82-
if (response.code.equals("204")) {
83-
context.put("hasResponse", false);
84-
}
76+
context.put("hasResponse", true);
77+
for (CodegenResponse response : ope.responses) {
78+
if (response.code.equals("204")) {
79+
context.put("hasResponse", false);
8580
}
8681
}
8782

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
8282
ParametersWithDataType paramsType = new ParametersWithDataType(models, language, client, false);
8383

8484
bundle.put("e2eApiKey", client.equals("monitoring") ? "MONITORING_API_KEY" : "ALGOLIA_ADMIN_KEY");
85+
bundle.put("useEchoRequester", true);
8586

8687
for (Map.Entry<String, CodegenOperation> entry : operations.entrySet()) {
8788
String operationId = entry.getKey();

scripts/buildLanguages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B
2424
}
2525
break;
2626
case 'go':
27-
await run('go build ./...', { cwd, language });
27+
await run('go build -o /dev/null ./...', { cwd, language });
2828
break;
2929
case 'javascript':
3030
await run('YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install', { cwd, language });
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{^isError}}{{#hasResponse}}_req = {{/hasResponse}}{{/isError}}{{^isSyncClient}}await {{/isSyncClient}}_client.{{#lambda.snakecase}}{{{method}}}{{/lambda.snakecase}}{{#useEchoRequester}}_with_http_info{{/useEchoRequester}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}} request_options={ {{#requestOptions.headers.parameters}}"headers":loads("""{{{.}}}"""),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}"query_parameters":loads("""{{{.}}}"""),{{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
1+
{{^isError}}{{#hasResponse}}_req = {{/hasResponse}}{{/isError}}{{> tests/method}}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{^isSyncClient}}await {{/isSyncClient}}_client.{{#lambda.snakecase}}{{{method}}}{{/lambda.snakecase}}{{#useEchoRequester}}_with_http_info{{/useEchoRequester}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}} request_options={ {{#requestOptions.headers.parameters}}"headers":loads("""{{{.}}}"""),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}"query_parameters":loads("""{{{.}}}"""),{{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})

templates/ruby/snippets/method.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ def snippet_for_{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}{{testIndex}
1414
{{> snippets/init}}
1515

1616
# Call the API
17-
{{#hasResponse}}response = {{/hasResponse}}client.{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}{ {{#requestOptions.headers.parameters}}:header_params => JSON.parse('{{{.}}}', :symbolize_names => true),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}:query_params => JSON.parse('{{{.}}}', :symbolize_names => true){{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
18-
17+
{{#hasResponse}}response = {{/hasResponse}}{{> tests/method}}
18+
1919
# >LOG
2020
{{#hasResponse}}
2121
# use the class directly
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{^isError}}{{#hasResponse}}req = {{/hasResponse}}{{/isError}}client.{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}{{#useEchoRequester}}_with_http_info{{/useEchoRequester}}{{#returnsBoolean}}?{{/returnsBoolean}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}{ {{#requestOptions.headers.parameters}}:header_params => JSON.parse('{{{.}}}', :symbolize_names => true),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}:query_params => JSON.parse('{{{.}}}', :symbolize_names => true){{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
1+
{{^isError}}{{#hasResponse}}req = {{/hasResponse}}{{/isError}}{{> tests/method}}

templates/ruby/tests/e2e/e2e.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Test{{#lambda.pascalcase}}{{{client}}}{{/lambda.pascalcase}}E2E < Test::Un
2020
{{#tests}}
2121
# {{{testName}}}
2222
def test_{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}{{testIndex}}
23-
res = @client.{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}_with_http_info({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}{ {{#requestOptions.headers.parameters}}:header_params => JSON.parse('{{{.}}}', :symbolize_names => true),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}:query_params => JSON.parse('{{{.}}}', :symbolize_names => true){{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
23+
res = @{{> tests/method}}
2424

2525
{{#response}}
2626
{{#statusCode}}

0 commit comments

Comments
 (0)