From d7ae8cafbff1309d2b14440f4242fbdc9c514611 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 4 Nov 2013 22:20:02 -0800 Subject: [PATCH] Move tests from 'samples' to 'test-samples' --- .../boot/cli/TestCommandIntegrationTests.java | 18 +++++++++--------- .../{samples => test-samples}/book.groovy | 0 .../book_and_tests.groovy | 0 .../{samples => test-samples}/empty.groovy | 0 .../{samples => test-samples}/failures.groovy | 0 .../{samples => test-samples}/spock.groovy | 0 .../{samples => test-samples}/test.groovy | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename spring-boot-cli/{samples => test-samples}/book.groovy (100%) rename spring-boot-cli/{samples => test-samples}/book_and_tests.groovy (100%) rename spring-boot-cli/{samples => test-samples}/empty.groovy (100%) rename spring-boot-cli/{samples => test-samples}/failures.groovy (100%) rename spring-boot-cli/{samples => test-samples}/spock.groovy (100%) rename spring-boot-cli/{samples => test-samples}/test.groovy (100%) diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/TestCommandIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/TestCommandIntegrationTests.java index 8b14af35041..06dfee13b7c 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/TestCommandIntegrationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/TestCommandIntegrationTests.java @@ -54,7 +54,7 @@ public class TestCommandIntegrationTests { @Test public void noTests() throws Throwable { TestCommand command = new TestCommand(); - command.run("samples/book.groovy"); + command.run("test-samples/book.groovy"); TestResults results = command.getResults(); assertEquals(0, results.getRunCount()); assertEquals(0, results.getFailureCount()); @@ -64,7 +64,7 @@ public class TestCommandIntegrationTests { @Test public void empty() throws Exception { TestCommand command = new TestCommand(); - command.run("samples/empty.groovy"); + command.run("test-samples/empty.groovy"); TestResults results = command.getResults(); assertEquals(0, results.getRunCount()); assertEquals(0, results.getFailureCount()); @@ -75,10 +75,10 @@ public class TestCommandIntegrationTests { public void noFile() throws Exception { try { TestCommand command = new TestCommand(); - command.run("samples/nothing.groovy"); + command.run("test-samples/nothing.groovy"); } catch (RuntimeException ex) { - assertEquals("Can't find samples/nothing.groovy", ex.getMessage()); + assertEquals("Can't find test-samples/nothing.groovy", ex.getMessage()); throw ex; } } @@ -86,7 +86,7 @@ public class TestCommandIntegrationTests { @Test public void appAndTestsInOneFile() throws Exception { TestCommand command = new TestCommand(); - command.run("samples/book_and_tests.groovy"); + command.run("test-samples/book_and_tests.groovy"); TestResults results = command.getResults(); assertEquals(1, results.getRunCount()); assertEquals(0, results.getFailureCount()); @@ -96,7 +96,7 @@ public class TestCommandIntegrationTests { @Test public void appInOneFileTestsInAnotherFile() throws Exception { TestCommand command = new TestCommand(); - command.run("samples/book.groovy", "samples/test.groovy"); + command.run("test-samples/book.groovy", "test-samples/test.groovy"); TestResults results = command.getResults(); assertEquals(1, results.getRunCount()); assertEquals(0, results.getFailureCount()); @@ -106,7 +106,7 @@ public class TestCommandIntegrationTests { @Test public void spockTester() throws Exception { TestCommand command = new TestCommand(); - command.run("samples/spock.groovy"); + command.run("test-samples/spock.groovy"); TestResults results = command.getResults(); assertEquals(1, results.getRunCount()); assertEquals(0, results.getFailureCount()); @@ -116,7 +116,7 @@ public class TestCommandIntegrationTests { @Test public void spockAndJunitTester() throws Exception { TestCommand command = new TestCommand(); - command.run("samples/spock.groovy", "samples/book_and_tests.groovy"); + command.run("test-samples/spock.groovy", "test-samples/book_and_tests.groovy"); TestResults results = command.getResults(); assertEquals(2, results.getRunCount()); assertEquals(0, results.getFailureCount()); @@ -126,7 +126,7 @@ public class TestCommandIntegrationTests { @Test public void verifyFailures() throws Exception { TestCommand command = new TestCommand(); - command.run("samples/failures.groovy"); + command.run("test-samples/failures.groovy"); TestResults results = command.getResults(); assertEquals(5, results.getRunCount()); assertEquals(3, results.getFailureCount()); diff --git a/spring-boot-cli/samples/book.groovy b/spring-boot-cli/test-samples/book.groovy similarity index 100% rename from spring-boot-cli/samples/book.groovy rename to spring-boot-cli/test-samples/book.groovy diff --git a/spring-boot-cli/samples/book_and_tests.groovy b/spring-boot-cli/test-samples/book_and_tests.groovy similarity index 100% rename from spring-boot-cli/samples/book_and_tests.groovy rename to spring-boot-cli/test-samples/book_and_tests.groovy diff --git a/spring-boot-cli/samples/empty.groovy b/spring-boot-cli/test-samples/empty.groovy similarity index 100% rename from spring-boot-cli/samples/empty.groovy rename to spring-boot-cli/test-samples/empty.groovy diff --git a/spring-boot-cli/samples/failures.groovy b/spring-boot-cli/test-samples/failures.groovy similarity index 100% rename from spring-boot-cli/samples/failures.groovy rename to spring-boot-cli/test-samples/failures.groovy diff --git a/spring-boot-cli/samples/spock.groovy b/spring-boot-cli/test-samples/spock.groovy similarity index 100% rename from spring-boot-cli/samples/spock.groovy rename to spring-boot-cli/test-samples/spock.groovy diff --git a/spring-boot-cli/samples/test.groovy b/spring-boot-cli/test-samples/test.groovy similarity index 100% rename from spring-boot-cli/samples/test.groovy rename to spring-boot-cli/test-samples/test.groovy