Skip to content

Commit 2956649

Browse files
mp911demp911de
committed
DATAJPA-1783 - Reduce test class and test method visibility where possible.
1 parent d4597d1 commit 2956649

File tree

165 files changed

+1207
-1179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+1207
-1179
lines changed

‎src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
@ExtendWith(MockitoExtension.class)
6464
@MockitoSettings(strictness = Strictness.LENIENT)
6565
@SuppressWarnings({ "rawtypes", "unchecked" })
66-
public class QueryByExamplePredicateBuilderUnitTests {
66+
class QueryByExamplePredicateBuilderUnitTests {
6767

6868
@Mock CriteriaBuilder cb;
6969
@Mock Root root;
@@ -74,20 +74,20 @@ public class QueryByExamplePredicateBuilderUnitTests {
7474
@Mock Path dummyPath;
7575
@Mock Join from;
7676

77-
Set<SingularAttribute<? super Person, ?>> personEntityAttribtues;
78-
Set<SingularAttribute<? super Skill, ?>> skillEntityAttribtues;
77+
private Set<SingularAttribute<? super Person, ?>> personEntityAttribtues;
78+
private Set<SingularAttribute<? super Skill, ?>> skillEntityAttribtues;
7979

80-
SingularAttribute<? super Person, Long> personIdAttribute;
81-
SingularAttribute<? super Person, String> personFirstnameAttribute;
82-
SingularAttribute<? super Person, Long> personAgeAttribute;
83-
SingularAttribute<? super Person, Person> personFatherAttribute;
84-
SingularAttribute<? super Person, Skill> personSkillAttribute;
85-
SingularAttribute<? super Person, Address> personAddressAttribute;
86-
SingularAttribute<? super Skill, String> skillNameAttribute;
87-
SingularAttribute<? super Skill, Skill> skillNestedAttribute;
80+
private SingularAttribute<? super Person, Long> personIdAttribute;
81+
private SingularAttribute<? super Person, String> personFirstnameAttribute;
82+
private SingularAttribute<? super Person, Long> personAgeAttribute;
83+
private SingularAttribute<? super Person, Person> personFatherAttribute;
84+
private SingularAttribute<? super Person, Skill> personSkillAttribute;
85+
private SingularAttribute<? super Person, Address> personAddressAttribute;
86+
private SingularAttribute<? super Skill, String> skillNameAttribute;
87+
private SingularAttribute<? super Skill, Skill> skillNestedAttribute;
8888

8989
@BeforeEach
90-
public void setUp() {
90+
void setUp() {
9191

9292
personIdAttribute = new SingularAttributeStub<>("id", PersistentAttributeType.BASIC, Long.class);
9393
personFirstnameAttribute = new SingularAttributeStub<>("firstname", PersistentAttributeType.BASIC,
@@ -135,31 +135,31 @@ public void setUp() {
135135
}
136136

137137
@Test // DATAJPA-218
138-
public void getPredicateShouldThrowExceptionOnNullRoot() {
138+
void getPredicateShouldThrowExceptionOnNullRoot() {
139139
assertThatIllegalArgumentException().isThrownBy(
140140
() -> QueryByExamplePredicateBuilder.getPredicate(null, cb, of(new Person()), EscapeCharacter.DEFAULT));
141141
}
142142

143143
@Test // DATAJPA-218
144-
public void getPredicateShouldThrowExceptionOnNullCriteriaBuilder() {
144+
void getPredicateShouldThrowExceptionOnNullCriteriaBuilder() {
145145
assertThatIllegalArgumentException().isThrownBy(
146146
() -> QueryByExamplePredicateBuilder.getPredicate(root, null, of(new Person()), EscapeCharacter.DEFAULT));
147147
}
148148

149149
@Test // DATAJPA-218
150-
public void getPredicateShouldThrowExceptionOnNullExample() {
150+
void getPredicateShouldThrowExceptionOnNullExample() {
151151
assertThatIllegalArgumentException()
152152
.isThrownBy(() -> QueryByExamplePredicateBuilder.getPredicate(root, null, null, EscapeCharacter.DEFAULT));
153153
}
154154

155155
@Test // DATAJPA-218
156-
public void emptyCriteriaListShouldResultTruePredicate() {
156+
void emptyCriteriaListShouldResultTruePredicate() {
157157
assertThat(QueryByExamplePredicateBuilder.getPredicate(root, cb, of(new Person()), EscapeCharacter.DEFAULT))
158158
.isEqualTo(truePredicate);
159159
}
160160

161161
@Test // DATAJPA-218
162-
public void singleElementCriteriaShouldJustReturnIt() {
162+
void singleElementCriteriaShouldJustReturnIt() {
163163

164164
Person p = new Person();
165165
p.firstname = "foo";
@@ -170,7 +170,7 @@ public void singleElementCriteriaShouldJustReturnIt() {
170170
}
171171

172172
@Test // DATAJPA-218
173-
public void multiPredicateCriteriaShouldReturnCombinedOnes() {
173+
void multiPredicateCriteriaShouldReturnCombinedOnes() {
174174

175175
Person p = new Person();
176176
p.firstname = "foo";
@@ -184,7 +184,7 @@ public void multiPredicateCriteriaShouldReturnCombinedOnes() {
184184
}
185185

186186
@Test // DATAJPA-879
187-
public void orConcatenatesPredicatesIfMatcherSpecifies() {
187+
void orConcatenatesPredicatesIfMatcherSpecifies() {
188188

189189
Person person = new Person();
190190
person.firstname = "foo";
@@ -199,7 +199,7 @@ public void orConcatenatesPredicatesIfMatcherSpecifies() {
199199
}
200200

201201
@Test // DATAJPA-1372
202-
public void considersSingularJoinedAttributes() {
202+
void considersSingularJoinedAttributes() {
203203

204204
doReturn(from).when(root).join(anyString());
205205
doReturn(dummyPath).when(dummyPath).get(any(SingularAttribute.class));
@@ -219,7 +219,7 @@ public void considersSingularJoinedAttributes() {
219219
}
220220

221221
@Test // DATAJPA-1534
222-
public void likePatternsGetEscapedContaining() {
222+
void likePatternsGetEscapedContaining() {
223223

224224
Person person = new Person();
225225
person.firstname = "f\\o_o";
@@ -237,8 +237,7 @@ public void likePatternsGetEscapedContaining() {
237237
}
238238

239239
@Test // DATAJPA-1534
240-
241-
public void likePatternsGetEscapedStarting() {
240+
void likePatternsGetEscapedStarting() {
242241

243242
Person person = new Person();
244243
person.firstname = "f\\o_o";
@@ -256,7 +255,7 @@ public void likePatternsGetEscapedStarting() {
256255
}
257256

258257
@Test // DATAJPA-1534
259-
public void likePatternsGetEscapedEnding() {
258+
void likePatternsGetEscapedEnding() {
260259

261260
Person person = new Person();
262261
person.firstname = "f\\o_o";
@@ -307,12 +306,12 @@ static class SingularAttributeStub<X, T> implements SingularAttribute<X, T> {
307306
private Class<T> javaType;
308307
private Type<T> type;
309308

310-
public SingularAttributeStub(String name,
309+
SingularAttributeStub(String name,
311310
javax.persistence.metamodel.Attribute.PersistentAttributeType attributeType, Class<T> javaType) {
312311
this(name, attributeType, javaType, null);
313312
}
314313

315-
public SingularAttributeStub(String name,
314+
SingularAttributeStub(String name,
316315
javax.persistence.metamodel.Attribute.PersistentAttributeType attributeType, Class<T> javaType, Type<T> type) {
317316
this.name = name;
318317
this.attributeType = attributeType;

‎src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class Jsr310JpaConvertersIntegrationTests extends AbstractAttributeConver
4949
@PersistenceContext EntityManager em;
5050

5151
@Test // DATAJPA-650, DATAJPA-1631
52-
public void usesJsr310JpaConverters() {
52+
void usesJsr310JpaConverters() {
5353

5454
assumeTrue(currentEntityManagerIsAJpa21EntityManager(em));
5555

‎src/test/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConvertersIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class ThreeTenBackPortJpaConvertersIntegrationTests extends AbstractAttri
4747
@PersistenceContext EntityManager em;
4848

4949
@Test // DATAJPA-650
50-
public void usesThreeTenBackPortJpaConverters() {
50+
void usesThreeTenBackPortJpaConverters() {
5151

5252
assumeTrue(currentEntityManagerIsAJpa21EntityManager(em));
5353

‎src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
*/
5050
@ExtendWith(SpringExtension.class)
5151
@ContextConfiguration("classpath:infrastructure.xml")
52-
public class JpaSortTests {
52+
class JpaSortTests {
5353

5454
private static final @Nullable Attribute<?, ?> NULL_ATTRIBUTE = null;
5555
private static final Attribute<?, ?>[] EMPTY_ATTRIBUTES = new Attribute<?, ?>[0];
@@ -58,107 +58,107 @@ public class JpaSortTests {
5858
private static final PluralAttribute<?, ?, ?>[] EMPTY_PLURAL_ATTRIBUTES = new PluralAttribute<?, ?, ?>[0];
5959

6060
@Test // DATAJPA-12
61-
public void rejectsNullAttribute() {
61+
void rejectsNullAttribute() {
6262
assertThatIllegalArgumentException().isThrownBy(() -> of(NULL_ATTRIBUTE));
6363
}
6464

6565
@Test // DATAJPA-12
66-
public void rejectsEmptyAttributes() {
66+
void rejectsEmptyAttributes() {
6767
assertThatIllegalArgumentException().isThrownBy(() -> of(EMPTY_ATTRIBUTES));
6868
}
6969

7070
@Test // DATAJPA-12
71-
public void rejectsNullPluralAttribute() {
71+
void rejectsNullPluralAttribute() {
7272
assertThatIllegalArgumentException().isThrownBy(() -> of(NULL_PLURAL_ATTRIBUTE));
7373
}
7474

7575
@Test // DATAJPA-12
76-
public void rejectsEmptyPluralAttributes() {
76+
void rejectsEmptyPluralAttributes() {
7777
assertThatIllegalArgumentException().isThrownBy(() -> of(EMPTY_PLURAL_ATTRIBUTES));
7878
}
7979

8080
@Test // DATAJPA-12
81-
public void sortBySinglePropertyWithDefaultSortDirection() {
81+
void sortBySinglePropertyWithDefaultSortDirection() {
8282
assertThat(JpaSort.of(path(User_.firstname))).contains(Order.asc("firstname"));
8383
}
8484

8585
@Test // DATAJPA-12
86-
public void sortByMultiplePropertiesWithDefaultSortDirection() {
86+
void sortByMultiplePropertiesWithDefaultSortDirection() {
8787
assertThat(JpaSort.of(User_.firstname, User_.lastname)).contains(Order.asc("firstname"), Order.asc("lastname"));
8888
}
8989

9090
@Test // DATAJPA-12
91-
public void sortByMultiplePropertiesWithDescSortDirection() {
91+
void sortByMultiplePropertiesWithDescSortDirection() {
9292

9393
assertThat(JpaSort.of(DESC, User_.firstname, User_.lastname)).contains(new Order(DESC, "firstname"),
9494
Order.desc("lastname"));
9595
}
9696

9797
@Test // DATAJPA-12
98-
public void combiningSortByMultipleProperties() {
98+
void combiningSortByMultipleProperties() {
9999

100100
assertThat(JpaSort.of(User_.firstname).and(JpaSort.of(User_.lastname))).contains(Order.asc("firstname"),
101101
Order.asc("lastname"));
102102
}
103103

104104
@Test // DATAJPA-12
105-
public void combiningSortByMultiplePropertiesWithDifferentSort() {
105+
void combiningSortByMultiplePropertiesWithDifferentSort() {
106106

107107
assertThat(JpaSort.of(User_.firstname).and(JpaSort.of(DESC, User_.lastname))).contains(Order.asc("firstname"),
108108
Order.desc("lastname"));
109109
}
110110

111111
@Test // DATAJPA-12
112-
public void combiningSortByNestedEmbeddedProperty() {
112+
void combiningSortByNestedEmbeddedProperty() {
113113
assertThat(JpaSort.of(path(User_.address).dot(Address_.streetName))).contains(Order.asc("address.streetName"));
114114
}
115115

116116
@Test // DATAJPA-12
117-
public void buildJpaSortFromJpaMetaModelSingleAttribute() {
117+
void buildJpaSortFromJpaMetaModelSingleAttribute() {
118118

119119
assertThat(JpaSort.of(ASC, path(User_.firstname))).contains(Order.asc("firstname"));
120120
}
121121

122122
@Test // DATAJPA-12
123-
public void buildJpaSortFromJpaMetaModelNestedAttribute() {
123+
void buildJpaSortFromJpaMetaModelNestedAttribute() {
124124

125125
assertThat(JpaSort.of(ASC, path(MailMessage_.mailSender).dot(MailSender_.name)))
126126
.contains(Order.asc("mailSender.name"));
127127
}
128128

129129
@Test // DATAJPA-702
130-
public void combiningSortByMultiplePropertiesWithDifferentSortUsingSimpleAnd() {
130+
void combiningSortByMultiplePropertiesWithDifferentSortUsingSimpleAnd() {
131131

132132
assertThat(JpaSort.of(User_.firstname).and(DESC, User_.lastname)).containsExactly(Order.asc("firstname"),
133133
Order.desc("lastname"));
134134
}
135135

136136
@Test // DATAJPA-702
137-
public void combiningSortByMultiplePathsWithDifferentSortUsingSimpleAnd() {
137+
void combiningSortByMultiplePathsWithDifferentSortUsingSimpleAnd() {
138138

139139
assertThat(JpaSort.of(User_.firstname).and(DESC, path(MailMessage_.mailSender).dot(MailSender_.name)))
140140
.containsExactly(Order.asc("firstname"), Order.desc("mailSender.name"));
141141
}
142142

143143
@Test // DATAJPA-702
144-
public void rejectsNullAttributesForCombiningCriterias() {
144+
void rejectsNullAttributesForCombiningCriterias() {
145145
assertThatIllegalArgumentException().isThrownBy(() -> of(User_.firstname).and(DESC, (Attribute<?, ?>[]) null));
146146
}
147147

148148
@Test // DATAJPA-702
149-
public void rejectsNullPathsForCombiningCriterias() {
149+
void rejectsNullPathsForCombiningCriterias() {
150150
assertThatIllegalArgumentException().isThrownBy(() -> of(User_.firstname).and(DESC, (Path<?, ?>[]) null));
151151
}
152152

153153
@Test // DATAJPA-702
154-
public void buildsUpPathForPluralAttributesCorrectly() {
154+
void buildsUpPathForPluralAttributesCorrectly() {
155155

156156
// assertThat(JpaSort.of(JpaSort.path(User_.colleagues).dot(User_.roles).dot(Role_.name)), //
157157
// hasItem(new Order(ASC, "colleagues.roles.name")));
158158
}
159159

160160
@Test // DATAJPA-965
161-
public void createsUnsafeSortCorrectly() {
161+
void createsUnsafeSortCorrectly() {
162162

163163
JpaSort sort = JpaSort.unsafe(DESC, "foo.bar");
164164

@@ -167,7 +167,7 @@ public void createsUnsafeSortCorrectly() {
167167
}
168168

169169
@Test // DATAJPA-965
170-
public void createsUnsafeSortWithMultiplePropertiesCorrectly() {
170+
void createsUnsafeSortWithMultiplePropertiesCorrectly() {
171171

172172
JpaSort sort = JpaSort.unsafe(DESC, "foo.bar", "spring.data");
173173

@@ -177,7 +177,7 @@ public void createsUnsafeSortWithMultiplePropertiesCorrectly() {
177177
}
178178

179179
@Test // DATAJPA-965
180-
public void combinesSafeAndUnsafeSortCorrectly() {
180+
void combinesSafeAndUnsafeSortCorrectly() {
181181

182182
// JpaSort sort = JpaSort.of(path(User_.colleagues).dot(User_.roles).dot(Role_.name)).andUnsafe(DESC, "foo.bar");
183183
//
@@ -187,7 +187,7 @@ public void combinesSafeAndUnsafeSortCorrectly() {
187187
}
188188

189189
@Test // DATAJPA-965
190-
public void combinesUnsafeAndSafeSortCorrectly() {
190+
void combinesUnsafeAndSafeSortCorrectly() {
191191

192192
// Sort sort = JpaSort.unsafe(DESC, "foo.bar").and(ASC, path(User_.colleagues).dot(User_.roles).dot(Role_.name));
193193
//

0 commit comments

Comments
 (0)