Skip to content

Commit a2ab6ae

Browse files
trivikrtrivikr
committed
test: check for src prefix
1 parent 35bbb0e commit a2ab6ae

File tree

7 files changed

+112
-102
lines changed

7 files changed

+112
-102
lines changed

‎codegen/smithy-aws-typescript-codegen/src/test/java/software/amazon/smithy/aws/typescript/codegen/AddAwsAuthPluginTest.java

+22-21
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import software.amazon.smithy.build.PluginContext;
1010
import software.amazon.smithy.model.Model;
1111
import software.amazon.smithy.model.node.Node;
12+
import software.amazon.smithy.typescript.codegen.CodegenUtils;
1213
import software.amazon.smithy.typescript.codegen.TypeScriptCodegenPlugin;
1314

1415
public class AddAwsAuthPluginTest {
@@ -37,18 +38,18 @@ public void awsClient() {
3738
containsString(AwsDependency.CREDENTIAL_PROVIDER_NODE.packageName));
3839

3940
// Check config interface fields
40-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("credentialDefaultProvider?"));
41-
assertThat(manifest.getFileString("NotSameClient.ts").get(), not(containsString("signingName")));
41+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("credentialDefaultProvider?"));
42+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), not(containsString("signingName")));
4243

4344
// Check config files
44-
assertThat(manifest.getFileString("runtimeConfig.ts").get(),
45+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.ts").get(),
4546
containsString("decorateDefaultCredentialProvider"));
46-
assertThat(manifest.getFileString("runtimeConfig.browser.ts").get(), containsString("Credential is missing"));
47-
assertThat(manifest.getFileString("runtimeConfig.shared.ts").get(), not(containsString("signingName:")));
47+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.browser.ts").get(), containsString("Credential is missing"));
48+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.shared.ts").get(), not(containsString("signingName:")));
4849

4950
// Check the config resolution and middleware plugin
50-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("resolveAwsAuthConfig"));
51-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("getAwsAuthPlugin"));
51+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("resolveAwsAuthConfig"));
52+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("getAwsAuthPlugin"));
5253
}
5354

5455
@Test
@@ -76,18 +77,18 @@ public void sigV4GenericClient() {
7677
containsString(AwsDependency.CREDENTIAL_PROVIDER_NODE.packageName));
7778

7879
// Check config interface fields
79-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("credentialDefaultProvider?"));
80-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("signingName?"));
80+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("credentialDefaultProvider?"));
81+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("signingName?"));
8182

8283
// Check config files
83-
assertThat(manifest.getFileString("runtimeConfig.ts").get(),
84+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.ts").get(),
8485
containsString("decorateDefaultCredentialProvider"));
85-
assertThat(manifest.getFileString("runtimeConfig.browser.ts").get(), containsString("Credential is missing"));
86-
assertThat(manifest.getFileString("runtimeConfig.shared.ts").get(), containsString("signingName:"));
86+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.browser.ts").get(), containsString("Credential is missing"));
87+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.shared.ts").get(), containsString("signingName:"));
8788

8889
// Check the config resolution and middleware plugin
89-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("resolveSigV4AuthConfig"));
90-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("getSigV4AuthPlugin"));
90+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("resolveSigV4AuthConfig"));
91+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("getSigV4AuthPlugin"));
9192
}
9293

9394
@Test
@@ -115,17 +116,17 @@ public void notSigV4GenericClient() {
115116
not(containsString(AwsDependency.CREDENTIAL_PROVIDER_NODE.packageName)));
116117

117118
// Check config interface fields
118-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), not(containsString("credentialDefaultProvider?")));
119-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), not(containsString("signingName?")));
119+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), not(containsString("credentialDefaultProvider?")));
120+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), not(containsString("signingName?")));
120121

121122
// Check config files
122-
assertThat(manifest.getFileString("runtimeConfig.ts").get(),
123+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.ts").get(),
123124
not(containsString("decorateDefaultCredentialProvider")));
124-
assertThat(manifest.getFileString("runtimeConfig.browser.ts").get(), not(containsString("Credential is missing")));
125-
assertThat(manifest.getFileString("runtimeConfig.shared.ts").get(), not(containsString("signingName:")));
125+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.browser.ts").get(), not(containsString("Credential is missing")));
126+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.shared.ts").get(), not(containsString("signingName:")));
126127

127128
// Check the config resolution and middleware plugin
128-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), not(containsString("resolveSigV4AuthConfig")));
129-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), not(containsString("resolveAwsV4AuthConfig")));
129+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), not(containsString("resolveSigV4AuthConfig")));
130+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), not(containsString("resolveAwsV4AuthConfig")));
130131
}
131132
}

‎codegen/smithy-aws-typescript-codegen/src/test/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfigTest.java

+16-15
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import software.amazon.smithy.build.PluginContext;
1010
import software.amazon.smithy.model.Model;
1111
import software.amazon.smithy.model.node.Node;
12+
import software.amazon.smithy.typescript.codegen.CodegenUtils;
1213
import software.amazon.smithy.typescript.codegen.TypeScriptCodegenPlugin;
1314
import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
1415

@@ -40,13 +41,13 @@ public void awsClient() {
4041
containsString(TypeScriptDependency.CONFIG_RESOLVER.packageName));
4142

4243
// Check config interface fields
43-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("serviceId?:"));
44-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("region?:"));
44+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("serviceId?:"));
45+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("region?:"));
4546

4647
// Check config files
47-
assertThat(manifest.getFileString("runtimeConfig.shared.ts").get(), containsString("serviceId: config?.serviceId ?? \"Not Same\""));
48-
assertThat(manifest.getFileString("runtimeConfig.browser.ts").get(), containsString("region: config?.region ?? invalidProvider"));
49-
assertThat(manifest.getFileString("runtimeConfig.ts").get(), containsString("region: config?.region ?? loadNodeConfig"));
48+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.shared.ts").get(), containsString("serviceId: config?.serviceId ?? \"Not Same\""));
49+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.browser.ts").get(), containsString("region: config?.region ?? invalidProvider"));
50+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.ts").get(), containsString("region: config?.region ?? loadNodeConfig"));
5051
}
5152

5253
@Test
@@ -76,13 +77,13 @@ public void sigV4GenericClient() {
7677
containsString(TypeScriptDependency.CONFIG_RESOLVER.packageName));
7778

7879
// Check config interface fields
79-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), not(containsString("serviceId?:")));
80-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("region?:"));
80+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), not(containsString("serviceId?:")));
81+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("region?:"));
8182

8283
// Check config files
83-
assertThat(manifest.getFileString("runtimeConfig.shared.ts").get(), not(containsString("serviceId:")));
84-
assertThat(manifest.getFileString("runtimeConfig.browser.ts").get(), containsString("region: config?.region ?? invalidProvider"));
85-
assertThat(manifest.getFileString("runtimeConfig.ts").get(), containsString("region: config?.region ?? loadNodeConfig"));
84+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.shared.ts").get(), not(containsString("serviceId:")));
85+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.browser.ts").get(), containsString("region: config?.region ?? invalidProvider"));
86+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.ts").get(), containsString("region: config?.region ?? loadNodeConfig"));
8687
}
8788

8889
@Test
@@ -112,12 +113,12 @@ public void notSigV4GenericClient() {
112113
containsString(TypeScriptDependency.CONFIG_RESOLVER.packageName));
113114

114115
// Check config interface fields
115-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), not(containsString("serviceId?:")));
116-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), not(containsString("region?:")));
116+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), not(containsString("serviceId?:")));
117+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), not(containsString("region?:")));
117118

118119
// Check config files
119-
assertThat(manifest.getFileString("runtimeConfig.shared.ts").get(), not(containsString("serviceId:")));
120-
assertThat(manifest.getFileString("runtimeConfig.browser.ts").get(), not(containsString("region:")));
121-
assertThat(manifest.getFileString("runtimeConfig.ts").get(), not(containsString("region:")));
120+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.shared.ts").get(), not(containsString("serviceId:")));
121+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.browser.ts").get(), not(containsString("region:")));
122+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.ts").get(), not(containsString("region:")));
122123
}
123124
}

‎codegen/smithy-aws-typescript-codegen/src/test/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPluginsTest.java

+22-21
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import software.amazon.smithy.build.PluginContext;
1010
import software.amazon.smithy.model.Model;
1111
import software.amazon.smithy.model.node.Node;
12+
import software.amazon.smithy.typescript.codegen.CodegenUtils;
1213
import software.amazon.smithy.typescript.codegen.TypeScriptCodegenPlugin;
1314

1415
public class AddBuiltinPluginsTest {
@@ -33,13 +34,13 @@ public void awsClient() {
3334
new TypeScriptCodegenPlugin().execute(context);
3435

3536
// Check the config resolution and middleware plugin
36-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("resolveRegionConfig"));
37-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("resolveEndpointsConfig"));
38-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("resolveRetryConfig"));
39-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("getRetryPlugin"));
40-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("getContentLengthPlugin"));
41-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("getHostHeaderPlugin"));
42-
assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("getLoggerPlugin"));
37+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("resolveRegionConfig"));
38+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("resolveEndpointsConfig"));
39+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("resolveRetryConfig"));
40+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("getRetryPlugin"));
41+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("getContentLengthPlugin"));
42+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("getHostHeaderPlugin"));
43+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/NotSameClient.ts").get(), containsString("getLoggerPlugin"));
4344
}
4445

4546
@Test
@@ -63,13 +64,13 @@ public void sigV4GenericClient() {
6364
new TypeScriptCodegenPlugin().execute(context);
6465

6566
// Check the config resolution and middleware plugin
66-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("resolveRegionConfig"));
67-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("resolveCustomEndpointsConfig"));
68-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("resolveRetryConfig"));
69-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("getRetryPlugin"));
70-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("getContentLengthPlugin"));
71-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("getHostHeaderPlugin"));
72-
assertThat(manifest.getFileString("SsdkExampleSigV4Client.ts").get(), containsString("getLoggerPlugin"));
67+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("resolveRegionConfig"));
68+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("resolveCustomEndpointsConfig"));
69+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("resolveRetryConfig"));
70+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("getRetryPlugin"));
71+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("getContentLengthPlugin"));
72+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("getHostHeaderPlugin"));
73+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleSigV4Client.ts").get(), containsString("getLoggerPlugin"));
7374
}
7475

7576
@Test
@@ -93,12 +94,12 @@ public void notSigV4GenericClient() {
9394
new TypeScriptCodegenPlugin().execute(context);
9495

9596
// Check the config resolution and middleware plugin
96-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), not(containsString("resolveRegionConfig")));
97-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), containsString("resolveCustomEndpointsConfig"));
98-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), containsString("resolveRetryConfig"));
99-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), containsString("getRetryPlugin"));
100-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), containsString("getContentLengthPlugin"));
101-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), containsString("getHostHeaderPlugin"));
102-
assertThat(manifest.getFileString("SsdkExampleClient.ts").get(), containsString("getLoggerPlugin"));
97+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), not(containsString("resolveRegionConfig")));
98+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), containsString("resolveCustomEndpointsConfig"));
99+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), containsString("resolveRetryConfig"));
100+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), containsString("getRetryPlugin"));
101+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), containsString("getContentLengthPlugin"));
102+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), containsString("getHostHeaderPlugin"));
103+
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/SsdkExampleClient.ts").get(), containsString("getLoggerPlugin"));
103104
}
104105
}

0 commit comments

Comments
 (0)