Skip to content

Commit 797afce

Browse files
jencisopyjencisopy
committed
Migración JUNIT 4 a JUNIT 5
1 parent c37c88b commit 797afce

26 files changed

Lines changed: 139 additions & 107 deletions

‎aws/src/test/java/org/javabeanstack/aws/AmazonS3test.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,17 @@
2525
import java.util.HashMap;
2626
import java.util.List;
2727
import java.util.Map;
28-
import org.junit.AfterClass;
29-
import org.junit.BeforeClass;
30-
import org.junit.Test;
31-
import static org.junit.Assert.*;
3228
import software.amazon.awssdk.regions.Region;
3329
import software.amazon.awssdk.services.s3.S3Client;
3430
import software.amazon.awssdk.services.s3.model.Bucket;
3531
import software.amazon.awssdk.services.s3.model.S3Object;
3632
import static org.javabeanstack.aws.S3Util.*;
3733

34+
import static org.junit.jupiter.api.Assertions.*;
35+
import org.junit.jupiter.api.AfterAll;
36+
import org.junit.jupiter.api.BeforeAll;
37+
import org.junit.jupiter.api.Test;
38+
3839
/**
3940
*
4041
* @author Jorge Enciso
@@ -46,7 +47,7 @@ public class AmazonS3test {
4647
static Region region;
4748
static S3Client s3Client;
4849

49-
@BeforeClass
50+
@BeforeAll
5051
public static void setUpClass() {
5152
accessKey = "";
5253
secretKey = "";
@@ -104,7 +105,7 @@ public void test07DeleteObject() throws Exception {
104105
deleteObject(s3Client, bucketName, objectKey);
105106
}
106107

107-
@AfterClass
108+
@AfterAll
108109
public static void tearDownClass() {
109110
s3Client.close();
110111
}

‎business/src/test/java/org/javabeanstack/data/AbstractDAOTest.java‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,38 @@
2525
import java.util.HashMap;
2626
import java.util.List;
2727
import java.util.Map;
28+
import javax.naming.NamingException;
2829
import org.javabeanstack.model.appcatalog.AppResource;
2930
import org.javabeanstack.model.appcatalog.AppTablesRelation;
3031
import org.javabeanstack.model.appcatalog.AppUser;
3132
import org.javabeanstack.model.tables.Moneda;
3233
import org.javabeanstack.model.views.CtactemovimientodetalleView;
3334
import org.javabeanstack.util.LocalDates;
34-
import org.junit.Test;
35-
import static org.junit.Assert.*;
36-
import org.junit.BeforeClass;
37-
import org.junit.FixMethodOrder;
38-
import org.junit.runners.MethodSorters;
35+
36+
import static org.junit.jupiter.api.Assertions.*;
37+
import org.junit.jupiter.api.BeforeAll;
38+
import org.junit.jupiter.api.MethodOrderer;
39+
import org.junit.jupiter.api.Test;
40+
import org.junit.jupiter.api.TestMethodOrder;
41+
3942

4043
/**
4144
*
4245
* @author Jorge Enciso
46+
*
4347
*/
44-
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
48+
@TestMethodOrder(MethodOrderer.DisplayName.class)
4549
public class AbstractDAOTest extends TestClass {
4650
private static IGenericDAO dao;
4751

4852
public AbstractDAOTest() {
4953
}
5054

51-
@BeforeClass
55+
@BeforeAll
5256
public static void setUpClass2() {
5357
try {
5458
dao = (IGenericDAORemote) context.lookup(jndiProject + "GenericDAO!org.javabeanstack.data.IGenericDAORemote");
55-
} catch (Exception e) {
59+
} catch (NamingException e) {
5660
System.out.println(e.getMessage());
5761
}
5862
}

‎business/src/test/java/org/javabeanstack/data/AbstractDataLinkTest.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,21 @@
4242
import org.javabeanstack.security.IOAuthConsumerData;
4343
import org.javabeanstack.security.OAuthConsumerBase;
4444
import org.javabeanstack.security.model.OAuthConsumerData;
45-
import org.junit.Test;
46-
import static org.junit.Assert.*;
47-
import org.junit.BeforeClass;
48-
import org.junit.FixMethodOrder;
49-
import org.junit.runners.MethodSorters;
5045
import org.javabeanstack.model.IAppAuthConsumerToken;
5146
import org.javabeanstack.util.LocalDates;
5247

48+
import static org.junit.jupiter.api.Assertions.*;
49+
import org.junit.jupiter.api.BeforeAll;
50+
import org.junit.jupiter.api.MethodOrderer;
51+
import org.junit.jupiter.api.Test;
52+
import org.junit.jupiter.api.TestMethodOrder;
53+
54+
5355
/**
5456
*
5557
* @author Jorge Enciso
5658
*/
57-
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
59+
@TestMethodOrder(MethodOrderer.DisplayName.class)
5860
public class AbstractDataLinkTest extends TestClass {
5961

6062
private String token;
@@ -65,7 +67,7 @@ public class AbstractDataLinkTest extends TestClass {
6567
public AbstractDataLinkTest() {
6668
}
6769

68-
@BeforeClass
70+
@BeforeAll
6971
public static void setUpClass2() {
7072
try {
7173
dao = (IDataService) context.lookup(jndiProject + "DataService!org.javabeanstack.data.services.IDataServiceRemote");

‎business/src/test/java/org/javabeanstack/data/DBFilterTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import java.util.ArrayList;
44
import java.util.List;
5-
import org.junit.Test;
6-
import static org.junit.Assert.*;
5+
6+
import static org.junit.jupiter.api.Assertions.*;
7+
import org.junit.jupiter.api.Test;
8+
79

810
/**
911
*

‎business/src/test/java/org/javabeanstack/data/DataExpressionTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
import java.util.HashMap;
44
import java.util.Map;
5-
import static org.junit.Assert.*;
6-
import org.junit.Test;
5+
6+
import static org.junit.jupiter.api.Assertions.*;
7+
import org.junit.jupiter.api.Test;
78

89
/**
910
*

‎business/src/test/java/org/javabeanstack/data/DataInfoTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@
2323
package org.javabeanstack.data;
2424

2525
import java.lang.reflect.Field;
26-
import java.util.Date;
2726
import java.util.List;
2827
import org.javabeanstack.model.appcatalog.AppResource;
2928
import org.javabeanstack.model.appcatalog.AppTablesRelation;
3029
import org.javabeanstack.model.appcatalog.AppUser;
3130
import org.javabeanstack.model.appcatalog.AppUserFormView;
3231
import org.javabeanstack.model.appcatalog.AppUserMember;
3332
import org.javabeanstack.util.LocalDates;
34-
import org.junit.Test;
35-
import static org.junit.Assert.*;
36-
import org.junit.FixMethodOrder;
37-
import org.junit.runners.MethodSorters;
33+
34+
import static org.junit.jupiter.api.Assertions.*;
35+
import org.junit.jupiter.api.MethodOrderer;
36+
import org.junit.jupiter.api.Test;
37+
import org.junit.jupiter.api.TestMethodOrder;
3838

3939
/**
4040
*
4141
* @author Jorge Enciso
4242
*/
43-
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
43+
@TestMethodOrder(MethodOrderer.DisplayName.class)
4444
public class DataInfoTest {
4545

4646
public DataInfoTest() {

‎business/src/test/java/org/javabeanstack/data/DataNativeQueryTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import java.util.List;
44
import java.util.Map;
55
import org.javabeanstack.model.views.PaisView;
6-
import org.junit.Assert;
7-
import org.junit.Test;
6+
7+
import static org.junit.jupiter.api.Assertions.*;
8+
import org.junit.jupiter.api.Test;
9+
10+
811

912
/**
1013
*
@@ -431,7 +434,7 @@ public void testQuery11() throws Exception {
431434
System.out.println("\nTESTQUERY11");
432435
System.out.println("================");
433436

434-
Assert.assertNotNull(resultado);
437+
assertNotNull(resultado);
435438
}
436439

437440

‎business/src/test/java/org/javabeanstack/data/DataRowTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
package org.javabeanstack.data;
2424

2525
import jakarta.persistence.Id;
26-
import org.junit.Test;
27-
import static org.junit.Assert.*;
26+
27+
import static org.junit.jupiter.api.Assertions.*;
28+
import org.junit.jupiter.api.Test;
2829

2930
/**
3031
*

‎business/src/test/java/org/javabeanstack/data/TestClass.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
import javax.naming.Context;
55
import javax.naming.InitialContext;
66
import javax.naming.NamingException;
7-
import org.junit.After;
8-
import org.junit.AfterClass;
9-
import org.junit.Before;
10-
import org.junit.BeforeClass;
117
import org.javabeanstack.security.ISecManager;
128
import org.javabeanstack.security.model.IUserSession;
139
import org.apache.logging.log4j.LogManager;
1410
import org.apache.logging.log4j.Logger;
11+
import org.junit.jupiter.api.AfterAll;
12+
import org.junit.jupiter.api.AfterEach;
13+
14+
15+
import org.junit.jupiter.api.BeforeAll;
16+
import org.junit.jupiter.api.BeforeEach;
1517

1618
/**
1719
*
@@ -31,7 +33,7 @@ public class TestClass {
3133
public TestClass() {
3234
}
3335

34-
@BeforeClass
36+
@BeforeAll
3537
public static void setUpClass() throws NamingException, Exception {
3638
try {
3739
String server = (System.getenv("SERVER_TEST") != null) ? System.getenv("SERVER_TEST") : "localhost";
@@ -69,15 +71,15 @@ public static void setUpClass() throws NamingException, Exception {
6971
}
7072
}
7173

72-
@AfterClass
74+
@AfterAll
7375
public static void tearDownClass() {
7476
}
7577

76-
@Before
78+
@BeforeEach
7779
public void setUp() {
7880
}
7981

80-
@After
82+
@AfterEach
8183
public void tearDown() {
8284
}
8385
}

‎business/src/test/java/org/javabeanstack/data/model/DataQueryModelTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import java.util.ArrayList;
66
import java.util.List;
77
import org.javabeanstack.data.IDataQueryModel;
8-
import org.junit.Test;
9-
import static org.junit.Assert.*;
8+
9+
import static org.junit.jupiter.api.Assertions.*;
10+
import org.junit.jupiter.api.Test;
1011

1112
/**
1213
*

0 commit comments

Comments
 (0)