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

1
spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
View File

@@ -32,6 +32,7 @@ import java.util.concurrent.DelayQueue;
import java.util.concurrent.Delayed;
import org.junit.Test;
import org.springframework.util.ReflectionUtils;
import static org.junit.Assert.*;

1
spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
View File

@@ -27,6 +27,7 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.io.Resource;
import org.springframework.tests.sample.objects.GenericObject;

2
spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
View File

@@ -23,8 +23,8 @@ import java.lang.reflect.Method;
import java.util.Date;
import junit.framework.TestCase;
import org.junit.Ignore;
import org.springframework.tests.sample.objects.TestObject;
/**

4
spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
View File

@@ -16,10 +16,10 @@
package org.springframework.core;
import junit.framework.TestCase;
import java.util.Comparator;
import junit.framework.TestCase;
/**
* Unit tests for the {@link OrderComparator} class.
*

2
spring-core/src/test/java/org/springframework/core/SerializableTypeWrapperTests.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,

13
spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java
View File

@@ -15,14 +15,15 @@
*/
package org.springframework.core;
import org.junit.Before;
import org.junit.Test;
import org.springframework.util.ReflectionUtils;
import java.lang.reflect.Method;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.junit.Before;
import org.junit.Test;
import org.springframework.util.ReflectionUtils;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.*;
/**
* Tests for StandardReflectionParameterNameDiscoverer

3
spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,6 +25,7 @@ import java.lang.annotation.Target;
import java.util.Arrays;
import org.junit.Test;
import org.springframework.util.MultiValueMap;
import static org.junit.Assert.*;

8
spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
View File

@@ -16,13 +16,11 @@
package org.springframework.core.annotation;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Unit tests for {@link AnnotationAttributes}.
*

3
spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java
View File

@@ -18,14 +18,13 @@ package org.springframework.core.annotation;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Priority;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import javax.annotation.Priority;
/**
* @author Juergen Hoeller
* @author Oliver Gierke

4
spring-core/src/test/java/org/springframework/core/annotation/OrderUtilsTests.java
View File

@@ -16,12 +16,12 @@
package org.springframework.core.annotation;
import static org.junit.Assert.*;
import javax.annotation.Priority;
import org.junit.Test;
import static org.junit.Assert.*;
/**
*
* @author Stephane Nicoll

2
spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotatedClass.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,

2
spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotation.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,

3
spring-core/src/test/java/org/springframework/core/convert/support/ByteBufferConverterTests.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,6 +20,7 @@ import java.nio.ByteBuffer;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.convert.converter.Converter;
import static org.hamcrest.Matchers.*;

1
spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
View File

@@ -25,6 +25,7 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.convert.ConversionFailedException;
import org.springframework.core.convert.ConverterNotFoundException;
import org.springframework.core.convert.TypeDescriptor;

2
spring-core/src/test/java/org/springframework/core/env/CompositePropertySourceTests.java vendored
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,

6
spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java vendored
View File

@@ -16,15 +16,15 @@
package org.springframework.core.env;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Unit tests covering the extensibility of {@link AbstractEnvironment}.
*

10
spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java vendored
View File

@@ -16,19 +16,15 @@
package org.springframework.core.env;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import java.util.Arrays;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Unit tests for {@link JOptCommandLinePropertySource}.
*

3
spring-core/src/test/java/org/springframework/core/env/MutablePropertySourcesTests.java vendored
View File

@@ -17,9 +17,10 @@
package org.springframework.core.env;
import org.junit.Test;
import org.springframework.mock.env.MockPropertySource;
import static java.lang.String.*;
import static java.lang.String.format;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.springframework.core.env.MutablePropertySources.*;

7
spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java vendored
View File

@@ -16,10 +16,6 @@
package org.springframework.core.env;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -30,6 +26,9 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Unit tests for {@link AbstractPropertySource} implementations.
*

8
spring-core/src/test/java/org/springframework/core/env/SimpleCommandLineParserTests.java vendored
View File

@@ -16,16 +16,14 @@
package org.springframework.core.env;
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 java.util.Collections;
import java.util.List;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
public class SimpleCommandLineParserTests {
@Test

7
spring-core/src/test/java/org/springframework/core/io/ClassPathResourceTests.java
View File

@@ -16,20 +16,15 @@
package org.springframework.core.io;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.junit.Test;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
/**
* Unit tests that serve as regression tests for the bugs described in SPR-6888

1
spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java
View File

@@ -27,6 +27,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder;
import org.springframework.util.FileCopyUtils;
import static org.hamcrest.Matchers.*;

4
spring-core/src/test/java/org/springframework/core/io/ResourceEditorTests.java
View File

@@ -18,10 +18,12 @@ package org.springframework.core.io;
import java.beans.PropertyEditor;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.core.env.StandardEnvironment;
import static org.junit.Assert.*;
/**
* Unit tests for the {@link ResourceEditor} class.
*

1
spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
View File

@@ -25,6 +25,7 @@ import java.util.HashSet;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.util.FileCopyUtils;
import static org.hamcrest.CoreMatchers.*;

3
spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
View File

@@ -18,12 +18,13 @@ package org.springframework.core.io.support;
import java.beans.PropertyEditor;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.Resource;
import static org.junit.Assert.*;
/**
* @author Dave Syer
* @author Juergen Hoeller

3
spring-core/src/test/java/org/springframework/core/serializer/SerializationConverterTests.java
View File

@@ -19,13 +19,14 @@ package org.springframework.core.serializer;
import java.io.NotSerializableException;
import java.io.Serializable;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.core.serializer.support.DeserializingConverter;
import org.springframework.core.serializer.support.SerializationFailedException;
import org.springframework.core.serializer.support.SerializingConverter;
import static org.junit.Assert.*;
/**
* @author Gary Russell
* @author Mark Fisher

6
spring-core/src/test/java/org/springframework/core/type/AbstractClassMetadataMemberClassTests.java
View File

@@ -16,11 +16,11 @@
package org.springframework.core.type;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Abstract base class for testing implementations of
* {@link ClassMetadata#getMemberClassNames()}.

5
spring-core/src/test/java/org/springframework/core/type/AnnotationTypeFilterTests.java
View File

@@ -16,17 +16,18 @@
package org.springframework.core.type;
import static org.junit.Assert.*;
import java.lang.annotation.Inherited;
import org.junit.Test;
import org.springframework.core.type.classreading.MetadataReader;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
import org.springframework.core.type.filter.AnnotationTypeFilter;
import org.springframework.stereotype.Component;
import static org.junit.Assert.*;
/**
* @author Ramnivas Laddad
* @author Juergen Hoeller

2
spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.core.type;
import junit.framework.TestCase;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.core.type.classreading.MetadataReader;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
import org.springframework.core.type.filter.AspectJTypeFilter;
import org.springframework.stereotype.Component;

2
spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.core.type;
import junit.framework.TestCase;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.core.type.classreading.MetadataReader;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
import org.springframework.core.type.filter.AssignableTypeFilter;

1
spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTests.java
View File

@@ -19,6 +19,7 @@ package org.springframework.core.type;
import java.net.URL;
import org.junit.Test;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.core.type.classreading.CachingMetadataReaderFactory;

2
spring-core/src/test/java/org/springframework/tests/BuildTests.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,

6
spring-core/src/test/java/org/springframework/tests/JavaVersionTests.java
View File

@@ -16,11 +16,11 @@
package org.springframework.tests;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.*;
import org.junit.Test;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
/**
* Tests for {@link JavaVersion}.
*

7
spring-core/src/test/java/org/springframework/tests/MockitoUtils.java
View File

@@ -16,16 +16,15 @@
package org.springframework.tests;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import java.util.List;
import org.mockito.Mockito;
import org.mockito.internal.util.MockUtil;
import org.mockito.invocation.Invocation;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
/**
* General test utilities for use with {@link Mockito}.
*

4
spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java
View File

@@ -16,10 +16,10 @@
package org.springframework.tests;
import static java.lang.String.format;
import org.springframework.core.io.ClassPathResource;
import static java.lang.String.*;
/**
* Convenience utilities for common operations with test resources.
*

2
spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.util;
import java.util.LinkedList;
import junit.framework.*;
import junit.framework.TestCase;
import org.springframework.tests.sample.objects.TestObject;

6
spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
View File

@@ -28,6 +28,9 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.springframework.tests.sample.objects.DerivedTestObject;
import org.springframework.tests.sample.objects.ITestInterface;
import org.springframework.tests.sample.objects.ITestObject;
@@ -35,9 +38,6 @@ import org.springframework.tests.sample.objects.TestObject;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
/**
* @author Colin Sampaleanu
* @author Juergen Hoeller

3
spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
View File

@@ -28,9 +28,10 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import static org.junit.Assert.*;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Rob Harrop
* @author Juergen Hoeller

3
spring-core/src/test/java/org/springframework/util/DigestUtilsTests.java
View File

@@ -18,10 +18,11 @@ package org.springframework.util;
import java.io.UnsupportedEncodingException;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
public class DigestUtilsTests {
private byte[] bytes;

6
spring-core/src/test/java/org/springframework/util/ExceptionTypeFilterTests.java
View File

@@ -16,12 +16,10 @@
package org.springframework.util;
import static java.util.Arrays.*;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.util.ExceptionTypeFilter;
import static java.util.Arrays.*;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll

4
spring-core/src/test/java/org/springframework/util/ExponentialBackOffTests.java
View File

@@ -16,8 +16,6 @@
package org.springframework.util;
import static org.junit.Assert.assertEquals;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -25,6 +23,8 @@ import org.junit.rules.ExpectedException;
import org.springframework.util.backoff.BackOffExecution;
import org.springframework.util.backoff.ExponentialBackOff;
import static org.junit.Assert.*;
/**
*
* @author Stephane Nicoll

4
spring-core/src/test/java/org/springframework/util/FixedBackOffTests.java
View File

@@ -16,13 +16,13 @@
package org.springframework.util;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.util.backoff.BackOffExecution;
import org.springframework.util.backoff.FixedBackOff;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

6
spring-core/src/test/java/org/springframework/util/InstanceFilterTests.java
View File

@@ -16,12 +16,10 @@
package org.springframework.util;
import static java.util.Arrays.*;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.util.InstanceFilter;
import static java.util.Arrays.*;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll

3
spring-core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java
View File

@@ -22,10 +22,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Arjen Poutsma
*/

3
spring-core/src/test/java/org/springframework/util/MimeTypeTests.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Random;
import org.junit.Test;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.DefaultConversionService;

3
spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
View File

@@ -18,9 +18,10 @@ package org.springframework.util;
import java.util.Properties;
import static org.junit.Assert.*;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Rob Harrop
*/

3
spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
View File

@@ -25,7 +25,6 @@ import java.util.LinkedList;
import java.util.List;
import org.hamcrest.Matchers;
import org.junit.Ignore;
import org.junit.Test;
@@ -33,7 +32,7 @@ import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import org.springframework.tests.sample.objects.TestObject;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**

6
spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java
View File

@@ -16,15 +16,11 @@
package org.springframework.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.math.BigInteger;
import org.junit.Test;
import org.springframework.util.SerializationUtils;
import static org.junit.Assert.*;
/**
* Test for static utility to help with serialization.

2
spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,

2
spring-core/src/test/java/org/springframework/util/StreamUtilsTests.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,

3
spring-core/src/test/java/org/springframework/util/SystemPropertyUtilsTests.java
View File

@@ -18,9 +18,10 @@ package org.springframework.util;
import java.util.Map;
import static org.junit.Assert.*;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Rob Harrop
* @author Juergen Hoeller

5
spring-core/src/test/java/org/springframework/util/TypeUtilsTests.java
View File

@@ -16,9 +16,6 @@
package org.springframework.util;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Collection;
@@ -28,6 +25,8 @@ import java.util.List;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Unit tests for {@link TypeUtils}.
*

6
spring-core/src/test/java/org/springframework/util/comparator/BooleanComparatorTests.java
View File

@@ -16,13 +16,13 @@
package org.springframework.util.comparator;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.*;
import java.util.Comparator;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Tests for {@link BooleanComparator}.
*

4
spring-core/src/test/java/org/springframework/util/comparator/ComparableComparatorTests.java
View File

@@ -16,14 +16,14 @@
package org.springframework.util.comparator;
import static org.junit.Assert.assertTrue;
import java.util.Comparator;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import static org.junit.Assert.*;
/**
* Tests for {@link ComparableComparator}.
*

6
spring-core/src/test/java/org/springframework/util/comparator/InstanceComparatorTests.java
View File

@@ -16,13 +16,13 @@
package org.springframework.util.comparator;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.*;
import java.util.Comparator;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Tests for {@link InstanceComparator}.
*

4
spring-core/src/test/java/org/springframework/util/comparator/NullSafeComparatorTests.java
View File

@@ -16,12 +16,12 @@
package org.springframework.util.comparator;
import static org.junit.Assert.*;
import java.util.Comparator;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Tests for {@link NullSafeComparator}.
*

7
spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java
View File

@@ -20,12 +20,11 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
/**
* @author Arjen Poutsma

9
spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
View File

@@ -16,16 +16,17 @@
package org.springframework.util.concurrent;
import org.junit.Before;
import org.junit.Test;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import static org.hamcrest.Matchers.equalTo;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.*;

3
spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java
View File

@@ -25,7 +25,6 @@ import javax.xml.transform.Result;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamResult;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
@@ -33,6 +32,8 @@ import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
import static org.custommonkey.xmlunit.XMLAssert.*;
public abstract class AbstractStaxHandlerTestCase {
private static final String COMPLEX_XML =

5
spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
View File

@@ -25,10 +25,8 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.sax.SAXSource;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
import static org.mockito.BDDMockito.*;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.w3c.dom.Node;
@@ -46,6 +44,9 @@ import org.springframework.core.io.Resource;
import org.springframework.tests.MockitoUtils;
import org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
public abstract class AbstractStaxXMLReaderTestCase {
protected static XMLInputFactory inputFactory;

3
spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java
View File

@@ -20,7 +20,6 @@ import java.io.StringReader;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
@@ -29,6 +28,8 @@ import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
import static org.custommonkey.xmlunit.XMLAssert.*;
/**
* Unit tests for {@link DomContentHandler}.
*/

3
spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java
View File

@@ -19,10 +19,11 @@ import java.util.Collections;
import java.util.Iterator;
import javax.xml.XMLConstants;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
public class SimpleNamespaceContextTests {
private SimpleNamespaceContext context;

1
spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.util.xml;
import java.io.InputStream;
import java.io.StringReader;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;

1
spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.util.xml;
import java.io.InputStream;
import java.io.StringReader;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;

4
spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
View File

@@ -25,10 +25,10 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Rick Evans
* @author Arjen Poutsma