mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.3.x' into 2.4.x
Closes gh-26450
This commit is contained in:
commit
970f933806
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2021 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -172,13 +172,9 @@ class HandlerTests {
|
|||||||
TestJarCreator.createTestJar(testJar);
|
TestJarCreator.createTestJar(testJar);
|
||||||
URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler);
|
URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler);
|
||||||
JarURLConnection connection = (JarURLConnection) url.openConnection();
|
JarURLConnection connection = (JarURLConnection) url.openConnection();
|
||||||
JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile());
|
try (JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile())) {
|
||||||
try {
|
|
||||||
assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar);
|
assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar);
|
||||||
}
|
}
|
||||||
finally {
|
|
||||||
jarFile.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -187,13 +183,9 @@ class HandlerTests {
|
|||||||
TestJarCreator.createTestJar(testJar);
|
TestJarCreator.createTestJar(testJar);
|
||||||
URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler);
|
URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler);
|
||||||
JarURLConnection connection = (JarURLConnection) url.openConnection();
|
JarURLConnection connection = (JarURLConnection) url.openConnection();
|
||||||
JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile());
|
try (JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile())) {
|
||||||
try {
|
|
||||||
assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar);
|
assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar);
|
||||||
}
|
}
|
||||||
finally {
|
|
||||||
jarFile.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void assertStandardAndCustomHandlerUrlsAreEqual(String context, String spec) throws MalformedURLException {
|
private void assertStandardAndCustomHandlerUrlsAreEqual(String context, String spec) throws MalformedURLException {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2019 the original author or authors.
|
* Copyright 2012-2021 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -49,20 +49,12 @@ class SampleIntegrationParentApplicationTests {
|
|||||||
void testVanillaExchange(@TempDir Path temp) throws Exception {
|
void testVanillaExchange(@TempDir Path temp) throws Exception {
|
||||||
File inputDir = new File(temp.toFile(), "input");
|
File inputDir = new File(temp.toFile(), "input");
|
||||||
File outputDir = new File(temp.toFile(), "output");
|
File outputDir = new File(temp.toFile(), "output");
|
||||||
ConfigurableApplicationContext app = SpringApplication.run(SampleParentContextApplication.class,
|
try (ConfigurableApplicationContext app = SpringApplication.run(SampleParentContextApplication.class,
|
||||||
"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir);
|
"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir)) {
|
||||||
try {
|
try (ConfigurableApplicationContext producer = SpringApplication.run(ProducerApplication.class,
|
||||||
ConfigurableApplicationContext producer = SpringApplication.run(ProducerApplication.class,
|
"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir, "World")) {
|
||||||
"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir, "World");
|
|
||||||
try {
|
|
||||||
awaitOutputContaining(outputDir, "Hello World");
|
awaitOutputContaining(outputDir, "Hello World");
|
||||||
}
|
}
|
||||||
finally {
|
|
||||||
producer.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
finally {
|
|
||||||
app.close();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user