Merge branch '3.2.x'

This commit is contained in:
Moritz Halbritter
2024-02-12 10:19:46 +01:00
50 changed files with 68 additions and 8 deletions

View File

@@ -204,6 +204,7 @@ class ImportsContextCustomizer implements ContextCustomizer {
registry.removeBeanDefinition(ImportsConfiguration.BEAN_NAME);
}
catch (NoSuchBeanDefinitionException ex) {
// Ignore
}
}

View File

@@ -167,6 +167,7 @@ public class SpringBootContextLoader extends AbstractContextLoader implements Ao
mainMethod = ReflectionUtils.findMethod(kotlinClass, "main", String[].class);
}
catch (ClassNotFoundException ex) {
// Ignore
}
}
Assert.state(mainMethod != null || useMainMethod == UseMainMethod.WHEN_AVAILABLE,
@@ -555,6 +556,7 @@ public class SpringBootContextLoader extends AbstractContextLoader implements Ao
}
}
catch (AbandonedRunException ex) {
// Ignore
}
catch (Exception ex) {
if (this.failedContexts.size() == 1) {

View File

@@ -203,6 +203,7 @@ public class ApplicationContextAssert<C extends ApplicationContext>
getApplicationContext(), name, bean));
}
catch (NoSuchBeanDefinitionException ex) {
// Ignore
}
return this;
}

View File

@@ -316,6 +316,7 @@ public abstract class AbstractJsonMarshalTester<T> {
closeable.close();
}
catch (IOException ex) {
// Ignore
}
}

View File

@@ -1095,6 +1095,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
failWithMessage("Expecting no JSON path \"%s\"", this.expression);
}
catch (PathNotFoundException ex) {
// Ignore
}
}