* ProfileValueSourceConfiguration is a class-level annotation which is used to * specify what type of {@link ProfileValueSource} to use when retrieving - * profile values configured via the - * {@link IfProfileValue @IfProfileValue} annotation. + * profile values configured via the {@link IfProfileValue + * @IfProfileValue} annotation. *
- * + * * @author Sam Brannen * @since 2.5 * @see ProfileValueSource * @see IfProfileValue * @see ProfileValueUtils */ +@Documented +@Inherited @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) -@Inherited -@Documented public @interface ProfileValueSourceConfiguration { /** @@ -48,7 +48,7 @@ public @interface ProfileValueSourceConfiguration { * The type of {@link ProfileValueSource} to use when retrieving * profile values. * - * + * * @see SystemProfileValueSource */ Class value() default SystemProfileValueSource.class; diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/Repeat.java b/org.springframework.test/src/main/java/org/springframework/test/annotation/Repeat.java index b2e832fac3f6c54fc6641bd96b843346a13134d9..f0c7591ac8b8468a5b0a30906707120054109efb 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/annotation/Repeat.java +++ b/org.springframework.test/src/main/java/org/springframework/test/annotation/Repeat.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2009 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. @@ -26,16 +26,16 @@ import java.lang.annotation.Target; * Test annotation to indicate that a test method should be invoked repeatedly. * * Note that the scope of execution to be repeated includes execution of the - * test method itself as well as any set up or tear down - * of the test fixture. - * + * test method itself as well as any set up or tear down of + * the test fixture. + * * @author Rod Johnson * @author Sam Brannen * @since 2.0 */ -@Target( { ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) @Documented +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) public @interface Repeat { int value() default 1; diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/Rollback.java b/org.springframework.test/src/main/java/org/springframework/test/annotation/Rollback.java index 03c902c341b85ba27ad88419dbc2a2b72aa9ba4c..052b419f95d6b3d5bd394d15786bfee6872c80dd 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/annotation/Rollback.java +++ b/org.springframework.test/src/main/java/org/springframework/test/annotation/Rollback.java @@ -27,13 +27,13 @@ import java.lang.annotation.Target; * test method should be rolled back after the test method has * completed. Iftrue, the transaction will be rolled back;
* otherwise, the transaction will be committed.
- *
+ *
* @author Sam Brannen
* @since 2.5
*/
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
public @interface Rollback {
/**
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/Timed.java b/org.springframework.test/src/main/java/org/springframework/test/annotation/Timed.java
index aaba1d92cd59cb22e92f0750d820401de5fd4597..94f7d0df148f6c27fe926bd16db863abbd99bb6c 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/annotation/Timed.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/annotation/Timed.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -36,16 +36,16 @@ import java.lang.annotation.Target;
* {@link Repeat repetitions} of the test, and any set up or
* tear down of the test fixture.
*
- *
+ *
* @author Rod Johnson
* @author Sam Brannen
* @since 2.0
* @see Repeat
* @see AbstractAnnotationAwareTransactionalTests
*/
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
public @interface Timed {
/**
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/ContextConfiguration.java b/org.springframework.test/src/main/java/org/springframework/test/context/ContextConfiguration.java
index 6c0f46a095ee9be5a8eb26b4b151c16a8f3ac41c..d21e8cb429f8c3554ab3da8f6422fecfeb304ab0 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/context/ContextConfiguration.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/context/ContextConfiguration.java
@@ -27,16 +27,16 @@ import java.lang.annotation.Target;
* ContextConfiguration defines class-level metadata which can be used to
* instruct client code with regard to how to load and configure an
* {@link org.springframework.context.ApplicationContext ApplicationContext}.
- *
+ *
* @author Sam Brannen
* @since 2.5
* @see ContextLoader
* @see org.springframework.context.ApplicationContext
*/
+@Documented
+@Inherited
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
-@Inherited
-@Documented
public @interface ContextConfiguration {
/**
@@ -62,7 +62,7 @@ public @interface ContextConfiguration {
* defined by an annotated superclass. Thus, subclasses have the option of
* extending the list of resource locations. In the following
* example, the {@link org.springframework.context.ApplicationContext ApplicationContext}
- * for ExtendedTest will be loaded from
+ * for ExtendedTest will be loaded from
* "base-context.xml" and
* "extended-context.xml", in that order. Beans defined in
* "extended-context.xml" may therefore override those defined in
@@ -70,12 +70,12 @@ public @interface ContextConfiguration {
*
* @ContextConfiguration("base-context.xml")
* public class BaseTest {
- * // ...
+ * // ...
* }
*
* @ContextConfiguration("extended-context.xml")
* public class ExtendedTest extends BaseTest {
- * // ...
+ * // ...
* }
*
* If inheritLocations is set to false, the
@@ -89,8 +89,8 @@ public @interface ContextConfiguration {
* {@link org.springframework.context.ApplicationContext ApplicationContext}.
* If not specified, the loader will be inherited from the first superclass
* which is annotated with @ContextConfiguration and specifies
- * an explicit loader. If no class in the hierarchy specifies an explicit
- * loader, a default loader will be used instead.
+ * an explicit loader. If no class in the hierarchy specifies an explicit
+ * loader, a default loader will be used instead.
*/
Class loader() default ContextLoader.class;
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/TestExecutionListeners.java b/org.springframework.test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
index 390a509876f6aafa3b6ca0e78c6ce774a0fd7208..b9e6e9cb108f5f1ba5c7c20f9c7fe4b51891718f 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
@@ -29,17 +29,17 @@ import java.lang.annotation.Target;
* be registered with a {@link TestContextManager}. Typically,
* @TestExecutionListeners will be used in conjunction with
* {@link ContextConfiguration @ContextConfiguration}.
- *
+ *
* @author Sam Brannen
* @since 2.5
* @see TestExecutionListener
* @see TestContextManager
* @see ContextConfiguration
*/
+@Documented
+@Inherited
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
-@Inherited
-@Documented
public @interface TestExecutionListeners {
/**
@@ -47,7 +47,7 @@ public @interface TestExecutionListeners {
* The {@link TestExecutionListener TestExecutionListeners} to register with
* a {@link TestContextManager}.
*
DirtiesContextTestExecutionListener, and
* TransactionalTestExecutionListener, in that order.
*
- *
+ *
*
* @TestExecutionListeners({ DependencyInjectionTestExecutionListener.class,
- * DirtiesContextTestExecutionListener.class })
+ * DirtiesContextTestExecutionListener.class })
* public abstract class AbstractBaseTest {
- * // ...
+ * // ...
* }
- *
+ *
* @TestExecutionListeners(TransactionalTestExecutionListener.class)
* public class TransactionalTest extends AbstractBaseTest {
- * // ...
+ * // ...
* }
*
- *
+ *
*
* If inheritListeners is set to false, the
* listeners for the annotated class will shadow and effectively
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java b/org.springframework.test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
index 26a7a44c424d2e7bda7385cfd1ca89a8cd6d551b..7900cf30bfda9a0ae6fae574a3a9b089db0c06c0 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -33,14 +33,13 @@ import java.lang.annotation.Target;
* The @AfterTransaction methods of superclasses will be
* executed after those of the current class.
*
@BeforeTransaction methods of superclasses will be
* executed before those of the current class.
*
- *
+ *
* @author Sam Brannen
* @since 2.5
* @see org.springframework.transaction.annotation.Transactional
*/
-@Target( { ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
public @interface BeforeTransaction {
-
}
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java b/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java
index 420f35d7a6856f383cd6604b2ee83e3fdeaf594b..98d58635f1800b6d99b9ce02dfebfaae30e0db26 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/context/transaction/TransactionConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -29,16 +29,16 @@ import org.springframework.transaction.PlatformTransactionManager;
/**
* TransactionConfiguration defines class-level metadata for configuring
* transactional tests.
- *
+ *
* @author Sam Brannen
* @since 2.5
* @see ContextConfiguration
* @see TransactionalTestExecutionListener
*/
+@Documented
+@Inherited
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
-@Inherited
-@Documented
public @interface TransactionConfiguration {
/**