INT-2322

spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002-2011 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.integration.test.support;
 
 import static org.junit.Assert.assertNotNull;
@@ -29,7 +45,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author David Turanski
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-public abstract class AbstractRequestResponseScenarioTest {
+public abstract class AbstractRequestResponseScenarioTests {
+
     private List<RequestResponseScenario> scenarios = null;
     
     @Autowired

spring-integration-test/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTests.java

@@ -18,9 +18,10 @@ import java.util.List;
 
 /**
  * Convenience class for a single {@link RequestResponseScenario} test
+ * 
  * @author David Turanski
  */
-public abstract class SingleRequestResponseScenarioTest extends AbstractRequestResponseScenarioTest {
+public abstract class SingleRequestResponseScenarioTests extends AbstractRequestResponseScenarioTests {
 
 	@Override
 	protected List<RequestResponseScenario> defineRequestResponseScenarios() {

spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTests.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002-2011 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.integration.test.support;
 
 import static org.junit.Assert.assertEquals;
@@ -9,11 +25,12 @@ import java.util.List;
 import org.springframework.integration.Message;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.test.context.ContextConfiguration;
+
 import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload;
 import static org.springframework.integration.test.matcher.HeaderMatcher.hasHeader;
 
 @ContextConfiguration 
-public class MessageScenariosTest extends AbstractRequestResponseScenarioTest {
+public class MessageScenariosTests extends AbstractRequestResponseScenarioTests {
    
     @Override
     protected List<RequestResponseScenario> defineRequestResponseScenarios() {

spring-integration-test/src/test/java/org/springframework/integration/test/support/SingleScenarioTests.java

@@ -1,11 +1,27 @@
+/*
+ * Copyright 2002-2011 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.integration.test.support;
 
 import static org.junit.Assert.assertEquals;
 
 import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration("MessageScenariosTest-context.xml") 
-public class SingleScenarioTest extends SingleRequestResponseScenarioTest {
+@ContextConfiguration("MessageScenariosTests-context.xml") 
+public class SingleScenarioTests extends SingleRequestResponseScenarioTests {
    
 	/* (non-Javadoc)
 	 * @see org.springframework.integration.test.support.SingleRequestResponseScenarioTest#defineRequestResponseScenario()