Skip to content

Commit c36d84c

Browse files
DavideDDavideD
committed
[#1714] Replace assertions using AssertJ
1 parent 3e850fd commit c36d84c

File tree

2 files changed

+64
-48
lines changed

2 files changed

+64
-48
lines changed

‎hibernate-reactive-core/src/test/java/org/hibernate/reactive/FilterTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import jakarta.persistence.Version;
3939

4040
import static java.util.concurrent.TimeUnit.MINUTES;
41+
import static org.assertj.core.api.Assertions.assertThat;
4142
import static org.junit.jupiter.api.Assertions.assertEquals;
4243

4344
@Timeout(value = 10, timeUnit = MINUTES)
@@ -125,16 +126,16 @@ public void testFilterWithParameter(VertxTestContext context) {
125126
.getResultList();
126127
} ) )
127128
.thenAccept( list -> {
128-
assertEquals( list.size(), 2 );
129-
assertEquals( ( (Node) list.get( 0 ) ).elements.size(), 2 );
129+
assertThat( list ).hasSize( 2 );
130+
assertThat( list.get( 0 ).elements ).hasSize( 2 );
130131
} )
131132
.thenCompose( v -> openSession()
132133
.thenCompose( s -> {
133134
s.enableFilter( "region" ).setParameter( "region", "oceania" );
134135
return s.createSelectionQuery( "select distinct n, e from Node n join n.elements e", Object[].class )
135136
.getResultList();
136137
} ) )
137-
.thenAccept( list -> assertEquals( list.size(), 2 ) )
138+
.thenAccept( list -> assertThat( list ).hasSize( 2 ) )
138139
);
139140
}
140141

‎hibernate-reactive-core/src/test/java/org/hibernate/reactive/HQLQueryParameterNamedTest.java‎

Lines changed: 60 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import jakarta.persistence.Table;
2222

2323
import static java.util.concurrent.TimeUnit.MINUTES;
24-
import static org.junit.jupiter.api.Assertions.assertEquals;
25-
import static org.junit.jupiter.api.Assertions.assertNotNull;
24+
import static org.assertj.core.api.Assertions.assertThat;
2625

2726
/**
2827
* Tests queries using named parameters like ":name",
@@ -49,52 +48,63 @@ public void populateDb(VertxTestContext context) {
4948

5049
@Test
5150
public void testAutoFlushOnSingleResult(VertxTestContext context) {
52-
Flour semolina = new Flour(678, "Semoline", "the coarse, purified wheat middlings of durum wheat used in making pasta.", "Wheat flour" );
51+
Flour semolina = new Flour(
52+
678,
53+
"Semoline",
54+
"the coarse, purified wheat middlings of durum wheat used in making pasta.",
55+
"Wheat flour"
56+
);
5357
test( context, getSessionFactory()
5458
.withSession( s -> s
5559
.persist( semolina )
5660
.thenCompose( v -> s.createSelectionQuery( "from Flour where id = :id", Flour.class )
5761
.setParameter( "id", semolina.getId() )
5862
.getSingleResult()
5963
)
60-
.thenAccept( found -> assertEquals( semolina, found ) )
64+
.thenAccept( found -> assertThat( found ).isEqualTo( semolina ) )
6165
)
6266
);
6367
}
6468

6569
@Test
6670
public void testSelectScalarValues(VertxTestContext context) {
6771
test( context, getSessionFactory().withSession( s -> {
68-
Stage.SelectionQuery<String> qr = s.createSelectionQuery( "SELECT 'Prova' FROM Flour WHERE id = :id", String.class )
72+
Stage.SelectionQuery<String> qr = s.createSelectionQuery(
73+
"SELECT 'Prova' FROM Flour WHERE id = :id",
74+
String.class
75+
)
6976
.setParameter( "id", rye.getId() );
70-
assertNotNull( qr );
77+
assertThat( qr ).isNotNull();
7178
return qr.getSingleResult();
72-
} ).thenAccept( found -> assertEquals( "Prova", found ) )
79+
} ).thenAccept( found -> assertThat( found ).isEqualTo( "Prova" ) )
7380
);
7481
}
7582

7683
@Test
7784
public void testSelectWithMultipleScalarValues(VertxTestContext context) {
7885
test( context, getSessionFactory().withSession( s -> {
79-
Stage.SelectionQuery<Object[]> qr = s.createSelectionQuery( "SELECT 'Prova', f.id FROM Flour f WHERE f.id = :id", Object[].class )
80-
.setParameter( "id", rye.getId() );
81-
assertNotNull( qr );
82-
return qr.getSingleResult();
83-
} ).thenAccept( found -> {
84-
assertEquals( "Prova", ( (Object[]) found )[0] );
85-
assertEquals( rye.getId(), ( (Object[]) found )[1] );
86-
} )
86+
Stage.SelectionQuery<Object[]> qr = s.createSelectionQuery(
87+
"SELECT 'Prova', f.id FROM Flour f WHERE f.id = :id",
88+
Object[].class
89+
)
90+
.setParameter( "id", rye.getId() );
91+
assertThat( qr ).isNotNull();
92+
return qr.getSingleResult();
93+
} )
94+
.thenAccept( found -> assertThat( found )
95+
.containsExactly( "Prova", rye.getId() ) )
8796
);
8897
}
8998

9099
@Test
91100
public void testSingleResultQueryOnId(VertxTestContext context) {
92101
test( context, getSessionFactory().withSession( s -> {
93-
Stage.SelectionQuery<Flour> qr = s.createSelectionQuery( "FROM Flour WHERE id = :id", Flour.class )
102+
Stage.SelectionQuery<Flour> qr = s
103+
.createSelectionQuery( "FROM Flour WHERE id = :id", Flour.class )
94104
.setParameter( "id", 1 );
95-
assertNotNull( qr );
105+
assertThat( qr ).isNotNull();
96106
return qr.getSingleResult();
97-
} ).thenAccept( flour -> assertEquals( spelt, flour ) )
107+
} ).thenAccept( flour -> assertThat( flour ).isEqualTo( spelt ) )
98108
);
99109
}
100110

@@ -103,76 +113,81 @@ public void testSingleResultQueryOnName(VertxTestContext context) {
103113
test( context, getSessionFactory().withSession( s -> {
104114
Stage.SelectionQuery<Flour> qr = s.createSelectionQuery( "FROM Flour WHERE name = :name", Flour.class )
105115
.setParameter( "name", "Almond" );
106-
assertNotNull( qr );
116+
assertThat( qr ).isNotNull();
107117
return qr.getSingleResult();
108-
} ).thenAccept( flour -> assertEquals( almond, flour ) )
118+
} ).thenAccept( flour -> assertThat( flour ).isEqualTo( almond ) )
109119
);
110120
}
111121

112122
@Test
113123
public void testSingleResultMultipleParameters(VertxTestContext context) {
114124
test( context, getSessionFactory().withSession( s -> {
115-
Stage.SelectionQuery<Flour> qr = s.createSelectionQuery( "FROM Flour WHERE name = :name and description = :desc", Flour.class )
125+
Stage.SelectionQuery<Flour> qr = s.createSelectionQuery(
126+
"FROM Flour WHERE name = :name and description = :desc",
127+
Flour.class
128+
)
116129
.setParameter( "name", almond.getName() )
117130
.setParameter( "desc", almond.getDescription() );
118-
assertNotNull( qr );
131+
assertThat( qr ).isNotNull();
119132
return qr.getSingleResult();
120-
} ).thenAccept( flour -> assertEquals( almond, flour ) )
133+
} ).thenAccept( flour -> assertThat( flour ).isEqualTo( almond ) )
121134
);
122135
}
123136

124137
@Test
125138
public void testSingleResultMultipleParametersReversed(VertxTestContext context) {
126139
test( context, getSessionFactory().withSession( s -> {
127-
Stage.SelectionQuery<Flour> qr = s.createSelectionQuery( "FROM Flour WHERE name = :name and description = :desc", Flour.class )
140+
Stage.SelectionQuery<Flour> qr = s.createSelectionQuery(
141+
"FROM Flour WHERE name = :name and description = :desc",
142+
Flour.class
143+
)
128144
.setParameter( "desc", almond.getDescription() )
129145
.setParameter( "name", almond.getName() );
130-
assertNotNull( qr );
146+
assertThat( qr ).isNotNull();
131147
return qr.getSingleResult();
132-
} ).thenAccept( flour -> assertEquals( almond, flour ) )
148+
} ).thenAccept( flour -> assertThat( flour ).isEqualTo( almond ) )
133149
);
134150
}
135151

136152
@Test
137153
public void testSingleResultMultipleParametersReused(VertxTestContext context) {
138154
test( context, getSessionFactory().withSession( s -> {
139-
Stage.SelectionQuery<Flour> qr = s.createSelectionQuery( "FROM Flour WHERE name = :name or cast(:name as string) is null", Flour.class )
155+
Stage.SelectionQuery<Flour> qr = s.createSelectionQuery(
156+
"FROM Flour WHERE name = :name or cast(:name as string) is null",
157+
Flour.class
158+
)
140159
.setParameter( "name", almond.getName() );
141-
assertNotNull( qr );
160+
assertThat( qr ).isNotNull();
142161
return qr.getSingleResult();
143-
} ).thenAccept( flour -> assertEquals( almond, flour ) )
162+
} ).thenAccept( flour -> assertThat( flour ).isEqualTo( almond ) )
144163
);
145164
}
146165

147166
@Test
148167
public void testPlaceHolderInString(VertxTestContext context) {
149168
test( context, getSessionFactory().withSession( s -> {
150-
Stage.SelectionQuery<Object[]> qr = s.createSelectionQuery( "select ':', ':name', f FROM Flour f WHERE f.name = :name", Object[].class )
169+
Stage.SelectionQuery<Object[]> qr = s.createSelectionQuery(
170+
"select ':', ':name', f FROM Flour f WHERE f.name = :name",
171+
Object[].class
172+
)
151173
.setParameter( "name", almond.getName() );
152-
assertNotNull( qr );
174+
assertThat( qr ).isNotNull();
153175
return qr.getSingleResult();
154-
} ).thenAccept( result -> {
155-
assertEquals( 3, result.length );
156-
assertEquals( ":", result[0] );
157-
assertEquals( ":name", result[1] );
158-
assertEquals( almond, result[2] );
159-
} )
176+
} ).thenAccept( result -> assertThat( result ).containsExactly( ":", ":name", almond ) )
160177
);
161178
}
162179

163180
@Test
164181
public void testPlaceHolderAndSingleQuoteInString(VertxTestContext context) {
165182
test( context, getSessionFactory().withSession( s -> {
166-
Stage.SelectionQuery<Object[]> qr = s.createSelectionQuery( "select ''':', ''':name''', f FROM Flour f WHERE f.name = :name", Object[].class )
183+
Stage.SelectionQuery<Object[]> qr = s.createSelectionQuery(
184+
"select ''':', ''':name''', f FROM Flour f WHERE f.name = :name",
185+
Object[].class
186+
)
167187
.setParameter( "name", almond.getName() );
168-
assertNotNull( qr );
188+
assertThat( qr ).isNotNull();
169189
return qr.getSingleResult();
170-
} ).thenAccept( result -> {
171-
assertEquals( 3, result.length );
172-
assertEquals( "':", result[0] );
173-
assertEquals( "':name'", result[1] );
174-
assertEquals( almond, result[2] );
175-
} )
190+
} ).thenAccept( result -> assertThat( result ).containsExactly( "':", "':name'", almond ) )
176191
);
177192
}
178193

0 commit comments

Comments
 (0)