From cee353fba6e50008b464209835141e8cd69aca9c Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Mon, 26 Sep 2022 19:57:19 +0200 Subject: [PATCH 1/2] Avoid using JUnit 4 assertions See gh-32504 --- .../client/TestRestTemplateExtensionsTests.kt | 10 ++++---- .../boot/SpringApplicationExtensionsTests.kt | 23 ++++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/spring-boot-project/spring-boot-test/src/test/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensionsTests.kt b/spring-boot-project/spring-boot-test/src/test/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensionsTests.kt index 854831660c0..6501d3afa81 100644 --- a/spring-boot-project/spring-boot-test/src/test/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensionsTests.kt +++ b/spring-boot-project/spring-boot-test/src/test/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensionsTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 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. @@ -18,7 +18,7 @@ package org.springframework.boot.test.web.client import io.mockk.mockk import io.mockk.verify -import org.junit.Assert +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.springframework.core.ParameterizedTypeReference import org.springframework.http.HttpEntity @@ -251,9 +251,9 @@ class TestRestTemplateExtensionsTests { .apply { addAll(method.parameterTypes.filter { it != kClass.java }) } val f = extensions.getDeclaredMethod(method.name, *parameters.toTypedArray()).kotlinFunction!! - Assert.assertEquals(1, f.typeParameters.size) - Assert.assertEquals(listOf(Any::class.createType()), - f.typeParameters[0].upperBounds) + assertThat(f.typeParameters.size).isEqualTo(1) + assertThat(listOf(Any::class.createType())) + .isEqualTo(f.typeParameters[0].upperBounds) } } } diff --git a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt index e35d774b5ba..caff58f3d2b 100644 --- a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt +++ b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2022 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. @@ -15,10 +15,7 @@ */ package org.springframework.boot -import org.junit.Assert.assertArrayEquals -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNotNull -import org.junit.Assert.assertTrue +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.springframework.beans.factory.getBean @@ -37,7 +34,7 @@ class SpringApplicationExtensionsTests { @Test fun `Kotlin runApplication() top level function`() { val context = runApplication() - assertNotNull(context) + assertThat(context).isNotNull } @Test @@ -46,16 +43,16 @@ class SpringApplicationExtensionsTests { val context = runApplication { setEnvironment(environment) } - assertNotNull(context) - assertEquals(environment, context.environment) + assertThat(context).isNotNull + assertThat(environment).isEqualTo(context.environment) } @Test fun `Kotlin runApplication(arg1, arg2) top level function`() { val context = runApplication("--debug", "spring", "boot") val args = context.getBean() - assertArrayEquals(arrayOf("spring", "boot"), args.nonOptionArgs.toTypedArray()) - assertTrue(args.containsOption("debug")) + assertThat(args.nonOptionArgs.toTypedArray()).containsExactly("spring", "boot") + assertThat(args.containsOption("debug")).isTrue } @Test @@ -65,9 +62,9 @@ class SpringApplicationExtensionsTests { setEnvironment(environment) } val args = context.getBean() - assertArrayEquals(arrayOf("spring", "boot"), args.nonOptionArgs.toTypedArray()) - assertTrue(args.containsOption("debug")) - assertEquals(environment, context.environment) + assertThat(args.nonOptionArgs.toTypedArray()).containsExactly("spring", "boot") + assertThat(args.containsOption("debug")).isTrue + assertThat(environment).isEqualTo(context.environment) } @Configuration(proxyBeanMethods = false) From 0457536d721a62b4d64ce100b2f6492581f83eb0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 27 Sep 2022 08:24:03 +0200 Subject: [PATCH 2/2] Polish "Avoid using JUnit 4 assertions" See gh-32504 --- .../springframework/boot/SpringApplicationExtensionsTests.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt index caff58f3d2b..d1da352d9e7 100644 --- a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt +++ b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt @@ -52,7 +52,7 @@ class SpringApplicationExtensionsTests { val context = runApplication("--debug", "spring", "boot") val args = context.getBean() assertThat(args.nonOptionArgs.toTypedArray()).containsExactly("spring", "boot") - assertThat(args.containsOption("debug")).isTrue + assertThat(args.containsOption("debug")).isEqualTo(true) } @Test @@ -63,7 +63,7 @@ class SpringApplicationExtensionsTests { } val args = context.getBean() assertThat(args.nonOptionArgs.toTypedArray()).containsExactly("spring", "boot") - assertThat(args.containsOption("debug")).isTrue + assertThat(args.containsOption("debug")).isEqualTo(true) assertThat(environment).isEqualTo(context.environment) }