Merge branch '1.1.x'

wilkinsona · wilkinsona · commit 886bbc3b412a · 2014-10-15T16:36:11.000+01:00
diff --git a/spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTests.java
@@ -36,14 +36,14 @@
 import static org.junit.Assert.assertTrue;
 
 /**
- * The SampleDataGemFireApplicationTest class is a test suite with test cases testing the
+ * The SampleDataGemFireApplicationTests class is a test suite with test cases testing the
  * SampleDataGemFireApplication in Spring Boot.
  *
  * @author John Blum
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = SampleDataGemFireApplication.class)
-public class SampleDataGemFireApplicationTest {
+public class SampleDataGemFireApplicationTests {
 
 	@Autowired
 	private GemstoneService gemstoneService;
diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/ByteArrayRandomAccessDataTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/ByteArrayRandomAccessDataTests.java
@@ -28,7 +28,7 @@
  *
  * @author Phillip Webb
  */
-public class ByteArrayRandomAccessDataTest {
+public class ByteArrayRandomAccessDataTests {
 
 	@Test
 	public void testGetInputStream() throws Exception {
diff --git a/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java
@@ -34,7 +34,7 @@
  *
  * @author Phillip Webb
  */
-public class AnsiOutputTest {
+public class AnsiOutputTests {
 
 	@BeforeClass
 	public static void enable() {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* @author Phillip Webb`
`30`	`30`	`*/`
`31`		`-public class ByteArrayRandomAccessDataTest {`
	`31`	`+public class ByteArrayRandomAccessDataTests {`
`32`	`32`
`33`	`33`	`@Test`
`34`	`34`	`public void testGetInputStream() throws Exception {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`* @author Phillip Webb`
`36`	`36`	`*/`
`37`		`-public class AnsiOutputTest {`
	`37`	`+public class AnsiOutputTests {`
`38`	`38`
`39`	`39`	`@BeforeClass`
`40`	`40`	`public static void enable() {`