From 209c8505e661cb77678ac4cd7f6e8b157e782e89 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Sat, 20 Jul 2019 16:10:49 +0200
Subject: [PATCH] Align forRawClassAssignableFromTypeVariable with 5.1
 assertion style

See gh-23321
---
 .../core/ResolvableTypeTests.java             | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
index f4a4490da2..58421740df 100644
--- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -135,41 +135,41 @@ public class ResolvableTypeTests {
 		assertTrue(type.isAssignableFrom(String.class));
 	}
 
-	@Test
-	public void forRawClassAssignableFromTypeVariable() { // gh-23321
+	@Test  // gh-23321
+	public void forRawClassAssignableFromTypeVariable() throws Exception {
 		ResolvableType typeVariable = ResolvableType.forClass(ExtendsList.class).as(List.class).getGeneric();
 		ResolvableType raw = ResolvableType.forRawClass(CharSequence.class);
-		assertThat(raw.resolve()).isEqualTo(CharSequence.class);
-		assertThat(typeVariable.resolve()).isEqualTo(CharSequence.class);
-		assertThat(raw.resolve().isAssignableFrom(typeVariable.resolve())).isTrue();
-		assertThat(typeVariable.resolve().isAssignableFrom(raw.resolve())).isTrue();
-		assertThat(raw.isAssignableFrom(typeVariable)).isTrue();
-		assertThat(typeVariable.isAssignableFrom(raw)).isTrue();
+		assertThat(raw.resolve(), equalTo(CharSequence.class));
+		assertThat(typeVariable.resolve(), equalTo(CharSequence.class));
+		assertTrue(raw.resolve().isAssignableFrom(typeVariable.resolve()));
+		assertTrue(typeVariable.resolve().isAssignableFrom(raw.resolve()));
+		assertTrue(raw.isAssignableFrom(typeVariable));
+		assertTrue(typeVariable.isAssignableFrom(raw));
 	}
 
 	@Test
-	public void forInstanceMustNotBeNull() {
+	public void forInstanceMustNotBeNull() throws Exception {
 		this.thrown.expect(IllegalArgumentException.class);
 		this.thrown.expectMessage("Instance must not be null");
 		ResolvableType.forInstance(null);
 	}
 
 	@Test
-	public void forInstanceNoProvider() {
+	public void forInstanceNoProvider() throws Exception {
 		ResolvableType type = ResolvableType.forInstance(new Object());
 		assertThat(type.getType(), equalTo(Object.class));
 		assertThat(type.resolve(), equalTo(Object.class));
 	}
 
 	@Test
-	public void forInstanceProvider() {
+	public void forInstanceProvider() throws Exception {
 		ResolvableType type = ResolvableType.forInstance(new MyGenericInterfaceType<>(String.class));
 		assertThat(type.getRawClass(), equalTo(MyGenericInterfaceType.class));
 		assertThat(type.getGeneric().resolve(), equalTo(String.class));
 	}
 
 	@Test
-	public void forInstanceProviderNull() {
+	public void forInstanceProviderNull() throws Exception {
 		ResolvableType type = ResolvableType.forInstance(new MyGenericInterfaceType<String>(null));
 		assertThat(type.getType(), equalTo(MyGenericInterfaceType.class));
 		assertThat(type.resolve(), equalTo(MyGenericInterfaceType.class));
@@ -443,12 +443,8 @@ public class ResolvableTypeTests {
 			interfaces.add(interfaceType.toString());
 		}
 		assertThat(interfaces.toString(), equalTo(
-				"["
-				+ "java.io.Serializable, "
-				+ "java.lang.Cloneable, "
-				+ "java.util.List<java.lang.CharSequence>, "
-				+ "java.util.RandomAccess"
-				+ "]"));
+				"[java.io.Serializable, java.lang.Cloneable, " +
+				"java.util.List<java.lang.CharSequence>, java.util.RandomAccess]"));
 	}
 
 	@Test