Browse Source

Polish

pull/808/head
Stephane Nicoll 11 years ago
parent
commit
27c435c4ea
  1. 2
      spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
  2. 46
      spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java

2
spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java

@ -32,7 +32,7 @@ import static org.junit.Assert.*;
*/ */
public class AnnotationAttributesTests { public class AnnotationAttributesTests {
static enum Color { enum Color {
RED, WHITE, BLUE RED, WHITE, BLUE
} }

46
spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java

@ -687,7 +687,7 @@ public class AnnotationUtilsTests {
} }
@Meta1 @Meta1
static interface InterfaceWithMetaAnnotation { interface InterfaceWithMetaAnnotation {
} }
@Meta2 @Meta2
@ -728,7 +728,7 @@ public class AnnotationUtilsTests {
static class MetaCycleAnnotatedClass { static class MetaCycleAnnotatedClass {
} }
public static interface AnnotatedInterface { public interface AnnotatedInterface {
@Order(0) @Order(0)
void fromInterfaceImplementedByRoot(); void fromInterfaceImplementedByRoot();
@ -805,29 +805,29 @@ public class AnnotationUtilsTests {
} }
@Transactional @Transactional
public static interface InheritedAnnotationInterface { public interface InheritedAnnotationInterface {
} }
public static interface SubInheritedAnnotationInterface extends InheritedAnnotationInterface { public interface SubInheritedAnnotationInterface extends InheritedAnnotationInterface {
} }
public static interface SubSubInheritedAnnotationInterface extends SubInheritedAnnotationInterface { public interface SubSubInheritedAnnotationInterface extends SubInheritedAnnotationInterface {
} }
@Order @Order
public static interface NonInheritedAnnotationInterface { public interface NonInheritedAnnotationInterface {
} }
public static interface SubNonInheritedAnnotationInterface extends NonInheritedAnnotationInterface { public interface SubNonInheritedAnnotationInterface extends NonInheritedAnnotationInterface {
} }
public static interface SubSubNonInheritedAnnotationInterface extends SubNonInheritedAnnotationInterface { public interface SubSubNonInheritedAnnotationInterface extends SubNonInheritedAnnotationInterface {
} }
public static class NonAnnotatedClass { public static class NonAnnotatedClass {
} }
public static interface NonAnnotatedInterface { public interface NonAnnotatedInterface {
} }
@Transactional @Transactional
@ -855,7 +855,7 @@ public class AnnotationUtilsTests {
public static class SubTransactionalAndOrderedClass extends TransactionalAndOrderedClass { public static class SubTransactionalAndOrderedClass extends TransactionalAndOrderedClass {
} }
public static interface InterfaceWithAnnotatedMethod { public interface InterfaceWithAnnotatedMethod {
@Order @Order
void foo(); void foo();
@ -908,7 +908,7 @@ public class AnnotationUtilsTests {
@interface MyRepeatableMeta { @interface MyRepeatableMeta {
} }
public static interface InterfaceWithRepeated { public interface InterfaceWithRepeated {
@MyRepeatable("a") @MyRepeatable("a")
@MyRepeatableContainer({ @MyRepeatable("b"), @MyRepeatable("c") }) @MyRepeatableContainer({ @MyRepeatable("b"), @MyRepeatable("c") })
@ -917,7 +917,7 @@ public class AnnotationUtilsTests {
} }
/** /**
* Mock of {@link org.springframework.web.bind.annotation.RequestMapping}. * Mock of {@code org.springframework.web.bind.annotation.RequestMapping}.
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@interface WebMapping { @interface WebMapping {
@ -948,10 +948,10 @@ public class AnnotationUtilsTests {
} }
/** /**
* Mock of {@link org.springframework.test.context.ContextConfiguration}. * Mock of {@code org.springframework.test.context.ContextConfiguration}.
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface ContextConfig { @interface ContextConfig {
@AliasFor(attribute = "locations") @AliasFor(attribute = "locations")
String value() default ""; String value() default "";
@ -961,10 +961,10 @@ public class AnnotationUtilsTests {
} }
/** /**
* Mock of {@link org.springframework.test.context.ContextHierarchy}. * Mock of {@code org.springframework.test.context.ContextHierarchy}.
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface Hierarchy { @interface Hierarchy {
ContextConfig[] value(); ContextConfig[] value();
} }
@ -974,7 +974,7 @@ public class AnnotationUtilsTests {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface AliasForNonexistentAttribute { @interface AliasForNonexistentAttribute {
@AliasFor(attribute = "bar") @AliasFor(attribute = "bar")
String foo() default ""; String foo() default "";
@ -985,7 +985,7 @@ public class AnnotationUtilsTests {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface AliasForWithoutMirroredAliasFor { @interface AliasForWithoutMirroredAliasFor {
@AliasFor(attribute = "bar") @AliasFor(attribute = "bar")
String foo() default ""; String foo() default "";
@ -998,7 +998,7 @@ public class AnnotationUtilsTests {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface AliasForWithMirroredAliasForWrongAttribute { @interface AliasForWithMirroredAliasForWrongAttribute {
@AliasFor(attribute = "bar") @AliasFor(attribute = "bar")
String[] foo() default ""; String[] foo() default "";
@ -1012,7 +1012,7 @@ public class AnnotationUtilsTests {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface AliasForAttributeOfDifferentType { @interface AliasForAttributeOfDifferentType {
@AliasFor(attribute = "bar") @AliasFor(attribute = "bar")
String[] foo() default ""; String[] foo() default "";
@ -1026,7 +1026,7 @@ public class AnnotationUtilsTests {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface AliasForWithMissingDefaultValues { @interface AliasForWithMissingDefaultValues {
@AliasFor(attribute = "bar") @AliasFor(attribute = "bar")
String foo(); String foo();
@ -1040,7 +1040,7 @@ public class AnnotationUtilsTests {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface AliasForAttributeWithDifferentDefaultValue { @interface AliasForAttributeWithDifferentDefaultValue {
@AliasFor(attribute = "bar") @AliasFor(attribute = "bar")
String foo() default "X"; String foo() default "X";
@ -1055,7 +1055,7 @@ public class AnnotationUtilsTests {
@ContextConfig @ContextConfig
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface AliasedComposedContextConfig { @interface AliasedComposedContextConfig {
@AliasFor(annotation = ContextConfig.class, attribute = "locations") @AliasFor(annotation = ContextConfig.class, attribute = "locations")
String xmlConfigFile(); String xmlConfigFile();

Loading…
Cancel
Save