Skip to content

Commit 88c8748

Browse files
dreab8dreab8
committed
HHH-19916 More drop JUnit 4 usage work
1 parent 32f2bb4 commit 88c8748

File tree

7 files changed

+163
-184
lines changed

7 files changed

+163
-184
lines changed

‎hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisTest.java‎

Lines changed: 42 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,102 +4,94 @@
44
*/
55
package org.hibernate.spatial.dialect.postgis;
66

7-
import java.util.List;
87
import jakarta.persistence.Entity;
98
import jakarta.persistence.GeneratedValue;
109
import jakarta.persistence.GenerationType;
1110
import jakarta.persistence.Id;
12-
13-
import org.hibernate.dialect.PostgreSQLDialect;
14-
15-
import org.hibernate.testing.RequiresDialect;
16-
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
17-
import org.junit.After;
18-
import org.junit.Ignore;
19-
import org.junit.Test;
20-
2111
import org.geolatte.geom.C2D;
2212
import org.geolatte.geom.Point;
2313
import org.geolatte.geom.Polygon;
2414
import org.geolatte.geom.crs.CoordinateReferenceSystem;
2515
import org.geolatte.geom.crs.CoordinateReferenceSystems;
16+
import org.hibernate.dialect.PostgreSQLDialect;
17+
import org.hibernate.testing.orm.junit.DomainModel;
18+
import org.hibernate.testing.orm.junit.RequiresDialect;
19+
import org.hibernate.testing.orm.junit.SessionFactory;
20+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
21+
import org.junit.jupiter.api.AfterEach;
22+
import org.junit.jupiter.api.Disabled;
23+
import org.junit.jupiter.api.Test;
2624

25+
import java.util.List;
26+
27+
import static org.assertj.core.api.Assertions.assertThat;
2728
import static org.geolatte.geom.builder.DSL.c;
2829
import static org.geolatte.geom.builder.DSL.point;
2930
import static org.geolatte.geom.builder.DSL.polygon;
3031
import static org.geolatte.geom.builder.DSL.ring;
31-
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
32-
import static org.junit.Assert.assertEquals;
3332

3433
/**
3534
* Integration tests for Postgis
3635
*
3736
* @author Vlad Mihalcea, Karel Maesen
3837
*/
3938
@RequiresDialect(PostgreSQLDialect.class)
40-
41-
public class PostgisTest extends BaseCoreFunctionalTestCase {
39+
@DomainModel(
40+
annotatedClasses = {
41+
PostgisTest.Event.class
42+
}
43+
)
44+
@SessionFactory
45+
public class PostgisTest {
4246

4347
public static CoordinateReferenceSystem<C2D> crs = CoordinateReferenceSystems.PROJECTED_2D_METER;
4448

4549
private final Polygon<C2D> window = polygon( crs, ring( c( 1, 1 ), c( 1, 20 ),
46-
c( 20, 20 ), c( 20, 1 ), c( 1, 1 )
50+
c( 20, 20 ), c( 20, 1 ), c( 1, 1 )
4751
) );
4852

49-
50-
@Override
51-
protected Class<?>[] getAnnotatedClasses() {
52-
return new Class<?>[] {
53-
Event.class,
54-
};
53+
@AfterEach
54+
public void cleanUp(SessionFactoryScope scope) {
55+
scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
5556
}
5657

57-
@After
58-
public void cleanUp() {
59-
doInHibernate( this::sessionFactory, session -> {
60-
session.createQuery( "delete from Event" ).executeUpdate();
61-
} );
62-
}
63-
64-
6558
@Test
66-
public void testBuffer() {
67-
Long addressId = insertEvent( c( 10, 5 ) );
59+
public void testBuffer(SessionFactoryScope scope) {
60+
insertEvent( c( 10, 5 ), scope );
6861

69-
doInHibernate( this::sessionFactory, session -> {
70-
List<Event> events = session.createQuery(
71-
"select e " +
62+
scope.inTransaction(
63+
session -> {
64+
List<Event> events = session.createQuery(
65+
"select e " +
7266
"from Event e " +
7367
"where within( e.location, buffer(:window, 100)) = true", Event.class )
74-
.setParameter( "window", window )
75-
.getResultList();
68+
.setParameter( "window", window )
69+
.getResultList();
7670

77-
assertEquals( 1, events.size() );
78-
79-
} );
71+
assertThat( events ).hasSize( 1 );
72+
}
73+
);
8074
}
8175

8276
@Test
83-
@Ignore
77+
@Disabled
8478
//TODO -- register these extra functions
85-
public void testMakeEnvelope() {
86-
Long addressId = insertEvent( c( 10, 5 ) );
79+
public void testMakeEnvelope(SessionFactoryScope scope) {
80+
insertEvent( c( 10, 5 ), scope );
8781

88-
doInHibernate( this::sessionFactory, session -> {
82+
scope.inTransaction( session -> {
8983
List<Event> events = session.createQuery(
9084
"select e " +
91-
"from Event e " +
92-
"where within(e.location, makeenvelope(0, 0, 11, 11, -1 )) = true", Event.class )
85+
"from Event e " +
86+
"where within(e.location, makeenvelope(0, 0, 11, 11, -1 )) = true", Event.class )
9387
.getResultList();
9488

95-
assertEquals( 1, events.size() );
96-
89+
assertThat( events ).hasSize( 1 );
9790
} );
98-
9991
}
10092

101-
private Long insertEvent(C2D position) {
102-
return doInHibernate( this::sessionFactory, session -> {
93+
private Long insertEvent(C2D position, SessionFactoryScope scope) {
94+
return scope.fromTransaction( session -> {
10395
Event event = new Event();
10496
event.setName( "Hibernate ORM presentation" );
10597
Point<C2D> pnt = point( crs, position );

‎hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisUnmarshalTest.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
*/
55
package org.hibernate.spatial.dialect.postgis;
66

7-
import java.sql.SQLException;
8-
9-
import org.junit.Test;
10-
117
import org.geolatte.geom.ByteOrder;
128
import org.geolatte.geom.C2D;
139
import org.geolatte.geom.G2D;
@@ -16,12 +12,15 @@
1612
import org.geolatte.geom.codec.Wkt;
1713
import org.geolatte.geom.crs.CoordinateReferenceSystem;
1814
import org.geolatte.geom.crs.CoordinateReferenceSystems;
15+
import org.junit.jupiter.api.Test;
1916
import org.postgresql.util.PGobject;
2017

18+
import java.sql.SQLException;
19+
20+
import static org.assertj.core.api.Java6Assertions.assertThat;
2121
import static org.geolatte.geom.builder.DSL.c;
2222
import static org.geolatte.geom.builder.DSL.g;
2323
import static org.geolatte.geom.builder.DSL.linestring;
24-
import static org.junit.Assert.assertEquals;
2524

2625
/**
2726
* Tests the different ways Postgis seraialises Geometries
@@ -38,7 +37,6 @@ public class PostgisUnmarshalTest {
3837
c( 6.133, 53.244 )
3938
);
4039

41-
4240
@Test
4341
public void testWktWithSrid() throws SQLException {
4442
String ewkt = Wkt.toWkt( geom );
@@ -63,13 +61,12 @@ public void testWkbNDR() throws SQLException {
6361
testCase( wkb, geom );
6462
}
6563

66-
6764
public void testCase(String pgValue, Geometry<?> expected) throws SQLException {
6865
PGobject pgo = new PGobject();
6966
pgo.setValue( pgValue );
7067
Geometry<?> received = PGGeometryJdbcType.INSTANCE_WKB_2.toGeometry( pgo );
71-
assertEquals( String.format( "Failure on %s", pgValue ), expected, received );
68+
assertThat( received )
69+
.describedAs( String.format( "Failure on %s", pgValue ) )
70+
.isEqualTo( expected );
7271
}
73-
74-
7572
}

‎hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/DirtyCheckingTest.java‎

Lines changed: 49 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,85 +4,80 @@
44
*/
55
package org.hibernate.spatial.dialect.postgis.hhh14523;
66

7-
import java.io.Serializable;
8-
import java.util.List;
97
import jakarta.persistence.Column;
108
import jakarta.persistence.Entity;
11-
import jakarta.persistence.EntityManager;
129
import jakarta.persistence.GeneratedValue;
1310
import jakarta.persistence.GenerationType;
1411
import jakarta.persistence.Id;
15-
import jakarta.persistence.Query;
1612
import jakarta.persistence.SequenceGenerator;
1713
import jakarta.persistence.Table;
18-
19-
import org.hibernate.dialect.PostgreSQLDialect;
20-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
21-
22-
import org.hibernate.testing.RequiresDialect;
23-
import org.hibernate.testing.orm.junit.JiraKey;
24-
import org.junit.Test;
25-
14+
import jakarta.persistence.TypedQuery;
2615
import org.geolatte.geom.codec.Wkt;
2716
import org.geolatte.geom.jts.JTS;
17+
import org.hibernate.dialect.PostgreSQLDialect;
18+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
19+
import org.hibernate.testing.orm.junit.JiraKey;
20+
import org.hibernate.testing.orm.junit.Jpa;
21+
import org.hibernate.testing.orm.junit.RequiresDialect;
22+
import org.junit.jupiter.api.BeforeAll;
23+
import org.junit.jupiter.api.Test;
2824
import org.locationtech.jts.geom.GeometryFactory;
2925
import org.locationtech.jts.geom.Point;
3026

27+
import java.io.Serializable;
28+
import java.util.List;
29+
3130
import static org.junit.Assert.assertEquals;
3231

3332
@JiraKey(value = "HHH-14523")
3433
@RequiresDialect(PostgreSQLDialect.class)
35-
public class DirtyCheckingTest extends BaseEntityManagerFunctionalTestCase {
34+
@Jpa(
35+
annotatedClasses = {
36+
TestEntity.class
37+
}
38+
)
39+
public class DirtyCheckingTest {
3640

3741
private GeometryFactory gfact = new GeometryFactory();
3842

39-
@Override
40-
public Class[] getAnnotatedClasses() {
41-
return new Class[] {
42-
TestEntity.class
43-
};
44-
}
45-
46-
public void createtestEntity() {
43+
@BeforeAll
44+
public void createtestEntity(EntityManagerFactoryScope scope) {
4745
Point pnt = (Point) JTS.to( Wkt.fromWkt( "POINT Z( 3.41127795 8.11062269 2.611)", Wkt.Dialect.SFA_1_2_1 ) );
48-
EntityManager entityManager = createEntityManager();
49-
TestEntity test1 = new TestEntity( "radar 5", pnt );
50-
51-
entityManager.getTransaction().begin();
52-
entityManager.persist( test1 );
53-
entityManager.getTransaction().commit();
54-
55-
entityManager.close();
46+
scope.inTransaction(
47+
entityManager -> {
48+
TestEntity test1 = new TestEntity( "radar 5", pnt );
49+
50+
entityManager.getTransaction().begin();
51+
entityManager.persist( test1 );
52+
}
53+
);
5654
}
5755

5856
// Entities are auto-discovered, so just add them anywhere on class-path
5957
// Add your tests, using standard JUnit.
6058
@Test
61-
public void hhh14523() throws Exception {
62-
63-
createtestEntity();
64-
65-
EntityManager entityManager = createEntityManager();
66-
entityManager.getTransaction().begin();
67-
Query query = entityManager.createQuery( "select t from TestEntity t" );
68-
TestEntity ent = (TestEntity) query.getResultList().get( 0 );
69-
Point newPnt = (Point) JTS.to( Wkt.fromWkt( "POINT Z( 3.41127795 8.11062269 8.611)", Wkt.Dialect.SFA_1_2_1 ) );
70-
ent.setGeom( newPnt );
71-
entityManager.getTransaction().commit();
72-
entityManager.close();
73-
74-
75-
entityManager = createEntityManager();
76-
entityManager.getTransaction().begin();
77-
List<TestEntity> entities = entityManager.createQuery( "select t from TestEntity t" ).getResultList();
78-
TestEntity ent2 = entities.get( 0 );
79-
try {
80-
assertEquals( 8.611, ent2.getGeom().getCoordinate().getZ(), 0.00001 );
81-
}
82-
finally {
83-
entityManager.getTransaction().commit();
84-
}
85-
entityManager.close();
59+
public void hhh14523(EntityManagerFactoryScope scope) {
60+
61+
scope.inTransaction(
62+
entityManager -> {
63+
TypedQuery<TestEntity> query = entityManager.createQuery(
64+
"select t from TestEntity t", TestEntity.class );
65+
TestEntity ent = query.getResultList().get( 0 );
66+
Point newPnt = (Point) JTS.to(
67+
Wkt.fromWkt( "POINT Z( 3.41127795 8.11062269 8.611)", Wkt.Dialect.SFA_1_2_1 ) );
68+
ent.setGeom( newPnt );
69+
}
70+
);
71+
72+
scope.inTransaction(
73+
entityManager -> {
74+
List<TestEntity> entities = entityManager.createQuery( "select t from TestEntity t",
75+
TestEntity.class )
76+
.getResultList();
77+
TestEntity ent2 = entities.get( 0 );
78+
assertEquals( 8.611, ent2.getGeom().getCoordinate().getZ(), 0.00001 );
79+
}
80+
);
8681
}
8782
}
8883

0 commit comments

Comments
 (0)