Merge pull request #5936 from izeye:polish-20160513

* pr/5936:
  Polish

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/AbstractSocialAutoConfigurationTests.java

@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
  *
  * @author Craig Walls
  */
-public class AbstractSocialAutoConfigurationTests {
+public abstract class AbstractSocialAutoConfigurationTests {
 
 	protected AnnotationConfigWebApplicationContext context;
 

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java

@@ -47,7 +47,7 @@ import static org.mockito.Mockito.verify;
  *
  * @author Andy Wilkinson
  */
-public class AbstractDevToolsDataSourceAutoConfigurationTests {
+public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
 
 	@Test
 	public void singleManuallyConfiguredDataSourceIsNotClosed() throws SQLException {

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsPooledDataSourceAutoConfigurationTests.java

@@ -22,10 +22,8 @@ import java.sql.Statement;
 import javax.sql.DataSource;
 
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.testutil.FilteredClassPathRunner;
 import org.springframework.context.ConfigurableApplicationContext;
 
 import static org.mockito.Mockito.times;
@@ -36,7 +34,6 @@ import static org.mockito.Mockito.verify;
  *
  * @author Andy Wilkinson
  */
-@RunWith(FilteredClassPathRunner.class)
 public class DevToolsPooledDataSourceAutoConfigurationTests
 		extends AbstractDevToolsDataSourceAutoConfigurationTests {
 

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBean.java

@@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.SpringRunner;
  * {@link RunWith @RunWith} the {@link SpringRunner}.
  * <p>
  * Spies can be applied by type or by {@link #name() bean name}. All beans in the context
- * of the same type will be wrapped with the spy, if no existing bean is defined a new one
+ * of the same type will be wrapped with the spy. If no existing bean is defined a new one
  * will be added.
  * <p>
  * When {@code @SpyBean} is used on a field, as well as being registered in the
@@ -69,7 +69,7 @@ import org.springframework.test.context.junit4.SpringRunner;
  * </pre>
  * <p>
  * This annotation is {@code @Repeatable} and may be specified multiple times when working
- * with Java 8 or contained within an {@link SpyBeans @SpyBeans} annotation.
+ * with Java 8 or contained within a {@link SpyBeans @SpyBeans} annotation.
  *
  * @author Phillip Webb
  * @since 1.4.0
@@ -91,7 +91,7 @@ public @interface SpyBean {
 	/**
 	 * The classes to spy. This is an alias of {@link #classes()} which can be used for
 	 * brevity if no other attributes are defined. See {@link #classes()} for details.
-	 * @return the classes to mock
+	 * @return the classes to spy
 	 */
 	@AliasFor("classes")
 	Class<?>[] value() default {};
@@ -100,12 +100,12 @@ public @interface SpyBean {
 	 * The classes to spy. Each class specified here will result in a spy being applied.
 	 * Classes can be omitted when the annotation is used on a field.
 	 * <p>
-	 * When {@code @MockBean} also defines a {@code name} this attribute can only contain
+	 * When {@code @SpyBean} also defines a {@code name} this attribute can only contain
 	 * a single value.
 	 * <p>
 	 * If this is the only specified attribute consider using the {@code value} alias
 	 * instead.
-	 * @return the classes to mock
+	 * @return the classes to spy
 	 */
 	@AliasFor("value")
 	Class<?>[] classes() default {};

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForExistingBeanIntegrationTests.java

@@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify;
  * @see SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests
  */
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = MockBeanOnTestFieldForExistingBeanConfig.class)
+@ContextConfiguration(classes = SpyBeanOnTestFieldForExistingBeanConfig.class)
 public class SpyBeanOnTestFieldForExistingBeanIntegrationTests {
 
 	@SpyBean

spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java

@@ -67,14 +67,14 @@ public class SpringPhysicalNamingStrategy implements PhysicalNamingStrategy {
 		}
 		StringBuilder text = new StringBuilder(name.getText().replace('.', '_'));
 		for (int i = 1; i < text.length() - 1; i++) {
-			if (isDashRequired(text.charAt(i - 1), text.charAt(i), text.charAt(i + 1))) {
+			if (isUnderscoreRequired(text.charAt(i - 1), text.charAt(i), text.charAt(i + 1))) {
 				text.insert(i++, '_');
 			}
 		}
 		return new Identifier(text.toString().toLowerCase(Locale.ROOT), name.isQuoted());
 	}
 
-	private boolean isDashRequired(char before, char current, char after) {
+	private boolean isUnderscoreRequired(char before, char current, char after) {
 		return Character.isLowerCase(before) && Character.isUpperCase(current)
 				&& Character.isLowerCase(after);
 	}