Skip to content

Commit 906720b

Browse files
committed
Partial port to JUnit 5
1 parent fd336c9 commit 906720b

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import java.util.List;
2828

2929
import org.apache.commons.beanutils.bugs.other.Jira492IndexedListsSupport;
30-
import org.junit.After;
31-
import org.junit.Before;
32-
import org.junit.Test;
30+
import org.junit.jupiter.api.AfterEach;
31+
import org.junit.jupiter.api.BeforeEach;
32+
import org.junit.jupiter.api.Test;
3333

3434
/**
3535
* <p>Test Case for the Indexed Properties.</p>
@@ -53,7 +53,7 @@ public class IndexedPropertyTestCase {
5353
/**
5454
* Set up instance variables required by this test case.
5555
*/
56-
@Before
56+
@BeforeEach
5757
public void setUp() {
5858

5959
// BeanUtils
@@ -89,7 +89,7 @@ public void setUp() {
8989
/**
9090
* Tear down instance variables required by this test case.
9191
*/
92-
@After
92+
@AfterEach
9393
public void tearDown() {
9494
bean = null;
9595
}

src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.apache.commons.beanutils.PropertyUtils;
2929
import org.junit.Assert;
3030
import org.junit.Assume;
31-
import org.junit.BeforeClass;
32-
import org.junit.Test;
31+
import org.junit.jupiter.api.BeforeAll;
32+
import org.junit.jupiter.api.Test;
3333

3434
class FirstChildBean extends RootBean {
3535
}
@@ -50,7 +50,7 @@ public class Jira422TestCase {
5050
*
5151
* @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-492">BEANUTILS-492</a>
5252
*/
53-
@BeforeClass
53+
@BeforeAll
5454
public static void assumeSupportsIndexedLists() throws IntrospectionException {
5555
final BeanInfo beanInfo = Introspector.getBeanInfo(RootBean.class);
5656
for (final PropertyDescriptor pd : beanInfo.getPropertyDescriptors()) {

src/test/java/org/apache/commons/beanutils/bugs/Jira422bTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static org.junit.Assert.assertEquals;
2020

2121
import org.apache.commons.beanutils.PropertyUtils;
22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323

2424
class FirstChildBeanB extends RootBeanB {
2525
}

src/test/java/org/apache/commons/beanutils/bugs/Jira492TestCase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.apache.commons.beanutils.BeanUtilsBean;
3030
import org.apache.commons.beanutils.PropertyUtilsBean;
3131
import org.apache.commons.beanutils.bugs.other.Jira492IndexedListsSupport.IndexedBean;
32-
import org.junit.Before;
33-
import org.junit.Test;
32+
import org.junit.jupiter.api.BeforeEach;
33+
import org.junit.jupiter.api.Test;
3434

3535
/**
3636
* This test verifies that although BEANUTILS-492
@@ -105,7 +105,7 @@ public void getPropertyUnconverted() throws Exception {
105105
assertTrue("Did not retrieve list", someList instanceof List);
106106
}
107107

108-
@Before
108+
@BeforeEach
109109
public void makeBean() {
110110
bean = new IndexedBean();
111111
bean.setSomeList(Arrays.asList("item0", "item1"));

src/test/java/org/apache/commons/beanutils/bugs/Jira493TestCase.java

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

2121
import org.apache.commons.beanutils.BeanUtilsBean;
2222
import org.apache.commons.beanutils.LazyDynaBean;
23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424

2525
/**
2626
* Test setting indexed properties on dynabeans

src/test/java/org/apache/commons/beanutils/bugs/Jira541TestCase.java

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

2727
import org.apache.commons.beanutils.FluentPropertyBeanIntrospector;
2828
import org.apache.commons.beanutils.PropertyUtilsBean;
29-
import org.junit.Test;
29+
import org.junit.jupiter.api.Test;
3030

3131
/**
3232
* Fix BEANUTILS-541

src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java

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

2727
import org.apache.commons.beanutils.ConvertUtils;
2828
import org.apache.commons.beanutils.Converter;
29-
import org.junit.Test;
29+
import org.junit.jupiter.api.Test;
3030

3131
/**
3232
* This class provides a number of unit tests related to classloaders and

src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.apache.commons.beanutils.locale.LocaleConvertUtils;
4242
import org.apache.commons.beanutils.locale.converters.IntegerLocaleConverter;
4343
import org.junit.Assume;
44-
import org.junit.Test;
44+
import org.junit.jupiter.api.Test;
4545

4646
/**
4747
* Tests BeanUtils memory leaks.

0 commit comments

Comments
 (0)