Skip to content

Commit 516fac4

Browse files
committed
more tests
1 parent 4731c8d commit 516fac4

33 files changed

+1850
-599
lines changed

it/xds-client/src/test/java/com/linecorp/armeria/xds/client/endpoint/TransportSocketMatchUtilTest.java

Lines changed: 203 additions & 90 deletions
Large diffs are not rendered by default.

it/xds-client/src/test/java/com/linecorp/armeria/xds/it/CertificateValidationContextTest.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ protected void configure(ServerBuilder sb) {
7373
@RegisterExtension
7474
static final SelfSignedCertificateExtension certificate2 = new SelfSignedCertificateExtension();
7575

76+
//language=YAML
7677
private static final String sdsBootstrapYaml =
7778
"""
7879
dynamic_resources:
@@ -150,6 +151,7 @@ void invalidCaCertificateFile(@TempDir File tempDir) throws Exception {
150151
final File invalidCaFile = new File(tempDir, "invalid_ca.pem");
151152
Files.writeString(invalidCaFile.toPath(), "this is not a valid CA certificate");
152153

154+
//language=YAML
153155
final String secretYaml =
154156
"""
155157
name: validation-certs
@@ -184,6 +186,7 @@ void invalidCaCertificateFile(@TempDir File tempDir) throws Exception {
184186

185187
@Test
186188
void invalidSpkiPinFailsSnapshot() throws Exception {
189+
//language=YAML
187190
final String secretYaml =
188191
"""
189192
name: validation-certs
@@ -218,6 +221,7 @@ void invalidSpkiPinFailsSnapshot() throws Exception {
218221

219222
@Test
220223
void invalidCertHashPinFailsSnapshot() throws Exception {
224+
//language=YAML
221225
final String secretYaml =
222226
"""
223227
name: validation-certs
@@ -255,8 +259,9 @@ void multipleCaCertificates(@TempDir File tempDir) throws Exception {
255259
final File multiCaFile = new File(tempDir, "multi_ca.pem");
256260
final String cert1Content = Files.readString(certificate1.certificateFile().toPath());
257261
final String cert2Content = Files.readString(certificate2.certificateFile().toPath());
258-
Files.writeString(multiCaFile.toPath(), cert1Content + "\n" + cert2Content);
262+
Files.writeString(multiCaFile.toPath(), cert1Content + '\n' + cert2Content);
259263

264+
//language=YAML
260265
final String secretYaml =
261266
"""
262267
name: validation-certs
@@ -304,6 +309,7 @@ void validationContextWithSds(@TempDir File tempDir) throws Exception {
304309
final File caFile = new File(tempDir, "ca.pem");
305310
Files.copy(certificate2.certificateFile().toPath(), caFile.toPath());
306311

312+
//language=YAML
307313
final String secretYaml =
308314
"""
309315
name: validation-certs
@@ -343,6 +349,7 @@ void validationContextWithSds(@TempDir File tempDir) throws Exception {
343349
}
344350
}
345351

352+
//language=YAML
346353
private static final String combinedValidationContextBootstrap =
347354
"""
348355
dynamic_resources:
@@ -422,6 +429,7 @@ void mergeValidationContextWithBase(@TempDir File tempDir) throws Exception {
422429
final File caFile = new File(tempDir, "ca.pem");
423430
Files.copy(certificate2.certificateFile().toPath(), caFile.toPath());
424431

432+
//language=YAML
425433
final String secretYaml =
426434
"""
427435
name: validation-certs
@@ -469,6 +477,7 @@ void overrideBaseContextFields(@TempDir File tempDir) throws Exception {
469477
final File caFile = new File(tempDir, "ca.pem");
470478
Files.copy(certificate2.certificateFile().toPath(), caFile.toPath());
471479

480+
//language=YAML
472481
final String secretYaml =
473482
"""
474483
name: validation-certs

0 commit comments

Comments
 (0)