From 910dd4146721a803cd9d246b91854e77ffe9272a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 11 Apr 2014 18:43:36 +0200
Subject: [PATCH] Polish AbstractDatabasePopulatorTests

---
 .../init/AbstractDatabasePopulatorTests.java  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabasePopulatorTests.java
index 82d8acfedc..89a5060ad9 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabasePopulatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabasePopulatorTests.java
@@ -41,7 +41,7 @@ public abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseIni
 
 
 	@Test
-	public void buildWithCommentsAndFailedDrop() throws Exception {
+	public void scriptWithSingleLineCommentsAndFailedDrop() throws Exception {
 		databasePopulator.addScript(resource("db-schema-failed-drop-comments.sql"));
 		databasePopulator.addScript(resource("db-test-data.sql"));
 		databasePopulator.setIgnoreFailedDrops(true);
@@ -50,7 +50,7 @@ public abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseIni
 	}
 
 	@Test
-	public void buildWithNormalEscapedLiteral() throws Exception {
+	public void scriptWithStandardEscapedLiteral() throws Exception {
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-escaped-literal.sql"));
 		DatabasePopulatorUtils.execute(databasePopulator, db);
@@ -58,7 +58,7 @@ public abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseIni
 	}
 
 	@Test
-	public void buildWithMySQLEscapedLiteral() throws Exception {
+	public void scriptWithMySqlEscapedLiteral() throws Exception {
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-mysql-escaped-literal.sql"));
 		DatabasePopulatorUtils.execute(databasePopulator, db);
@@ -66,7 +66,7 @@ public abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseIni
 	}
 
 	@Test
-	public void buildWithMultipleStatements() throws Exception {
+	public void scriptWithMultipleStatements() throws Exception {
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-multiple.sql"));
 		DatabasePopulatorUtils.execute(databasePopulator, db);
@@ -77,7 +77,7 @@ public abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseIni
 	}
 
 	@Test
-	public void buildWithMultipleStatementsLongSeparator() throws Exception {
+	public void scriptWithMultipleStatementsAndLongSeparator() throws Exception {
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-endings.sql"));
 		databasePopulator.setSeparator("@@");
@@ -89,7 +89,7 @@ public abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseIni
 	}
 
 	@Test
-	public void buildWithMultipleStatementsWhitespaceSeparator() throws Exception {
+	public void scriptWithMultipleStatementsAndWhitespaceSeparator() throws Exception {
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-whitespace.sql"));
 		databasePopulator.setSeparator("/\n");
@@ -101,7 +101,7 @@ public abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseIni
 	}
 
 	@Test
-	public void buildWithMultipleStatementsNewlineSeparator() throws Exception {
+	public void scriptWithMultipleStatementsAndNewlineSeparator() throws Exception {
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-newline.sql"));
 		DatabasePopulatorUtils.execute(databasePopulator, db);
@@ -112,7 +112,7 @@ public abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseIni
 	}
 
 	@Test
-	public void buildWithMultipleStatementsMultipleNewlineSeparator() throws Exception {
+	public void scriptWithMultipleStatementsAndMultipleNewlineSeparator() throws Exception {
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-multi-newline.sql"));
 		databasePopulator.setSeparator("\n\n");
@@ -144,7 +144,7 @@ public abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseIni
 		databasePopulator.setSeparator(ScriptUtils.EOF_STATEMENT_SEPARATOR);
 		databasePopulator.addScript(resource("drop-users-schema.sql"));
 		databasePopulator.addScript(resource("users-schema-without-separator.sql"));
-		databasePopulator.addScript(resource("users-data.sql"));
+		databasePopulator.addScript(resource("users-data-without-separator.sql"));
 		DatabasePopulatorUtils.execute(databasePopulator, db);
 
 		assertUsersDatabaseCreated("Brannen");
@@ -159,7 +159,7 @@ public abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseIni
 	}
 
 	@Test
-	public void buildWithSelectStatements() throws Exception {
+	public void scriptWithSelectStatements() throws Exception {
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-select.sql"));
 		DatabasePopulatorUtils.execute(databasePopulator, db);