Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2019-08-22 13:17:07 +02:00
parent 3e2b977d5d
commit a07ce8eb82
8 changed files with 85 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java
View File

@@ -43,44 +43,43 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
/**
*
* @author Stephane Nicoll
*/
public abstract class AbstractJmsAnnotationDrivenTests {
abstract class AbstractJmsAnnotationDrivenTests {
@Test
public abstract void sampleConfiguration();
abstract void sampleConfiguration();
@Test
public abstract void fullConfiguration();
abstract void fullConfiguration();
@Test
public abstract void fullConfigurableConfiguration();
abstract void fullConfigurableConfiguration();
@Test
public abstract void customConfiguration();
abstract void customConfiguration();
@Test
public abstract void explicitContainerFactory();
abstract void explicitContainerFactory();
@Test
public abstract void defaultContainerFactory();
abstract void defaultContainerFactory();
@Test
public abstract void jmsHandlerMethodFactoryConfiguration() throws JMSException;
abstract void jmsHandlerMethodFactoryConfiguration() throws JMSException;
@Test
public abstract void jmsListenerIsRepeatable();
abstract void jmsListenerIsRepeatable();
@Test
public abstract void jmsListeners();
abstract void jmsListeners();
/**
* Test for {@link SampleBean} discovery. If a factory with the default name
* is set, an endpoint will use it automatically
*/
public void testSampleConfiguration(ApplicationContext context) {
protected void testSampleConfiguration(ApplicationContext context) {
JmsListenerContainerTestFactory defaultFactory =
context.getBean("jmsListenerContainerFactory", JmsListenerContainerTestFactory.class);
JmsListenerContainerTestFactory simpleFactory =
@@ -94,7 +93,7 @@ public abstract class AbstractJmsAnnotationDrivenTests {
* all endpoints provide a default registry. This shows that the default factory
* is only retrieved if it needs to be.
*/
public void testFullConfiguration(ApplicationContext context) {
protected void testFullConfiguration(ApplicationContext context) {
JmsListenerContainerTestFactory simpleFactory =
context.getBean("simpleFactory", JmsListenerContainerTestFactory.class);
assertThat(simpleFactory.getListenerContainers().size()).isEqualTo(1);
@@ -117,7 +116,7 @@ public abstract class AbstractJmsAnnotationDrivenTests {
* with "myCustomEndpointId". The custom endpoint does not provide
* any factory so it's registered with the default one
*/
public void testCustomConfiguration(ApplicationContext context) {
protected void testCustomConfiguration(ApplicationContext context) {
JmsListenerContainerTestFactory defaultFactory =
context.getBean("jmsListenerContainerFactory", JmsListenerContainerTestFactory.class);
JmsListenerContainerTestFactory customFactory =
@@ -141,7 +140,7 @@ public abstract class AbstractJmsAnnotationDrivenTests {
* factory to use as a default is registered with an explicit
* default.
*/
public void testExplicitContainerFactoryConfiguration(ApplicationContext context) {
protected void testExplicitContainerFactoryConfiguration(ApplicationContext context) {
JmsListenerContainerTestFactory defaultFactory =
context.getBean("simpleFactory", JmsListenerContainerTestFactory.class);
assertThat(defaultFactory.getListenerContainers().size()).isEqualTo(1);
@@ -151,7 +150,7 @@ public abstract class AbstractJmsAnnotationDrivenTests {
* Test for {@link DefaultBean} that does not define the container
* factory to use as a default is registered with the default name.
*/
public void testDefaultContainerFactoryConfiguration(ApplicationContext context) {
protected void testDefaultContainerFactoryConfiguration(ApplicationContext context) {
JmsListenerContainerTestFactory defaultFactory =
context.getBean("jmsListenerContainerFactory", JmsListenerContainerTestFactory.class);
assertThat(defaultFactory.getListenerContainers().size()).isEqualTo(1);
@@ -163,7 +162,7 @@ public abstract class AbstractJmsAnnotationDrivenTests {
*
* The test should throw a {@link org.springframework.jms.listener.adapter.ListenerExecutionFailedException}
*/
public void testJmsHandlerMethodFactoryConfiguration(ApplicationContext context) throws JMSException {
protected void testJmsHandlerMethodFactoryConfiguration(ApplicationContext context) throws JMSException {
JmsListenerContainerTestFactory simpleFactory =
context.getBean("defaultFactory", JmsListenerContainerTestFactory.class);
assertThat(simpleFactory.getListenerContainers().size()).isEqualTo(1);
@@ -180,7 +179,7 @@ public abstract class AbstractJmsAnnotationDrivenTests {
* Test for {@link JmsListenerRepeatableBean} and {@link JmsListenersBean} that validates that the
* {@code @JmsListener} annotation is repeatable and generate one specific container per annotation.
*/
public void testJmsListenerRepeatable(ApplicationContext context) {
protected void testJmsListenerRepeatable(ApplicationContext context) {
JmsListenerContainerTestFactory simpleFactory =
context.getBean("jmsListenerContainerFactory", JmsListenerContainerTestFactory.class);
assertThat(simpleFactory.getListenerContainers().size()).isEqualTo(2);

21
spring-jms/src/test/java/org/springframework/jms/annotation/AnnotationDrivenNamespaceTests.java
View File

@@ -32,12 +32,13 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* @author Stephane Nicoll
* @author Sam Brannen
*/
public class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenTests {
class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenTests {
@Override
@Test
public void sampleConfiguration() {
void sampleConfiguration() {
ApplicationContext context = new ClassPathXmlApplicationContext(
"annotation-driven-sample-config.xml", getClass());
testSampleConfiguration(context);
@@ -45,7 +46,7 @@ public class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenT
@Override
@Test
public void fullConfiguration() {
void fullConfiguration() {
ApplicationContext context = new ClassPathXmlApplicationContext(
"annotation-driven-full-config.xml", getClass());
testFullConfiguration(context);
@@ -53,7 +54,7 @@ public class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenT
@Override
@Test
public void fullConfigurableConfiguration() {
void fullConfigurableConfiguration() {
ApplicationContext context = new ClassPathXmlApplicationContext(
"annotation-driven-full-configurable-config.xml", getClass());
testFullConfiguration(context);
@@ -61,7 +62,7 @@ public class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenT
@Override
@Test
public void customConfiguration() {
void customConfiguration() {
ApplicationContext context = new ClassPathXmlApplicationContext(
"annotation-driven-custom-registry.xml", getClass());
testCustomConfiguration(context);
@@ -69,7 +70,7 @@ public class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenT
@Override
@Test
public void explicitContainerFactory() {
void explicitContainerFactory() {
ApplicationContext context = new ClassPathXmlApplicationContext(
"annotation-driven-custom-container-factory.xml", getClass());
testExplicitContainerFactoryConfiguration(context);
@@ -77,7 +78,7 @@ public class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenT
@Override
@Test
public void defaultContainerFactory() {
void defaultContainerFactory() {
ApplicationContext context = new ClassPathXmlApplicationContext(
"annotation-driven-default-container-factory.xml", getClass());
testDefaultContainerFactoryConfiguration(context);
@@ -85,7 +86,7 @@ public class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenT
@Override
@Test
public void jmsHandlerMethodFactoryConfiguration() throws JMSException {
void jmsHandlerMethodFactoryConfiguration() throws JMSException {
ApplicationContext context = new ClassPathXmlApplicationContext(
"annotation-driven-custom-handler-method-factory.xml", getClass());
@@ -96,7 +97,7 @@ public class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenT
@Override
@Test
public void jmsListenerIsRepeatable() {
void jmsListenerIsRepeatable() {
ApplicationContext context = new ClassPathXmlApplicationContext(
"annotation-driven-jms-listener-repeatable.xml", getClass());
testJmsListenerRepeatable(context);
@@ -104,7 +105,7 @@ public class AnnotationDrivenNamespaceTests extends AbstractJmsAnnotationDrivenT
@Override
@Test
public void jmsListeners() {
void jmsListeners() {
ApplicationContext context = new ClassPathXmlApplicationContext(
"annotation-driven-jms-listeners.xml", getClass());
testJmsListenerRepeatable(context);

32
spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java
View File

@@ -52,11 +52,11 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
* @author Stephane Nicoll
* @author Sam Brannen
*/
public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
@Override
@Test
public void sampleConfiguration() {
void sampleConfiguration() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsSampleConfig.class, SampleBean.class);
testSampleConfiguration(context);
@@ -64,7 +64,7 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
@Override
@Test
public void fullConfiguration() {
void fullConfiguration() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsFullConfig.class, FullBean.class);
testFullConfiguration(context);
@@ -72,7 +72,7 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
@Override
@Test
public void fullConfigurableConfiguration() {
void fullConfigurableConfiguration() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsFullConfigurableConfig.class, FullConfigurableBean.class);
testFullConfiguration(context);
@@ -80,7 +80,7 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
@Override
@Test
public void customConfiguration() {
void customConfiguration() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsCustomConfig.class, CustomBean.class);
testCustomConfiguration(context);
@@ -88,7 +88,7 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
@Override
@Test
public void explicitContainerFactory() {
void explicitContainerFactory() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsCustomContainerFactoryConfig.class, DefaultBean.class);
testExplicitContainerFactoryConfiguration(context);
@@ -96,14 +96,15 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
@Override
@Test
public void defaultContainerFactory() {
void defaultContainerFactory() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsDefaultContainerFactoryConfig.class, DefaultBean.class);
testDefaultContainerFactoryConfiguration(context);
}
@Test
public void containerAreStartedByDefault() {
@SuppressWarnings("resource")
void containerAreStartedByDefault() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsDefaultContainerFactoryConfig.class, DefaultBean.class);
JmsListenerContainerTestFactory factory =
@@ -114,7 +115,8 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
}
@Test
public void containerCanBeStarterViaTheRegistry() {
@SuppressWarnings("resource")
void containerCanBeStarterViaTheRegistry() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsAutoStartupFalseConfig.class, DefaultBean.class);
JmsListenerContainerTestFactory factory =
@@ -129,7 +131,7 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
@Override
@Test
public void jmsHandlerMethodFactoryConfiguration() throws JMSException {
void jmsHandlerMethodFactoryConfiguration() throws JMSException {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsHandlerMethodFactoryConfig.class, ValidationBean.class);
@@ -140,7 +142,7 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
@Override
@Test
public void jmsListenerIsRepeatable() {
void jmsListenerIsRepeatable() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsDefaultContainerFactoryConfig.class, JmsListenerRepeatableBean.class);
testJmsListenerRepeatable(context);
@@ -148,14 +150,14 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
@Override
@Test
public void jmsListeners() {
void jmsListeners() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsDefaultContainerFactoryConfig.class, JmsListenersBean.class);
testJmsListenerRepeatable(context);
}
@Test
public void composedJmsListeners() {
void composedJmsListeners() {
try (ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsDefaultContainerFactoryConfig.class, ComposedJmsListenersBean.class)) {
JmsListenerContainerTestFactory simpleFactory = context.getBean("jmsListenerContainerFactory",
@@ -178,7 +180,7 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
@Test
@SuppressWarnings("resource")
public void unknownFactory() {
void unknownFactory() {
// not found
assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
new AnnotationConfigApplicationContext(EnableJmsSampleConfig.class, CustomBean.class))
@@ -186,7 +188,7 @@ public class EnableJmsTests extends AbstractJmsAnnotationDrivenTests {
}
@Test
public void lazyComponent() {
void lazyComponent() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
EnableJmsDefaultContainerFactoryConfig.class, LazyBean.class);
JmsListenerContainerTestFactory defaultFactory =