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

Use AssertJ instead of Groovy Assertions 

See gh-27945
This commit is contained in:
Sam Brannen 2022-01-21 10:34:12 +01:00
parent a6deac3ffe
commit 1cf2960eb6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-context/spring-context.gradle
View File

@ -27,7 +27,6 @@ dependencies {
testImplementation(testFixtures(project(":spring-core")))
testImplementation("io.projectreactor:reactor-core")
testImplementation("org.codehaus.groovy:groovy-jsr223")
testImplementation("org.codehaus.groovy:groovy-test")
testImplementation("org.codehaus.groovy:groovy-xml")
testImplementation("org.apache.commons:commons-pool2")
testImplementation("org.awaitility:awaitility")

21
spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 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.
@ -21,9 +21,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.support.GenericGroovyApplicationContext;
import static groovy.test.GroovyAssert.assertEquals;
import static groovy.test.GroovyAssert.assertNotNull;
import static groovy.test.GroovyAssert.assertThrows;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* @author Jeff Brown
@ -33,26 +32,28 @@ import static groovy.test.GroovyAssert.assertThrows;
class GroovyApplicationContextDynamicBeanPropertyTests {
@Test
void testAccessDynamicBeanProperties() {
void accessDynamicBeanProperties() {
var ctx = new GenericGroovyApplicationContext();
ctx.getReader().loadBeanDefinitions("org/springframework/context/groovy/applicationContext.groovy");
ctx.refresh();
var framework = ctx.getProperty("framework");
assertNotNull("could not find framework bean", framework);
assertEquals("Grails", framework);
assertThat(framework).as("could not find framework bean").isNotNull();
assertThat(framework).isEqualTo("Grails");
ctx.close();
}
@Test
void testAccessingNonExistentBeanViaDynamicProperty() {
void accessingNonExistentBeanViaDynamicProperty() {
var ctx = new GenericGroovyApplicationContext();
ctx.getReader().loadBeanDefinitions("org/springframework/context/groovy/applicationContext.groovy");
ctx.refresh();
var err = assertThrows(NoSuchBeanDefinitionException.class, () -> ctx.getProperty("someNonExistentBean"));
assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
.isThrownBy(() -> ctx.getProperty("someNonExistentBean"))
.withMessage("No bean named 'someNonExistentBean' available");
assertEquals("No bean named 'someNonExistentBean' available", err.getMessage());
ctx.close();
}