Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent formatting of license headers, package javadocs, and import declarations

Browse Source
This commit is contained in:
Juergen Hoeller
2014-10-21 00:30:42 +02:00
parent b6fdcffc94
commit 8325b10080
2059 changed files with 3944 additions and 5473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/test/java/org/springframework/beans/AbstractConfigurablePropertyAccessorTests.java
View File

@@ -16,13 +16,13 @@
package org.springframework.beans;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
*
* @author Stephane Nicoll

4
spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
View File

@@ -16,11 +16,11 @@
package org.springframework.beans;
import static org.junit.Assert.assertTrue;
import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.*;
/**
* @author Rod Johnson
* @author Chris Beams

2
spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
View File

@@ -22,7 +22,7 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
/**

1
spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.beans;
import org.junit.Test;
import org.springframework.tests.sample.beans.CustomEnum;
import org.springframework.tests.sample.beans.GenericBean;

4
spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
View File

@@ -16,8 +16,6 @@
package org.springframework.beans;
import static org.junit.Assert.*;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Collections;
@@ -30,6 +28,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Guillaume Poirier
* @author Juergen Hoeller

6
spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoFactoryTests.java
View File

@@ -18,11 +18,11 @@ package org.springframework.beans;
import java.beans.IntrospectionException;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Unit tests for {@link ExtendedBeanInfoTests}.
*

4
spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
View File

@@ -16,10 +16,10 @@
package org.springframework.beans;
import static org.junit.Assert.*;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Tests for {@link MutablePropertyValues}.
*

4
spring-beans/src/test/java/org/springframework/beans/PropertyAccessorUtilsTests.java
View File

@@ -16,12 +16,12 @@
package org.springframework.beans;
import static org.junit.Assert.*;
import java.util.Arrays;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Juergen Hoeller
* @author Chris Beams

8
spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
View File

@@ -16,16 +16,13 @@
package org.springframework.beans.factory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -39,6 +36,9 @@ import org.springframework.tests.sample.beans.TestBean;
import org.springframework.tests.sample.beans.factory.DummyFactory;
import org.springframework.util.ObjectUtils;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/**
* @author Rod Johnson
* @author Juergen Hoeller

3
spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
View File

@@ -27,7 +27,6 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Before;
import org.junit.Test;
@@ -41,7 +40,7 @@ import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import static org.springframework.tests.TestResourceUtils.*;
/**
* @author Guillaume Poirier

8
spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
View File

@@ -16,18 +16,18 @@
package org.springframework.beans.factory;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.ClassPathResource;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Written with the intention of reproducing SPR-7318.
*

5
spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
View File

@@ -16,16 +16,17 @@
package org.springframework.beans.factory;
import static org.junit.Assert.*;
import java.util.Arrays;
import org.junit.Test;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry;
import org.springframework.tests.sample.beans.DerivedTestBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/**
* @author Juergen Hoeller
* @author Chris Beams

10
spring-beans/src/test/java/org/springframework/beans/factory/Spr5475Tests.java
View File

@@ -1,16 +1,16 @@
package org.springframework.beans.factory;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
import org.junit.Test;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConstructorArgumentValues;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
/**
* SPR-5475 exposed the fact that the error message displayed when incorrectly
* invoking a factory method is not instructive to the user and rather misleading.

5
spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
View File

@@ -16,14 +16,15 @@
package org.springframework.beans.factory.access;
import static org.junit.Assert.assertTrue;
import java.util.List;
import org.junit.Test;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.util.ClassUtils;
import static org.junit.Assert.*;
/**
* Unit tests for {@link SingletonBeanFactoryLocator}.
*

8
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolverTests.java
View File

@@ -16,14 +16,12 @@
package org.springframework.beans.factory.annotation;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver;
import org.springframework.beans.factory.annotation.Autowire;
import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.beans.factory.wiring.BeanWiringInfo;
import static org.junit.Assert.*;
/**
* @author Rick Evans
* @author Chris Beams

3
spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
View File

@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.beans.MutablePropertyValues;
@@ -36,6 +35,8 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/**
* @author Juergen Hoeller
* @author Chris Beams

1
spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
View File

@@ -21,6 +21,7 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import static org.junit.Assert.*;

7
spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
View File

@@ -16,17 +16,18 @@
package org.springframework.beans.factory.config;
import static org.junit.Assert.assertEquals;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import java.sql.Connection;
import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/**
* Unit tests for {@link FieldRetrievingFactoryBean}.
*

2
spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
View File

@@ -17,12 +17,12 @@
package org.springframework.beans.factory.config;
import java.util.Date;
import javax.inject.Provider;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;

7
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
View File

@@ -16,14 +16,15 @@
package org.springframework.beans.factory.config;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import java.util.Properties;
import org.junit.Test;
import org.springframework.core.io.Resource;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/**
* Unit tests for {@link PropertiesFactoryBean}.
*

10
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
View File

@@ -16,19 +16,17 @@
package org.springframework.beans.factory.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/**
* Unit tests for {@link PropertyPathFactoryBean}.
*

14
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
View File

@@ -16,14 +16,6 @@
package org.springframework.beans.factory.config;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.registerWithGeneratedName;
import java.lang.reflect.Field;
import java.util.Collections;
import java.util.Map;
@@ -32,12 +24,18 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.TestBean;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.*;
/**
* Unit tests for {@link PropertyPlaceholderConfigurer}.
*

14
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
View File

@@ -16,15 +16,6 @@
package org.springframework.beans.factory.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -38,6 +29,7 @@ import java.util.prefs.PreferencesFactory;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.BeanInitializationException;
@@ -52,6 +44,10 @@ import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.IndexedTestBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
import static org.springframework.tests.TestResourceUtils.*;
/**
* Unit tests for various {@link PropertyResourceConfigurer} implementations including:
* {@link PropertyPlaceholderConfigurer}, {@link PropertyOverrideConfigurer} and

1
spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
View File

@@ -19,6 +19,7 @@ package org.springframework.beans.factory.config;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;

6
spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
View File

@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean id="usesScope" class="org.springframework.tests.sample.beans.TestBean" scope="myScope"/>

7
spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
View File

@@ -16,20 +16,21 @@
package org.springframework.beans.factory.config;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import java.util.LinkedList;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/**
* Simple test to illustrate and verify scope usage.
*

4
spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java
View File

@@ -16,8 +16,6 @@
package org.springframework.beans.factory.config;
import static org.junit.Assert.*;
import java.io.IOException;
import java.io.InputStream;
import java.util.LinkedHashMap;
@@ -30,6 +28,8 @@ import org.springframework.core.io.AbstractResource;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.FileSystemResource;
import static org.junit.Assert.*;
/**
* Tests for {@link YamlMapFactoryBean}.
*

6
spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java
View File

@@ -15,9 +15,6 @@
*/
package org.springframework.beans.factory.config;
import static org.junit.Assert.*;
import static org.springframework.beans.factory.config.YamlProcessor.*;
import java.util.Map;
import java.util.Properties;
@@ -29,6 +26,9 @@ import org.yaml.snakeyaml.scanner.ScannerException;
import org.springframework.core.io.ByteArrayResource;
import static org.junit.Assert.*;
import static org.springframework.beans.factory.config.YamlProcessor.*;
/**
* Tests for {@link YamlProcessor}.
*

8
spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java
View File

@@ -16,10 +16,6 @@
package org.springframework.beans.factory.config;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.springframework.beans.factory.config.YamlProcessor.*;
import java.util.Map;
import java.util.Properties;
@@ -34,6 +30,10 @@ import org.yaml.snakeyaml.scanner.ScannerException;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.ClassPathResource;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.springframework.beans.factory.config.YamlProcessor.*;
/**
* Tests for {@link YamlPropertiesFactoryBean}.
*

7
spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
View File

@@ -16,19 +16,20 @@
package org.springframework.beans.factory.parsing;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import java.util.ArrayList;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/**
* @author Rob Harrop
* @author Chris Beams

1
spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.beans.factory.parsing;
import org.apache.commons.logging.Log;
import org.junit.Test;
import org.springframework.core.io.DescriptiveResource;
import static org.mockito.BDDMockito.*;

4
spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java
View File

@@ -16,10 +16,10 @@
package org.springframework.beans.factory.parsing;
import static org.junit.Assert.*;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Rick Evans
* @author Chris Beams

4
spring-beans/src/test/java/org/springframework/beans/factory/parsing/ParseStateTests.java
View File

@@ -16,10 +16,10 @@
package org.springframework.beans.factory.parsing;
import static org.junit.Assert.*;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Rob Harrop
* @author Chris Beams

4
spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
View File

@@ -16,10 +16,10 @@
package org.springframework.beans.factory.parsing;
import static org.junit.Assert.*;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Unit tests for {@link PassThroughSourceExtractor}.
*

6
spring-beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java
View File

@@ -16,18 +16,18 @@
package org.springframework.beans.factory.serviceloader;
import static org.junit.Assert.assertTrue;
import java.util.List;
import java.util.ServiceLoader;
import javax.xml.parsers.DocumentBuilderFactory;
import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.core.JdkVersion;
import static org.junit.Assert.*;
/**
* @author Juergen Hoeller
* @author Chris Beams

1
spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.beans.factory.support;
import junit.framework.TestCase;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;

7
spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
View File

@@ -16,10 +16,6 @@
package org.springframework.beans.factory.support;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -27,6 +23,7 @@ import java.lang.annotation.Target;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.config.ConstructorArgumentValues;
import org.springframework.beans.factory.config.DependencyDescriptor;
@@ -34,6 +31,8 @@ import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
import org.springframework.core.MethodParameter;
import org.springframework.util.ClassUtils;
import static org.junit.Assert.*;
/**
* @author Mark Fisher
* @author Juergen Hoeller

1
spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
View File

@@ -28,7 +28,6 @@ import java.security.PrivilegedExceptionAction;
import java.security.ProtectionDomain;
import java.util.PropertyPermission;
import java.util.Set;
import javax.security.auth.AuthPermission;
import javax.security.auth.Subject;

6
spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
View File

@@ -16,17 +16,17 @@
package org.springframework.beans.factory.xml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/**
* @author Rob Harrop
* @author Juergen Hoeller

8
spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
View File

@@ -16,15 +16,15 @@
package org.springframework.beans.factory.xml;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* With Spring 3.1, bean id attributes (and all other id attributes across the
* core schemas) are no longer typed as xsd:id, but as xsd:string. This allows

11
spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java
View File

@@ -16,17 +16,18 @@
package org.springframework.beans.factory.xml;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.hasItems;
import static org.junit.Assert.assertThat;
import org.junit.Test;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.hasItems;
import static org.junit.Assert.*;
/**
* Tests for propagating enclosing beans element defaults to nested beans elements.
*

7
spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementTests.java
View File

@@ -1,15 +1,16 @@
package org.springframework.beans.factory.xml;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Tests for new nested beans element support in Spring XML
*

7
spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
View File

@@ -16,19 +16,20 @@
package org.springframework.beans.factory.xml;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.ClassPathResource;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Tests various combinations of profile declarations against various profile
* activation and profile default scenarios.

5
spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
View File

@@ -16,15 +16,16 @@
package org.springframework.beans.factory.xml;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.DummyBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/**
* @author Costin Leau
*/

5
spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
View File

@@ -16,15 +16,16 @@
package org.springframework.beans.factory.xml;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/**
* @author Rob Harrop
* @author Juergen Hoeller

8
spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
View File

@@ -16,11 +16,6 @@
package org.springframework.beans.factory.xml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
@@ -35,6 +30,7 @@ import java.util.TreeMap;
import java.util.TreeSet;
import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.ListFactoryBean;
@@ -45,6 +41,8 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.HasMap;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/**
* Tests for collections in XML bean definitions.
*

5
spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
View File

@@ -16,13 +16,14 @@
package org.springframework.beans.factory.xml.support;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver;
import org.springframework.beans.factory.xml.NamespaceHandler;
import org.springframework.beans.factory.xml.UtilNamespaceHandler;
import static org.junit.Assert.*;
/**
* Unit and integration tests for the {@link DefaultNamespaceHandlerResolver} class.
*

4
spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
View File

@@ -16,10 +16,10 @@
package org.springframework.beans.propertyeditors;
import junit.framework.TestCase;
import java.beans.PropertyEditor;
import junit.framework.TestCase;
/**
* Unit tests for the {@link ByteArrayPropertyEditor} class.
*

4
spring-beans/src/test/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditorTests.java
View File

@@ -16,10 +16,10 @@
package org.springframework.beans.propertyeditors;
import junit.framework.TestCase;
import java.beans.PropertyEditor;
import junit.framework.TestCase;
/**
* Unit tests for the {@link CharArrayPropertyEditor} class.
*

4
spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java
View File

@@ -16,14 +16,14 @@
package org.springframework.beans.propertyeditors;
import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Unit tests for the {@link CustomCollectionEditor} class.
*

5
spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
View File

@@ -16,8 +16,6 @@
package org.springframework.beans.propertyeditors;
import static org.junit.Assert.*;
import java.beans.PropertyEditor;
import java.beans.PropertyEditorSupport;
import java.beans.PropertyVetoException;
@@ -39,6 +37,7 @@ import java.util.Vector;
import java.util.regex.Pattern;
import org.junit.Test;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.BeansException;
@@ -50,6 +49,8 @@ import org.springframework.tests.sample.beans.IndexedTestBean;
import org.springframework.tests.sample.beans.NumberTestBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/**
* Unit tests for the various PropertyEditors in Spring.
*

5
spring-beans/src/test/java/org/springframework/beans/propertyeditors/FileEditorTests.java
View File

@@ -16,14 +16,15 @@
package org.springframework.beans.propertyeditors;
import static org.junit.Assert.*;
import java.beans.PropertyEditor;
import java.io.File;
import org.junit.Test;
import org.springframework.util.ClassUtils;
import static org.junit.Assert.*;
/**
* @author Thomas Risberg
* @author Chris Beams

5
spring-beans/src/test/java/org/springframework/beans/propertyeditors/InputStreamEditorTests.java
View File

@@ -16,13 +16,14 @@
package org.springframework.beans.propertyeditors;
import static org.junit.Assert.*;
import java.io.InputStream;
import org.junit.Test;
import org.springframework.util.ClassUtils;
import static org.junit.Assert.*;
/**
* Unit tests for the {@link InputStreamEditor} class.
*

4
spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java
View File

@@ -16,12 +16,12 @@
package org.springframework.beans.propertyeditors;
import static org.junit.Assert.*;
import java.util.ResourceBundle;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Unit tests for the {@link ResourceBundleEditor} class.
*

3
spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
View File

@@ -19,11 +19,12 @@ package org.springframework.beans.propertyeditors;
import java.beans.PropertyEditor;
import java.net.URI;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.util.ClassUtils;
import static org.junit.Assert.*;
/**
* @author Juergen Hoeller
* @author Arjen Poutsma

5
spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
View File

@@ -16,14 +16,15 @@
package org.springframework.beans.propertyeditors;
import static org.junit.Assert.*;
import java.beans.PropertyEditor;
import java.net.URL;
import org.junit.Test;
import org.springframework.util.ClassUtils;
import static org.junit.Assert.*;
/**
* @author Rick Evans
* @author Chris Beams

1
spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
View File

@@ -23,7 +23,6 @@ import org.junit.Test;
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;

5
spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
View File

@@ -16,11 +16,12 @@
package org.springframework.beans.support;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.springframework.util.comparator.CompoundComparator;
import static org.junit.Assert.*;
/**
* Unit tests for {@link PropertyComparator}
*

1
spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java
View File

@@ -24,7 +24,6 @@ import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.tests.sample.beans.TestBean;
/**
* Simple factory to allow testing of FactoryBean support in AbstractBeanFactory.