From a2eed676a20e14b483823e780a7cbb6ddc531a22 Mon Sep 17 00:00:00 2001
From: smoothbear <kjbin0420@naver.com>
Date: Fri, 3 Sep 2021 17:08:10 +0900
Subject: [PATCH] Add testing for AbstractFailureAnalyzer.findCause

See gh-27862
---
 .../diagnostics/AbstractFailureAnalyzer.java  |  6 +-
 .../AbstractFailureAnalyzerTests.java         | 77 +++++++++++++++++++
 2 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzerTests.java

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzer.java
index d2641962db..e683693d2e 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzer.java
@@ -31,10 +31,8 @@ public abstract class AbstractFailureAnalyzer<T extends Throwable> implements Fa
 	@Override
 	public FailureAnalysis analyze(Throwable failure) {
 		T cause = findCause(failure, getCauseType());
-		if (cause != null) {
-			return analyze(failure, cause);
-		}
-		return null;
+
+		return (cause != null) ? analyze(failure, cause) : null;
 	}
 
 	/**
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzerTests.java
new file mode 100644
index 0000000000..4647feb23d
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/AbstractFailureAnalyzerTests.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.diagnostics;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class AbstractFailureAnalyzerTests {
+
+	private FailureAnalyzerConcrete failureAnalyzerConcrete;
+
+	@BeforeEach
+	void configureFailureAnalyzer() {
+		this.failureAnalyzerConcrete = new FailureAnalyzerConcrete();
+	}
+
+	@Test
+	void findCauseExtendsThrowable() {
+		ThrowableExtendsException ex = new ThrowableExtendsException();
+		assertThat(this.failureAnalyzerConcrete.findCause(ex, Throwable.class).getClass()).isNotNull();
+	}
+
+	@Test
+	void findCauseExtendsOtherException() {
+		ExtendsThrowableExtendsException ex = new ExtendsThrowableExtendsException();
+		assertThat(this.failureAnalyzerConcrete.findCause(ex, ThrowableExtendsException.class).getClass()).isNotNull();
+	}
+
+	@Test
+	void findCauseOtherException() {
+		ThrowableExtendsException ex = new ThrowableExtendsException();
+		assertThat(this.failureAnalyzerConcrete.findCause(ex, OtherException.class)).isNull();
+	}
+
+	@Test
+	void findCauseNullObject() {
+		assertThat(this.failureAnalyzerConcrete.findCause(null, Throwable.class)).isNull();
+	}
+
+	static class FailureAnalyzerConcrete extends AbstractFailureAnalyzer<Throwable> {
+
+		@Override
+		protected FailureAnalysis analyze(Throwable rootFailure, Throwable cause) {
+			return null;
+		}
+
+	}
+
+	static class ThrowableExtendsException extends Throwable {
+
+	}
+
+	static class ExtendsThrowableExtendsException extends ThrowableExtendsException {
+
+	}
+
+	static class OtherException extends Throwable {
+
+	}
+
+}