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

Polishing

This commit is contained in:
Juergen Hoeller 2018-05-30 11:10:37 +02:00
parent 0c52699102
commit 1b728fb244
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 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.
@ -61,7 +61,7 @@ import static org.junit.Assert.*;
public class ValidatorFactoryTests { public class ValidatorFactoryTests {
@Test @Test
public void testSimpleValidation() throws Exception { public void testSimpleValidation() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -87,7 +87,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSimpleValidationWithCustomProvider() throws Exception { public void testSimpleValidationWithCustomProvider() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.setProviderClass(HibernateValidator.class); validator.setProviderClass(HibernateValidator.class);
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -114,9 +114,10 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSimpleValidationWithClassLevel() throws Exception { public void testSimpleValidationWithClassLevel() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
ValidPerson person = new ValidPerson(); ValidPerson person = new ValidPerson();
person.setName("Juergen"); person.setName("Juergen");
person.getAddress().setStreet("Juergen's Street"); person.getAddress().setStreet("Juergen's Street");
@ -129,7 +130,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidationFieldType() throws Exception { public void testSpringValidationFieldType() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -144,7 +145,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidation() throws Exception { public void testSpringValidation() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -172,7 +173,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidationWithClassLevel() throws Exception { public void testSpringValidationWithClassLevel() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -190,7 +191,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidationWithAutowiredValidator() throws Exception { public void testSpringValidationWithAutowiredValidator() {
ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext( ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(
LocalValidatorFactoryBean.class); LocalValidatorFactoryBean.class);
LocalValidatorFactoryBean validator = ctx.getBean(LocalValidatorFactoryBean.class); LocalValidatorFactoryBean validator = ctx.getBean(LocalValidatorFactoryBean.class);
@ -211,7 +212,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidationWithErrorInListElement() throws Exception { public void testSpringValidationWithErrorInListElement() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -229,7 +230,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidationWithErrorInSetElement() throws Exception { public void testSpringValidationWithErrorInSetElement() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -247,7 +248,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testInnerBeanValidation() throws Exception { public void testInnerBeanValidation() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -259,7 +260,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testValidationWithOptionalField() throws Exception { public void testValidationWithOptionalField() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -271,7 +272,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testListValidation() throws Exception { public void testListValidation() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();

13
spring-context/src/test/java/org/springframework/context/annotation/configuration/DuplicatePostProcessingTests.java
View File

@ -18,7 +18,6 @@ package org.springframework.context.annotation.configuration;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.FactoryBean;
@ -67,7 +66,7 @@ public class DuplicatePostProcessingTests {
private final ExampleBean exampleBean = new ExampleBean(); private final ExampleBean exampleBean = new ExampleBean();
@Override @Override
public ExampleBean getObject() throws Exception { public ExampleBean getObject() {
return this.exampleBean; return this.exampleBean;
} }
@ -87,14 +86,13 @@ public class DuplicatePostProcessingTests {
private ApplicationContext applicationContext; private ApplicationContext applicationContext;
@Override @Override
public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { public Object postProcessBeforeInitialization(Object bean, String beanName) {
return bean; return bean;
} }
@Override @Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { public Object postProcessAfterInitialization(Object bean, String beanName) {
if (bean instanceof ExampleBean) { if (bean instanceof ExampleBean) {
this.applicationContext.publishEvent(new ExampleApplicationEvent(this)); this.applicationContext.publishEvent(new ExampleApplicationEvent(this));
} }
@ -102,12 +100,13 @@ public class DuplicatePostProcessingTests {
} }
@Override @Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext; this.applicationContext = applicationContext;
} }
} }
@SuppressWarnings("serial")
static class ExampleApplicationEvent extends ApplicationEvent { static class ExampleApplicationEvent extends ApplicationEvent {
public ExampleApplicationEvent(Object source) { public ExampleApplicationEvent(Object source) {
@ -126,7 +125,7 @@ public class DuplicatePostProcessingTests {
} }
@Override @Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException { public void setBeanFactory(BeanFactory beanFactory) {
this.beanFactory = beanFactory; this.beanFactory = beanFactory;
} }
} }

27
spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 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.
@ -60,7 +60,7 @@ import static org.junit.Assert.*;
public class ValidatorFactoryTests { public class ValidatorFactoryTests {
@Test @Test
public void testSimpleValidation() throws Exception { public void testSimpleValidation() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -86,7 +86,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSimpleValidationWithCustomProvider() throws Exception { public void testSimpleValidationWithCustomProvider() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.setProviderClass(HibernateValidator.class); validator.setProviderClass(HibernateValidator.class);
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -113,9 +113,10 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSimpleValidationWithClassLevel() throws Exception { public void testSimpleValidationWithClassLevel() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
ValidPerson person = new ValidPerson(); ValidPerson person = new ValidPerson();
person.setName("Juergen"); person.setName("Juergen");
person.getAddress().setStreet("Juergen's Street"); person.getAddress().setStreet("Juergen's Street");
@ -128,7 +129,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidationFieldType() throws Exception { public void testSpringValidationFieldType() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -143,7 +144,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidation() throws Exception { public void testSpringValidation() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -171,7 +172,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidationWithClassLevel() throws Exception { public void testSpringValidationWithClassLevel() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -189,7 +190,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidationWithAutowiredValidator() throws Exception { public void testSpringValidationWithAutowiredValidator() {
ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext( ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(
LocalValidatorFactoryBean.class); LocalValidatorFactoryBean.class);
LocalValidatorFactoryBean validator = ctx.getBean(LocalValidatorFactoryBean.class); LocalValidatorFactoryBean validator = ctx.getBean(LocalValidatorFactoryBean.class);
@ -210,7 +211,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidationWithErrorInListElement() throws Exception { public void testSpringValidationWithErrorInListElement() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -228,7 +229,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testSpringValidationWithErrorInSetElement() throws Exception { public void testSpringValidationWithErrorInSetElement() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -246,7 +247,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testInnerBeanValidation() throws Exception { public void testInnerBeanValidation() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -258,7 +259,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testValidationWithOptionalField() throws Exception { public void testValidationWithOptionalField() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();
@ -270,7 +271,7 @@ public class ValidatorFactoryTests {
} }
@Test @Test
public void testListValidation() throws Exception { public void testListValidation() {
LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
validator.afterPropertiesSet(); validator.afterPropertiesSet();