From b0c6357540eba4a4ec8311a7806e076ee14c590f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 25 Mar 2016 16:22:11 +0100
Subject: [PATCH] Test @Sql as a merged composed annotation

Issue: SPR-13973
---
 .../ComposedAnnotationSqlScriptsTests.java    | 72 +++++++++++++++++++
 .../jdbc/MetaAnnotationSqlScriptsTests.java   |  4 +-
 2 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 spring-test/src/test/java/org/springframework/test/context/jdbc/ComposedAnnotationSqlScriptsTests.java

diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/ComposedAnnotationSqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/ComposedAnnotationSqlScriptsTests.java
new file mode 100644
index 0000000000..0e70973997
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/jdbc/ComposedAnnotationSqlScriptsTests.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2002-2016 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.
+ * You may obtain a copy of the License at
+ *
+ *      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,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.jdbc;
+
+import java.lang.annotation.Retention;
+
+import org.junit.Test;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
+import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
+
+import static java.lang.annotation.RetentionPolicy.*;
+import static org.junit.Assert.*;
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.*;
+
+/**
+ * Integration tests that verify support for using {@link Sql @Sql} as a
+ * merged, composed annotation.
+ *
+ * @author Sam Brannen
+ * @since 4.3
+ */
+@ContextConfiguration(classes = EmptyDatabaseConfig.class)
+@DirtiesContext
+public class ComposedAnnotationSqlScriptsTests extends AbstractTransactionalJUnit4SpringContextTests {
+
+	@Test
+	@ComposedSql(
+		scripts = { "drop-schema.sql", "schema.sql" },
+		statements = "INSERT INTO user VALUES('Dilbert')",
+		executionPhase = BEFORE_TEST_METHOD
+	)
+	public void composedSqlAnnotation() {
+		assertEquals("Number of rows in the 'user' table.", 1, countRowsInTable("user"));
+	}
+
+
+	@Sql
+	@Retention(RUNTIME)
+	@interface ComposedSql {
+
+		@AliasFor(annotation = Sql.class)
+		String[] value() default {};
+
+		@AliasFor(annotation = Sql.class)
+		String[] scripts() default {};
+
+		@AliasFor(annotation = Sql.class)
+		String[] statements() default {};
+
+		@AliasFor(annotation = Sql.class)
+		ExecutionPhase executionPhase();
+	}
+
+}
diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/MetaAnnotationSqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/MetaAnnotationSqlScriptsTests.java
index 3417c17f79..4fc2069e63 100644
--- a/spring-test/src/test/java/org/springframework/test/context/jdbc/MetaAnnotationSqlScriptsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/jdbc/MetaAnnotationSqlScriptsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
 
 /**
  * Integration tests that verify support for using {@link Sql @Sql} and
- * {@link SqlGroup @SqlGroup} as a meta-annotations.
+ * {@link SqlGroup @SqlGroup} as meta-annotations.
  *
  * @author Sam Brannen
  * @since 4.1