Add missing author tags and sync SQL script support for JDBC & R2DBC

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabaseInitializationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 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,15 +29,13 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
-
 /**
  * Abstract base class for integration tests involving database initialization.
  *
  * @author Sam Brannen
  * @since 4.0.3
  */
-public abstract class AbstractDatabaseInitializationTests {
+abstract class AbstractDatabaseInitializationTests {
 
 	private final ClassRelativeResourceLoader resourceLoader = new ClassRelativeResourceLoader(getClass());
 
@@ -47,13 +45,13 @@ public abstract class AbstractDatabaseInitializationTests {
 
 
 	@BeforeEach
-	public void setUp() {
+	void setUp() {
 		db = new EmbeddedDatabaseBuilder().setType(getEmbeddedDatabaseType()).build();
 		jdbcTemplate = new JdbcTemplate(db);
 	}
 
 	@AfterEach
-	public void shutDown() {
+	void shutDown() {
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
 			TransactionSynchronizationManager.clear();
 			TransactionSynchronizationManager.unbindResource(db);

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify;
  * @author Juergen Hoeller
  * @since 4.3
  */
-public class CompositeDatabasePopulatorTests {
+class CompositeDatabasePopulatorTests {
 
 	private final Connection mockedConnection = mock(Connection.class);
 
@@ -44,49 +44,59 @@ public class CompositeDatabasePopulatorTests {
 
 
 	@Test
-	public void addPopulators() throws SQLException {
+	void addPopulators() throws SQLException {
 		CompositeDatabasePopulator populator = new CompositeDatabasePopulator();
 		populator.addPopulators(mockedDatabasePopulator1, mockedDatabasePopulator2);
-		populator.populate(mockedConnection);
-		verify(mockedDatabasePopulator1,times(1)).populate(mockedConnection);
-		verify(mockedDatabasePopulator2, times(1)).populate(mockedConnection);
-	}
 
-	@Test
-	public void setPopulatorsWithMultiple() throws SQLException {
-		CompositeDatabasePopulator populator = new CompositeDatabasePopulator();
-		populator.setPopulators(mockedDatabasePopulator1, mockedDatabasePopulator2);  // multiple
 		populator.populate(mockedConnection);
+
 		verify(mockedDatabasePopulator1, times(1)).populate(mockedConnection);
 		verify(mockedDatabasePopulator2, times(1)).populate(mockedConnection);
 	}
 
 	@Test
-	public void setPopulatorsForOverride() throws SQLException {
+	void setPopulatorsWithMultiple() throws SQLException {
+		CompositeDatabasePopulator populator = new CompositeDatabasePopulator();
+		populator.setPopulators(mockedDatabasePopulator1, mockedDatabasePopulator2);  // multiple
+
+		populator.populate(mockedConnection);
+
+		verify(mockedDatabasePopulator1, times(1)).populate(mockedConnection);
+		verify(mockedDatabasePopulator2, times(1)).populate(mockedConnection);
+	}
+
+	@Test
+	void setPopulatorsForOverride() throws SQLException {
 		CompositeDatabasePopulator populator = new CompositeDatabasePopulator();
 		populator.setPopulators(mockedDatabasePopulator1);
 		populator.setPopulators(mockedDatabasePopulator2);  // override
+
 		populator.populate(mockedConnection);
+
 		verify(mockedDatabasePopulator1, times(0)).populate(mockedConnection);
 		verify(mockedDatabasePopulator2, times(1)).populate(mockedConnection);
 	}
 
 	@Test
-	public void constructWithVarargs() throws SQLException {
+	void constructWithVarargs() throws SQLException {
 		CompositeDatabasePopulator populator =
 				new CompositeDatabasePopulator(mockedDatabasePopulator1, mockedDatabasePopulator2);
+
 		populator.populate(mockedConnection);
+
 		verify(mockedDatabasePopulator1, times(1)).populate(mockedConnection);
 		verify(mockedDatabasePopulator2, times(1)).populate(mockedConnection);
 	}
 
 	@Test
-	public void constructWithCollection() throws SQLException {
+	void constructWithCollection() throws SQLException {
 		Set<DatabasePopulator> populators = new LinkedHashSet<>();
 		populators.add(mockedDatabasePopulator1);
 		populators.add(mockedDatabasePopulator2);
+
 		CompositeDatabasePopulator populator = new CompositeDatabasePopulator(populators);
 		populator.populate(mockedConnection);
+
 		verify(mockedDatabasePopulator1, times(1)).populate(mockedConnection);
 		verify(mockedDatabasePopulator2, times(1)).populate(mockedConnection);
 	}

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/H2DatabasePopulatorIntegrationTests.java

@@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Sam Brannen
  * @since 4.0.3
  */
-class H2DatabasePopulatorTests extends AbstractDatabasePopulatorTests {
+class H2DatabasePopulatorIntegrationTests extends AbstractDatabasePopulatorTests {
 
 	@Override
 	protected EmbeddedDatabaseType getEmbeddedDatabaseType() {

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulatorUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -17,12 +17,12 @@
 package org.springframework.jdbc.datasource.init;
 
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import org.springframework.core.io.Resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.mockito.BDDMockito.mock;
 
 /**
  * Unit tests for {@link ResourceDatabasePopulator}.
@@ -31,84 +31,84 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
  * @since 4.1
  * @see AbstractDatabasePopulatorTests
  */
-public class ResourceDatabasePopulatorTests {
+class ResourceDatabasePopulatorUnitTests {
 
-	private static final Resource script1 = Mockito.mock(Resource.class);
-	private static final Resource script2 = Mockito.mock(Resource.class);
-	private static final Resource script3 = Mockito.mock(Resource.class);
+	private static final Resource script1 = mock(Resource.class);
+	private static final Resource script2 = mock(Resource.class);
+	private static final Resource script3 = mock(Resource.class);
 
 
 	@Test
-	public void constructWithNullResource() {
+	void constructWithNullResource() {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				new ResourceDatabasePopulator((Resource) null));
 	}
 
 	@Test
-	public void constructWithNullResourceArray() {
+	void constructWithNullResourceArray() {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				new ResourceDatabasePopulator((Resource[]) null));
 	}
 
 	@Test
-	public void constructWithResource() {
+	void constructWithResource() {
 		ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator(script1);
-		assertThat(databasePopulator.scripts.size()).isEqualTo(1);
+		assertThat(databasePopulator.scripts).hasSize(1);
 	}
 
 	@Test
-	public void constructWithMultipleResources() {
+	void constructWithMultipleResources() {
 		ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator(script1, script2);
-		assertThat(databasePopulator.scripts.size()).isEqualTo(2);
+		assertThat(databasePopulator.scripts).hasSize(2);
 	}
 
 	@Test
-	public void constructWithMultipleResourcesAndThenAddScript() {
+	void constructWithMultipleResourcesAndThenAddScript() {
 		ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator(script1, script2);
-		assertThat(databasePopulator.scripts.size()).isEqualTo(2);
+		assertThat(databasePopulator.scripts).hasSize(2);
 
 		databasePopulator.addScript(script3);
-		assertThat(databasePopulator.scripts.size()).isEqualTo(3);
+		assertThat(databasePopulator.scripts).hasSize(3);
 	}
 
 	@Test
-	public void addScriptsWithNullResource() {
+	void addScriptsWithNullResource() {
 		ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				databasePopulator.addScripts((Resource) null));
 	}
 
 	@Test
-	public void addScriptsWithNullResourceArray() {
+	void addScriptsWithNullResourceArray() {
 		ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				databasePopulator.addScripts((Resource[]) null));
 	}
 
 	@Test
-	public void setScriptsWithNullResource() {
+	void setScriptsWithNullResource() {
 		ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				databasePopulator.setScripts((Resource) null));
 	}
 
 	@Test
-	public void setScriptsWithNullResourceArray() {
+	void setScriptsWithNullResourceArray() {
 		ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				databasePopulator.setScripts((Resource[]) null));
 	}
 
 	@Test
-	public void setScriptsAndThenAddScript() {
+	void setScriptsAndThenAddScript() {
 		ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
-		assertThat(databasePopulator.scripts.size()).isEqualTo(0);
+		assertThat(databasePopulator.scripts).isEmpty();
 
 		databasePopulator.setScripts(script1, script2);
-		assertThat(databasePopulator.scripts.size()).isEqualTo(2);
+		assertThat(databasePopulator.scripts).hasSize(2);
 
 		databasePopulator.addScript(script3);
-		assertThat(databasePopulator.scripts.size()).isEqualTo(3);
+		assertThat(databasePopulator.scripts).hasSize(3);
 	}
 
 }