root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish "Add testing for AbstractFailureAnalyzer.findCause" 

See gh-27862
This commit is contained in:
Stephane Nicoll 2021-09-21 10:05:15 +02:00
parent a2eed676a2
commit d68b6bb2f1
2 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzer.java
View File

@ -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.
@ -31,7 +31,6 @@ public abstract class AbstractFailureAnalyzer<T extends Throwable> implements Fa
@Override @Override
public FailureAnalysis analyze(Throwable failure) { public FailureAnalysis analyze(Throwable failure) {
T cause = findCause(failure, getCauseType()); T cause = findCause(failure, getCauseType());
return (cause != null) ? analyze(failure, cause) : null; return (cause != null) ? analyze(failure, cause) : null;
} }

64
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzerTests.java
View File

@ -16,44 +16,66 @@
package org.springframework.boot.diagnostics; package org.springframework.boot.diagnostics;
import org.junit.jupiter.api.BeforeEach; import java.io.IOException;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link AbstractFailureAnalyzer}.
*
* @author Kim Jung Bin
* @author Stephane Nicoll
*/
class AbstractFailureAnalyzerTests { class AbstractFailureAnalyzerTests {
private FailureAnalyzerConcrete failureAnalyzerConcrete; private final TestFailureAnalyzer failureAnalyzer = new TestFailureAnalyzer();
@BeforeEach @Test
void configureFailureAnalyzer() { void findCauseWithNullException() {
this.failureAnalyzerConcrete = new FailureAnalyzerConcrete(); assertThat(this.failureAnalyzer.findCause(null, Throwable.class)).isNull();
} }
@Test @Test
void findCauseExtendsThrowable() { void findCauseWithDirectExactMatch() {
ThrowableExtendsException ex = new ThrowableExtendsException(); TestException ex = new TestException();
assertThat(this.failureAnalyzerConcrete.findCause(ex, Throwable.class).getClass()).isNotNull(); assertThat(this.failureAnalyzer.findCause(ex, TestException.class)).isEqualTo(ex);
} }
@Test @Test
void findCauseExtendsOtherException() { void findCauseWithDirectSubClass() {
ExtendsThrowableExtendsException ex = new ExtendsThrowableExtendsException(); SpecificTestException ex = new SpecificTestException();
assertThat(this.failureAnalyzerConcrete.findCause(ex, ThrowableExtendsException.class).getClass()).isNotNull(); assertThat(this.failureAnalyzer.findCause(ex, TestException.class)).isEqualTo(ex);
} }
@Test @Test
void findCauseOtherException() { void findCauseWitNestedAndExactMatch() {
ThrowableExtendsException ex = new ThrowableExtendsException(); TestException ex = new TestException();
assertThat(this.failureAnalyzerConcrete.findCause(ex, OtherException.class)).isNull(); assertThat(this.failureAnalyzer.findCause(new IllegalArgumentException(new IllegalStateException(ex)),
TestException.class)).isEqualTo(ex);
} }
@Test @Test
void findCauseNullObject() { void findCauseWitNestedAndSubClass() {
assertThat(this.failureAnalyzerConcrete.findCause(null, Throwable.class)).isNull(); SpecificTestException ex = new SpecificTestException();
assertThat(this.failureAnalyzer.findCause(new IOException(new IllegalStateException(ex)), TestException.class))
.isEqualTo(ex);
} }
static class FailureAnalyzerConcrete extends AbstractFailureAnalyzer<Throwable> { @Test
void findCauseWithUnrelatedException() {
IOException ex = new IOException();
assertThat(this.failureAnalyzer.findCause(ex, TestException.class)).isNull();
}
@Test
void findCauseWithMoreSpecificException() {
TestException ex = new TestException();
assertThat(this.failureAnalyzer.findCause(ex, SpecificTestException.class)).isNull();
}
static class TestFailureAnalyzer extends AbstractFailureAnalyzer<Throwable> {
@Override @Override
protected FailureAnalysis analyze(Throwable rootFailure, Throwable cause) { protected FailureAnalysis analyze(Throwable rootFailure, Throwable cause) {
@ -62,15 +84,11 @@ class AbstractFailureAnalyzerTests {
} }
static class ThrowableExtendsException extends Throwable { static class TestException extends Exception {
} }
static class ExtendsThrowableExtendsException extends ThrowableExtendsException { static class SpecificTestException extends TestException {
}
static class OtherException extends Throwable {
} }