XD-631 Pluralize test classes

* Pluralize test classes in package org.springframework.xd.shell.command
spring-attic · Jul 17, 2015 · e18541c · e18541c
1 parent 9933841
commit e18541c
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 28 deletions.
diff --git a/...ell/src/test/java/org/springframework/xd/shell/command/AbstractStreamIntegrationTest.java b/...ell/src/test/java/org/springframework/xd/shell/command/AbstractStreamIntegrationTest.java
@@ -53,7 +53,7 @@
  */
 public abstract class AbstractStreamIntegrationTest extends AbstractShellIntegrationTest {
 
-	private StreamCommandTemplate streamOps;
+	private StreamCommandsTemplate streamOps;
 
 	private List<Disposable> disposables = new ArrayList<Disposable>();
 
@@ -62,7 +62,7 @@ public abstract class AbstractStreamIntegrationTest extends AbstractShellIntegra
 	private ModuleTemplate moduleTemplate;
 
 	public AbstractStreamIntegrationTest() {
-		streamOps = new StreamCommandTemplate(getShell(), integrationTestSupport);
+		streamOps = new StreamCommandsTemplate(getShell(), integrationTestSupport);
 		metrics = new MetricsTemplate(getShell());
 		moduleTemplate = new ModuleTemplate(getShell());
 		disposables.add(metrics);
@@ -73,7 +73,7 @@ protected MetricsTemplate metrics() {
 		return metrics;
 	}
 
-	protected StreamCommandTemplate stream() {
+	protected StreamCommandsTemplate stream() {
 		return streamOps;
 	}
 

diff --git a/...rk/xd/shell/command/HttpCommandTests.java → ...k/xd/shell/command/HttpCommandsTests.java b/...rk/xd/shell/command/HttpCommandTests.java → ...k/xd/shell/command/HttpCommandsTests.java
@@ -45,9 +45,9 @@
  * @author Gunnar Hillert
  * @since 1.0
  */
-public class HttpCommandTests extends AbstractStreamIntegrationTest {
+public class HttpCommandsTests extends AbstractStreamIntegrationTest {
 
-	private static final Logger logger = LoggerFactory.getLogger(HttpCommandTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(HttpCommandsTests.class);
 
 	@Rule
 	public TemporaryFolder testFolder = new TemporaryFolder();

diff --git a/...ommand/JarDeletingModuleCommandTests.java → ...mmand/JarDeletingModuleCommandsTests.java b/...ommand/JarDeletingModuleCommandTests.java → ...mmand/JarDeletingModuleCommandsTests.java
@@ -33,7 +33,7 @@
  *
  * @author David Turanski
  */
-public class JarDeletingModuleCommandTests extends AbstractStreamIntegrationTest {
+public class JarDeletingModuleCommandsTests extends AbstractStreamIntegrationTest {
 
 	@ClassRule
 	public static HostNotWindowsRule hostNotWindowsRule = new HostNotWindowsRule();

diff --git a/...ork/xd/shell/command/JobCommandTests.java → ...rk/xd/shell/command/JobCommandsTests.java b/...ork/xd/shell/command/JobCommandTests.java → ...rk/xd/shell/command/JobCommandsTests.java
@@ -57,9 +57,9 @@
  * @since 1.0
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class JobCommandTests extends AbstractJobIntegrationTest {
+public class JobCommandsTests extends AbstractJobIntegrationTest {
 
-	private static final Logger logger = LoggerFactory.getLogger(JobCommandTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(JobCommandsTests.class);
 
 	@Test
 	public void testJobLifecycleForMyJob() throws InterruptedException {

diff --git a/...ll/command/JobCommandWithHadoopTests.java → ...l/command/JobCommandsWithHadoopTests.java b/...ll/command/JobCommandWithHadoopTests.java → ...l/command/JobCommandsWithHadoopTests.java
@@ -45,14 +45,14 @@
  * @author Gary Russell
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(loader = HadoopDelegatingSmartContextLoader.class, classes = JobCommandWithHadoopTests.EmptyConfig.class)
+@ContextConfiguration(loader = HadoopDelegatingSmartContextLoader.class, classes = JobCommandsWithHadoopTests.EmptyConfig.class)
 @MiniHadoopCluster
-public class JobCommandWithHadoopTests extends AbstractJobIntegrationTest {
+public class JobCommandsWithHadoopTests extends AbstractJobIntegrationTest {
 
 	@ClassRule
 	public static HostNotWindowsRule hostNotWindowsRule = new HostNotWindowsRule();
 
-	private static final Logger logger = LoggerFactory.getLogger(JobCommandWithHadoopTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(JobCommandsWithHadoopTests.class);
 
 	@Autowired
 	org.apache.hadoop.conf.Configuration configuration;

diff --git a/...rk/xd/shell/command/MailCommandTests.java → ...k/xd/shell/command/MailCommandsTests.java b/...rk/xd/shell/command/MailCommandTests.java → ...k/xd/shell/command/MailCommandsTests.java
@@ -39,7 +39,7 @@
  * 
  * @author Eric Bottard
  */
-public class MailCommandTests extends AbstractStreamIntegrationTest {
+public class MailCommandsTests extends AbstractStreamIntegrationTest {
 
 	@Test
 	public void testImapPoll() throws Exception {

diff --git a/.../xd/shell/command/ModuleCommandTests.java → ...xd/shell/command/ModuleCommandsTests.java b/.../xd/shell/command/ModuleCommandTests.java → ...xd/shell/command/ModuleCommandsTests.java
@@ -53,7 +53,7 @@
  * @author David Turanski
  * @author Eric Bottard
  */
-public class ModuleCommandTests extends AbstractStreamIntegrationTest {
+public class ModuleCommandsTests extends AbstractStreamIntegrationTest {
 
 	@Test
 	public void testModuleCompose() {

diff --git a/spring-xd-shell/src/test/java/org/springframework/xd/shell/command/NamedChannelTests.java b/spring-xd-shell/src/test/java/org/springframework/xd/shell/command/NamedChannelTests.java
@@ -36,7 +36,7 @@
  */
 public class NamedChannelTests extends AbstractStreamIntegrationTest {
 
-	private static final Logger logger = LoggerFactory.getLogger(StreamCommandTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(StreamCommandsTests.class);
 
 	@Test
 	public void testCreateNamedChannelAsSink() {

diff --git a/...xd/shell/command/RuntimeCommandTests.java → ...d/shell/command/RuntimeCommandsTests.java b/...xd/shell/command/RuntimeCommandTests.java → ...d/shell/command/RuntimeCommandsTests.java
@@ -43,9 +43,9 @@
  * @author Ilayaperumal Gopinathan
  * @author Patrick Peralta
  */
-public class RuntimeCommandTests extends AbstractStreamIntegrationTest {
+public class RuntimeCommandsTests extends AbstractStreamIntegrationTest {
 
-	private static final Logger logger = LoggerFactory.getLogger(RuntimeCommandTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(RuntimeCommandsTests.class);
 
 	@Test
 	public void testListContainers() {

diff --git a/.../test/java/org/springframework/xd/shell/command/SpelPropertyAccessorIntegrationTests.java b/.../test/java/org/springframework/xd/shell/command/SpelPropertyAccessorIntegrationTests.java
@@ -35,7 +35,7 @@
  */
 public class SpelPropertyAccessorIntegrationTests extends AbstractStreamIntegrationTest {
 
-	private static final Logger logger = LoggerFactory.getLogger(StreamCommandTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(StreamCommandsTests.class);
 
 	/**
 	 * This test focuses on tuple access. Note that it explicitly creates a tuple out of Json, which is no longer

diff --git a/.../src/test/java/org/springframework/xd/shell/command/SpringBatchWithParametersTasklet.java b/.../src/test/java/org/springframework/xd/shell/command/SpringBatchWithParametersTasklet.java
@@ -25,7 +25,7 @@
 import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.RepeatStatus;
-import org.springframework.xd.shell.command.JobCommandTests.JobParametersHolder;
+import org.springframework.xd.shell.command.JobCommandsTests.JobParametersHolder;
 
 public class SpringBatchWithParametersTasklet implements Tasklet {
 

diff --git a/.../shell/command/StreamCommandTemplate.java → ...shell/command/StreamCommandsTemplate.java b/.../shell/command/StreamCommandTemplate.java → ...shell/command/StreamCommandsTemplate.java
@@ -38,7 +38,7 @@
  * @author Mark Fisher
  * @author David Turanski
  */
-public class StreamCommandTemplate extends AbstractCommandTemplate {
+public class StreamCommandsTemplate extends AbstractCommandTemplate {
 
 	private List<String> streams = new ArrayList<String>();
 
@@ -48,7 +48,7 @@ public class StreamCommandTemplate extends AbstractCommandTemplate {
 	 * @param shell the spring shell to execute commands against
 	 */
 	/* default */
-	public StreamCommandTemplate(JLineShellComponent shell, SingleNodeIntegrationTestSupport integrationTestSupport) {
+	public StreamCommandsTemplate(JLineShellComponent shell, SingleNodeIntegrationTestSupport integrationTestSupport) {
 		super(shell, integrationTestSupport.streamStateVerifier());
 	}
 

diff --git a/.../xd/shell/command/StreamCommandTests.java → ...xd/shell/command/StreamCommandsTests.java b/.../xd/shell/command/StreamCommandTests.java → ...xd/shell/command/StreamCommandsTests.java
@@ -44,9 +44,9 @@
  * @author David Turanski
  * @author Ilayaperumal Gopinathan
  */
-public class StreamCommandTests extends AbstractStreamIntegrationTest {
+public class StreamCommandsTests extends AbstractStreamIntegrationTest {
 
-	private static final Logger logger = LoggerFactory.getLogger(StreamCommandTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(StreamCommandsTests.class);
 
 	@Test
 	public void testStreamLifecycleForTickTock() throws InterruptedException {

diff --git a/...shell/command/StreamCommandUnitTests.java → ...hell/command/StreamCommandsUnitTests.java b/...shell/command/StreamCommandUnitTests.java → ...hell/command/StreamCommandsUnitTests.java
@@ -33,7 +33,7 @@
  *
  * @author Eric Bottard
  */
-public class StreamCommandUnitTests {
+public class StreamCommandsUnitTests {
 
 	private StreamOperations streamOperations;
 
@@ -59,7 +59,7 @@ public void testInlineDeploymentProperties() throws Exception {
 
 	@Test
 	public void testFileDeploymentProperties() throws Exception {
-		File file = Files.createTempFile(StreamCommandUnitTests.class.getSimpleName(), "testFileDeploymentProperties").toFile();
+		File file = Files.createTempFile(StreamCommandsUnitTests.class.getSimpleName(), "testFileDeploymentProperties").toFile();
 		file.deleteOnExit();
 
 		Properties props = new Properties();
@@ -73,7 +73,7 @@ public void testFileDeploymentProperties() throws Exception {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testOnlyOneKindOfDeploymentPropertiesAllowed() throws Exception {
-		File file = Files.createTempFile(StreamCommandUnitTests.class.getSimpleName(), "testFileDeploymentProperties").toFile();
+		File file = Files.createTempFile(StreamCommandsUnitTests.class.getSimpleName(), "testFileDeploymentProperties").toFile();
 		file.deleteOnExit();
 
 		commands.deployStream("foo", "module.bar.count=3", file);

diff --git a/...sts/src/test/java/org/springframework/xd/spark/streaming/AbstractSparkStreamingTests.java b/...sts/src/test/java/org/springframework/xd/spark/streaming/AbstractSparkStreamingTests.java
@@ -40,7 +40,7 @@
 import org.springframework.xd.dirt.server.singlenode.SingleNodeApplication;
 import org.springframework.xd.dirt.test.SingleNodeIntegrationTestSupport;
 import org.springframework.xd.shell.command.MetricsTemplate;
-import org.springframework.xd.shell.command.StreamCommandTemplate;
+import org.springframework.xd.shell.command.StreamCommandsTemplate;
 import org.springframework.xd.shell.command.fixtures.HttpSource;
 import org.springframework.xd.test.RandomConfigurationSupport;
 import org.springframework.xd.test.fixtures.CounterSink;
@@ -64,7 +64,7 @@ public abstract class AbstractSparkStreamingTests {
 
 	private JLineShellComponent shell;
 
-	protected StreamCommandTemplate streamOps;
+	protected StreamCommandsTemplate streamOps;
 
 	private MetricsTemplate metrics;
 
@@ -88,7 +88,7 @@ public void setup() throws Exception {
 		if (!shell.isRunning()) {
 			shell.start();
 		}
-		streamOps = new StreamCommandTemplate(shell, integrationTestSupport);
+		streamOps = new StreamCommandsTemplate(shell, integrationTestSupport);
 		metrics = new MetricsTemplate(shell);
 	}