Skip to content

Commit 93f7103

Browse files
committed
Migrate spring-jms test suite from JUnit 4 to JUnit Jupiter
See spring-projectsgh-23451
1 parent 196ab7d commit 93f7103

36 files changed

+153
-151
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import javax.jms.JMSException;
2121
import javax.jms.Session;
2222

23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424

2525
import org.springframework.context.ApplicationContext;
2626
import org.springframework.jms.StubTextMessage;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import javax.jms.JMSException;
2020
import javax.jms.MessageListener;
2121

22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323

2424
import org.springframework.context.ApplicationContext;
2525
import org.springframework.context.support.ClassPathXmlApplicationContext;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import javax.jms.JMSException;
2222
import javax.jms.MessageListener;
2323

24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2525

2626
import org.springframework.beans.factory.BeanCreationException;
2727
import org.springframework.context.ConfigurableApplicationContext;

spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.lang.annotation.Target;
2323
import java.lang.reflect.Method;
2424

25-
import org.junit.Test;
25+
import org.junit.jupiter.api.Test;
2626

2727
import org.springframework.aop.support.AopUtils;
2828
import org.springframework.beans.factory.BeanCreationException;

spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import javax.jms.Session;
2626
import javax.jms.TextMessage;
2727

28-
import org.junit.Before;
29-
import org.junit.Test;
28+
import org.junit.jupiter.api.BeforeEach;
29+
import org.junit.jupiter.api.Test;
3030

3131
import org.springframework.aop.framework.ProxyFactory;
3232
import org.springframework.beans.factory.support.StaticListableBeanFactory;
@@ -58,7 +58,7 @@ public class JmsListenerContainerFactoryIntegrationTests {
5858
private JmsEndpointSampleInterface listener = sample;
5959

6060

61-
@Before
61+
@BeforeEach
6262
public void setup() {
6363
initializeFactory(factory);
6464
}

spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import javax.jms.Session;
2222
import javax.transaction.TransactionManager;
2323

24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2525

2626
import org.springframework.beans.DirectFieldAccessor;
2727
import org.springframework.jms.StubConnectionFactory;

spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointRegistrarTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package org.springframework.jms.config;
1818

19-
import org.junit.Before;
20-
import org.junit.Test;
19+
import org.junit.jupiter.api.BeforeEach;
20+
import org.junit.jupiter.api.Test;
2121

2222
import org.springframework.beans.factory.support.StaticListableBeanFactory;
2323

@@ -37,7 +37,7 @@ public class JmsListenerEndpointRegistrarTests {
3737
private final JmsListenerContainerTestFactory containerFactory = new JmsListenerContainerTestFactory();
3838

3939

40-
@Before
40+
@BeforeEach
4141
public void setup() {
4242
this.registrar.setEndpointRegistry(this.registry);
4343
this.registrar.setBeanFactory(new StaticListableBeanFactory());

spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointRegistryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.jms.config;
1818

19-
import org.junit.Test;
19+
import org.junit.jupiter.api.Test;
2020

2121
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
2222
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;

spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import javax.jms.MessageListener;
2020

21-
import org.junit.Test;
21+
import org.junit.jupiter.api.Test;
2222

2323
import org.springframework.beans.DirectFieldAccessor;
2424
import org.springframework.jms.listener.DefaultMessageListenerContainer;

spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import javax.jms.MessageListener;
2626
import javax.jms.TextMessage;
2727

28-
import org.junit.After;
29-
import org.junit.Before;
30-
import org.junit.Test;
28+
import org.junit.jupiter.api.AfterEach;
29+
import org.junit.jupiter.api.BeforeEach;
30+
import org.junit.jupiter.api.Test;
3131

3232
import org.springframework.beans.DirectFieldAccessor;
3333
import org.springframework.beans.factory.config.BeanDefinition;
@@ -67,12 +67,12 @@ public class JmsNamespaceHandlerTests {
6767
private ToolingTestApplicationContext context;
6868

6969

70-
@Before
70+
@BeforeEach
7171
public void setUp() throws Exception {
7272
this.context = new ToolingTestApplicationContext("jmsNamespaceHandlerTests.xml", getClass());
7373
}
7474

75-
@After
75+
@AfterEach
7676
public void tearDown() throws Exception {
7777
this.context.close();
7878
}

0 commit comments

Comments
 (0)