Skip to content

Commit fea69da

Browse files
mp911demp911de
committedJan 7, 2025··
Polishing.
Reduce test class and method visibility. Convert JUnit 4 test to JUnit 5. Reformat code. Original pull request: #4862 See #4850
·
4.4.54.4.2
1 parent 1eca350 commit fea69da

File tree

3 files changed

+79
-81
lines changed

3 files changed

+79
-81
lines changed
 

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public Criteria and(String key) {
196196
*/
197197
public Criteria is(@Nullable Object value) {
198198

199-
if (!isValue.equals(NOT_SET)) {
199+
if (!NOT_SET.equals(isValue)) {
200200
throw new InvalidMongoDbApiUsageException(
201201
"Multiple 'is' values declared; You need to use 'and' with multiple criteria");
202202
}
@@ -945,11 +945,10 @@ protected Document getSingleCriteriaObject() {
945945
Document queryCriteria = new Document();
946946

947947
if (!NOT_SET.equals(isValue)) {
948-
if(document.isEmpty()) {
948+
if (document.isEmpty()) {
949949
queryCriteria.put(this.key, this.isValue);
950-
}
951-
else {
952-
if(isValue instanceof Pattern || isValue instanceof BsonRegularExpression) {
950+
} else {
951+
if (isValue instanceof Pattern || isValue instanceof BsonRegularExpression) {
953952
document.put("$regex", isValue);
954953
} else {
955954
document.put("$eq", isValue);

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -64,84 +64,84 @@ void beforeEach() {
6464
}
6565

6666
@Test // DATAMONGO-1808
67-
public void bitsAllClearWithBitPositions() {
67+
void bitsAllClearWithBitPositions() {
6868

6969
assertThat(ops.find(query(where("value").bits().allClear(Arrays.asList(1, 5))), DocumentWithBitmask.class))
7070
.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
7171
}
7272

7373
@Test // DATAMONGO-1808
74-
public void bitsAllClearWithNumericBitmask() {
74+
void bitsAllClearWithNumericBitmask() {
7575

7676
assertThat(ops.find(query(where("value").bits().allClear(35)), DocumentWithBitmask.class))
7777
.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
7878
}
7979

8080
@Test // DATAMONGO-1808
81-
public void bitsAllClearWithStringBitmask() {
81+
void bitsAllClearWithStringBitmask() {
8282

8383
assertThat(ops.find(query(where("value").bits().allClear("ID==")), DocumentWithBitmask.class))
8484
.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
8585
}
8686

8787
@Test // DATAMONGO-1808
88-
public void bitsAllSetWithBitPositions() {
88+
void bitsAllSetWithBitPositions() {
8989

9090
assertThat(ops.find(query(where("value").bits().allSet(Arrays.asList(1, 5))), DocumentWithBitmask.class))
9191
.containsExactlyInAnyOrder(FIFTY_FOUR, ONE_HUNDRED_TWO);
9292
}
9393

9494
@Test // DATAMONGO-1808
95-
public void bitsAllSetWithNumericBitmask() {
95+
void bitsAllSetWithNumericBitmask() {
9696

9797
assertThat(ops.find(query(where("value").bits().allSet(50)), DocumentWithBitmask.class))
9898
.containsExactlyInAnyOrder(FIFTY_FOUR);
9999
}
100100

101101
@Test // DATAMONGO-1808
102-
public void bitsAllSetWithStringBitmask() {
102+
void bitsAllSetWithStringBitmask() {
103103

104104
assertThat(ops.find(query(where("value").bits().allSet("MC==")), DocumentWithBitmask.class))
105105
.containsExactlyInAnyOrder(FIFTY_FOUR);
106106
}
107107

108108
@Test // DATAMONGO-1808
109-
public void bitsAnyClearWithBitPositions() {
109+
void bitsAnyClearWithBitPositions() {
110110

111111
assertThat(ops.find(query(where("value").bits().anyClear(Arrays.asList(1, 5))), DocumentWithBitmask.class))
112112
.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
113113
}
114114

115115
@Test // DATAMONGO-1808
116-
public void bitsAnyClearWithNumericBitmask() {
116+
void bitsAnyClearWithNumericBitmask() {
117117

118118
assertThat(ops.find(query(where("value").bits().anyClear(35)), DocumentWithBitmask.class))
119119
.containsExactlyInAnyOrder(FIFTY_FOUR, TWENTY_INT, TWENTY_FLOAT, ONE_HUNDRED_TWO);
120120
}
121121

122122
@Test // DATAMONGO-1808
123-
public void bitsAnyClearWithStringBitmask() {
123+
void bitsAnyClearWithStringBitmask() {
124124

125125
assertThat(ops.find(query(where("value").bits().anyClear("MC==")), DocumentWithBitmask.class))
126126
.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT, ONE_HUNDRED_TWO);
127127
}
128128

129129
@Test // DATAMONGO-1808
130-
public void bitsAnySetWithBitPositions() {
130+
void bitsAnySetWithBitPositions() {
131131

132132
assertThat(ops.find(query(where("value").bits().anySet(Arrays.asList(1, 5))), DocumentWithBitmask.class))
133133
.containsExactlyInAnyOrder(FIFTY_FOUR, ONE_HUNDRED_TWO);
134134
}
135135

136136
@Test // DATAMONGO-1808
137-
public void bitsAnySetWithNumericBitmask() {
137+
void bitsAnySetWithNumericBitmask() {
138138

139139
assertThat(ops.find(query(where("value").bits().anySet(35)), DocumentWithBitmask.class))
140140
.containsExactlyInAnyOrder(FIFTY_FOUR, ONE_HUNDRED_TWO);
141141
}
142142

143143
@Test // DATAMONGO-1808
144-
public void bitsAnySetWithStringBitmask() {
144+
void bitsAnySetWithStringBitmask() {
145145

146146
assertThat(ops.find(query(where("value").bits().anySet("MC==")), DocumentWithBitmask.class))
147147
.containsExactlyInAnyOrder(FIFTY_FOUR, TWENTY_INT, TWENTY_FLOAT, ONE_HUNDRED_TWO);

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaUnitTests.java

+63-64
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424

2525
import org.bson.BsonRegularExpression;
2626
import org.bson.Document;
27-
import org.junit.Test;
27+
import org.junit.jupiter.api.Test;
28+
2829
import org.springframework.data.geo.Point;
2930
import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
3031
import org.springframework.data.mongodb.core.geo.GeoJsonLineString;
@@ -44,60 +45,57 @@
4445
* @author Mark Paluch
4546
* @author James McNee
4647
*/
47-
public class CriteriaUnitTests {
48+
class CriteriaUnitTests {
4849

4950
@Test
50-
public void testSimpleCriteria() {
51+
void testSimpleCriteria() {
5152
Criteria c = new Criteria("name").is("Bubba");
5253
assertThat(c.getCriteriaObject()).isEqualTo("{ \"name\" : \"Bubba\"}");
5354
}
5455

5556
@Test // GH-4850
56-
public void testCombiningSimpleCriteria() {
57+
void testCombiningSimpleCriteria() {
5758

5859
Document expected = Document.parse("{ name : { $eq : 123, $type : ['long'] } }");
5960

6061
Criteria c = Criteria.where("name") //
61-
.is(123) //
62-
.type(Type.INT_64);
62+
.is(123) //
63+
.type(Type.INT_64);
6364

6465
assertThat(c.getCriteriaObject()).isEqualTo(expected);
6566

6667
c = Criteria.where("name") //
67-
.type(Type.INT_64)
68-
.is(123);
68+
.type(Type.INT_64).is(123);
6969

7070
assertThat(c.getCriteriaObject()).isEqualTo(expected);
7171
}
7272

7373
@Test // GH-4850
74-
public void testCombiningBsonRegexCriteria() {
74+
void testCombiningBsonRegexCriteria() {
7575

76-
Criteria c = Criteria.where("name")
77-
.regex(new BsonRegularExpression("^spring$"))
78-
.type(Type.INT_64);
76+
Criteria c = Criteria.where("name").regex(new BsonRegularExpression("^spring$")).type(Type.INT_64);
7977

80-
assertThat(c.getCriteriaObject()).isEqualTo(Document.parse("{ name : { $regex : RegExp('^spring$'), $type : ['long'] } }"));
78+
assertThat(c.getCriteriaObject())
79+
.isEqualTo(Document.parse("{ name : { $regex : RegExp('^spring$'), $type : ['long'] } }"));
8180
}
8281

8382
@Test // GH-4850
84-
public void testCombiningRegexCriteria() {
83+
void testCombiningRegexCriteria() {
8584

86-
Criteria c = Criteria.where("name")
87-
.regex("^spring$")
88-
.type(Type.INT_64);
85+
Criteria c = Criteria.where("name").regex("^spring$").type(Type.INT_64);
8986

90-
assertThat(c.getCriteriaObject()).hasEntrySatisfying("name.$regex", it -> assertThat(it).isInstanceOf(Pattern.class));
87+
assertThat(c.getCriteriaObject()).hasEntrySatisfying("name.$regex",
88+
it -> assertThat(it).isInstanceOf(Pattern.class));
9189
}
9290

9391
@Test
94-
public void testNotEqualCriteria() {
92+
void testNotEqualCriteria() {
9593
Criteria c = new Criteria("name").ne("Bubba");
9694
assertThat(c.getCriteriaObject()).isEqualTo("{ \"name\" : { \"$ne\" : \"Bubba\"}}");
9795
}
9896

9997
@Test
100-
public void buildsIsNullCriteriaCorrectly() {
98+
void buildsIsNullCriteriaCorrectly() {
10199

102100
Document reference = new Document("name", null);
103101

@@ -106,19 +104,20 @@ public void buildsIsNullCriteriaCorrectly() {
106104
}
107105

108106
@Test
109-
public void testChainedCriteria() {
107+
void testChainedCriteria() {
110108
Criteria c = new Criteria("name").is("Bubba").and("age").lt(21);
111109
assertThat(c.getCriteriaObject()).isEqualTo("{ \"name\" : \"Bubba\" , \"age\" : { \"$lt\" : 21}}");
112110
}
113111

114-
@Test(expected = InvalidMongoDbApiUsageException.class)
115-
public void testCriteriaWithMultipleConditionsForSameKey() {
112+
@Test
113+
void testCriteriaWithMultipleConditionsForSameKey() {
116114
Criteria c = new Criteria("name").gte("M").and("name").ne("A");
117-
c.getCriteriaObject();
115+
116+
assertThatExceptionOfType(InvalidMongoDbApiUsageException.class).isThrownBy(c::getCriteriaObject);
118117
}
119118

120119
@Test
121-
public void equalIfCriteriaMatches() {
120+
void equalIfCriteriaMatches() {
122121

123122
Criteria left = new Criteria("name").is("Foo").and("lastname").is("Bar");
124123
Criteria right = new Criteria("name").is("Bar").and("lastname").is("Bar");
@@ -128,7 +127,7 @@ public void equalIfCriteriaMatches() {
128127
}
129128

130129
@Test // GH-3286
131-
public void shouldBuildCorrectAndOperator() {
130+
void shouldBuildCorrectAndOperator() {
132131

133132
Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true), Criteria.where("y").is(42),
134133
Criteria.where("z").is("value"));
@@ -140,7 +139,7 @@ public void shouldBuildCorrectAndOperator() {
140139
}
141140

142141
@Test // GH-3286
143-
public void shouldBuildCorrectOrOperator() {
142+
void shouldBuildCorrectOrOperator() {
144143

145144
Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true), Criteria.where("y").is(42),
146145
Criteria.where("z").is("value"));
@@ -152,7 +151,7 @@ public void shouldBuildCorrectOrOperator() {
152151
}
153152

154153
@Test // GH-3286
155-
public void shouldBuildCorrectNorOperator() {
154+
void shouldBuildCorrectNorOperator() {
156155

157156
Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true), Criteria.where("y").is(42),
158157
Criteria.where("z").is("value"));
@@ -164,28 +163,28 @@ public void shouldBuildCorrectNorOperator() {
164163
}
165164

166165
@Test // DATAMONGO-507
167-
public void shouldThrowExceptionWhenTryingToNegateAndOperation() {
166+
void shouldThrowExceptionWhenTryingToNegateAndOperation() {
168167
assertThatIllegalArgumentException().isThrownBy(() -> new Criteria() //
169168
.not() //
170169
.andOperator(Criteria.where("delete").is(true).and("_id").is(42)));
171170
}
172171

173172
@Test // DATAMONGO-507
174-
public void shouldThrowExceptionWhenTryingToNegateOrOperation() {
173+
void shouldThrowExceptionWhenTryingToNegateOrOperation() {
175174
assertThatIllegalArgumentException().isThrownBy(() -> new Criteria() //
176175
.not() //
177176
.orOperator(Criteria.where("delete").is(true).and("_id").is(42)));
178177
}
179178

180179
@Test // DATAMONGO-507
181-
public void shouldThrowExceptionWhenTryingToNegateNorOperation() {
180+
void shouldThrowExceptionWhenTryingToNegateNorOperation() {
182181
assertThatIllegalArgumentException().isThrownBy(() -> new Criteria() //
183182
.not() //
184183
.norOperator(Criteria.where("delete").is(true).and("_id").is(42)));
185184
}
186185

187186
@Test // DATAMONGO-507
188-
public void shouldNegateFollowingSimpleExpression() {
187+
void shouldNegateFollowingSimpleExpression() {
189188

190189
Criteria c = Criteria.where("age").not().gt(18).and("status").is("student");
191190
Document co = c.getCriteriaObject();
@@ -195,111 +194,111 @@ public void shouldNegateFollowingSimpleExpression() {
195194
}
196195

197196
@Test // GH-3726
198-
public void shouldBuildCorrectSampleRateOperation() {
197+
void shouldBuildCorrectSampleRateOperation() {
199198
Criteria c = new Criteria().sampleRate(0.4);
200199
assertThat(c.getCriteriaObject()).isEqualTo("{ \"$sampleRate\" : 0.4 }");
201200
}
202201

203202
@Test // GH-3726
204-
public void shouldThrowExceptionWhenSampleRateIsNegative() {
203+
void shouldThrowExceptionWhenSampleRateIsNegative() {
205204
assertThatIllegalArgumentException().isThrownBy(() -> new Criteria().sampleRate(-1));
206205
}
207206

208207
@Test // GH-3726
209-
public void shouldThrowExceptionWhenSampleRateIsGreatedThanOne() {
208+
void shouldThrowExceptionWhenSampleRateIsGreatedThanOne() {
210209
assertThatIllegalArgumentException().isThrownBy(() -> new Criteria().sampleRate(1.01));
211210
}
212211

213212
@Test // DATAMONGO-1068
214-
public void getCriteriaObjectShouldReturnEmptyDocumentWhenNoCriteriaSpecified() {
213+
void getCriteriaObjectShouldReturnEmptyDocumentWhenNoCriteriaSpecified() {
215214

216215
Document document = new Criteria().getCriteriaObject();
217216

218217
assertThat(document).isEqualTo(new Document());
219218
}
220219

221220
@Test // DATAMONGO-1068
222-
public void getCriteriaObjectShouldUseCritieraValuesWhenNoKeyIsPresent() {
221+
void getCriteriaObjectShouldUseCritieraValuesWhenNoKeyIsPresent() {
223222

224223
Document document = new Criteria().lt("foo").getCriteriaObject();
225224

226225
assertThat(document).isEqualTo(new Document().append("$lt", "foo"));
227226
}
228227

229228
@Test // DATAMONGO-1068
230-
public void getCriteriaObjectShouldUseCritieraValuesWhenNoKeyIsPresentButMultipleCriteriasPresent() {
229+
void getCriteriaObjectShouldUseCritieraValuesWhenNoKeyIsPresentButMultipleCriteriasPresent() {
231230

232231
Document document = new Criteria().lt("foo").gt("bar").getCriteriaObject();
233232

234233
assertThat(document).isEqualTo(new Document().append("$lt", "foo").append("$gt", "bar"));
235234
}
236235

237236
@Test // DATAMONGO-1068
238-
public void getCriteriaObjectShouldRespectNotWhenNoKeyPresent() {
237+
void getCriteriaObjectShouldRespectNotWhenNoKeyPresent() {
239238

240239
Document document = new Criteria().lt("foo").not().getCriteriaObject();
241240

242241
assertThat(document).isEqualTo(new Document().append("$not", new Document("$lt", "foo")));
243242
}
244243

245244
@Test // GH-4220
246-
public void usesCorrectBsonType() {
245+
void usesCorrectBsonType() {
247246

248247
Document document = new Criteria("foo").type(Type.BOOLEAN).getCriteriaObject();
249248

250249
assertThat(document).containsEntry("foo.$type", Collections.singletonList("bool"));
251250
}
252251

253252
@Test // DATAMONGO-1135
254-
public void geoJsonTypesShouldBeWrappedInGeometry() {
253+
void geoJsonTypesShouldBeWrappedInGeometry() {
255254

256255
Document document = new Criteria("foo").near(new GeoJsonPoint(100, 200)).getCriteriaObject();
257256

258257
assertThat(document).containsEntry("foo.$near.$geometry", new GeoJsonPoint(100, 200));
259258
}
260259

261260
@Test // DATAMONGO-1135
262-
public void legacyCoordinateTypesShouldNotBeWrappedInGeometry() {
261+
void legacyCoordinateTypesShouldNotBeWrappedInGeometry() {
263262

264263
Document document = new Criteria("foo").near(new Point(100, 200)).getCriteriaObject();
265264

266265
assertThat(document).doesNotContainKey("foo.$near.$geometry");
267266
}
268267

269268
@Test // DATAMONGO-1135
270-
public void maxDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
269+
void maxDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
271270

272271
Document document = new Criteria("foo").near(new GeoJsonPoint(100, 200)).maxDistance(50D).getCriteriaObject();
273272

274273
assertThat(document).containsEntry("foo.$near.$maxDistance", 50D);
275274
}
276275

277276
@Test // DATAMONGO-1135
278-
public void maxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
277+
void maxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
279278

280279
Document document = new Criteria("foo").nearSphere(new GeoJsonPoint(100, 200)).maxDistance(50D).getCriteriaObject();
281280

282281
assertThat(document).containsEntry("foo.$nearSphere.$maxDistance", 50D);
283282
}
284283

285284
@Test // DATAMONGO-1110
286-
public void minDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
285+
void minDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
287286

288287
Document document = new Criteria("foo").near(new GeoJsonPoint(100, 200)).minDistance(50D).getCriteriaObject();
289288

290289
assertThat(document).containsEntry("foo.$near.$minDistance", 50D);
291290
}
292291

293292
@Test // DATAMONGO-1110
294-
public void minDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
293+
void minDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
295294

296295
Document document = new Criteria("foo").nearSphere(new GeoJsonPoint(100, 200)).minDistance(50D).getCriteriaObject();
297296

298297
assertThat(document).containsEntry("foo.$nearSphere.$minDistance", 50D);
299298
}
300299

301300
@Test // DATAMONGO-1110
302-
public void minAndMaxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
301+
void minAndMaxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
303302

304303
Document document = new Criteria("foo").nearSphere(new GeoJsonPoint(100, 200)).minDistance(50D).maxDistance(100D)
305304
.getCriteriaObject();
@@ -309,12 +308,12 @@ public void minAndMaxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJ
309308
}
310309

311310
@Test // DATAMONGO-1134
312-
public void intersectsShouldThrowExceptionWhenCalledWihtNullValue() {
311+
void intersectsShouldThrowExceptionWhenCalledWihtNullValue() {
313312
assertThatIllegalArgumentException().isThrownBy(() -> new Criteria("foo").intersects(null));
314313
}
315314

316315
@Test // DATAMONGO-1134
317-
public void intersectsShouldWrapGeoJsonTypeInGeometryCorrectly() {
316+
void intersectsShouldWrapGeoJsonTypeInGeometryCorrectly() {
318317

319318
GeoJsonLineString lineString = new GeoJsonLineString(new Point(0, 0), new Point(10, 10));
320319
Document document = new Criteria("foo").intersects(lineString).getCriteriaObject();
@@ -323,7 +322,7 @@ public void intersectsShouldWrapGeoJsonTypeInGeometryCorrectly() {
323322
}
324323

325324
@Test // DATAMONGO-1835
326-
public void extractsJsonSchemaInChainCorrectly() {
325+
void extractsJsonSchemaInChainCorrectly() {
327326

328327
MongoJsonSchema schema = MongoJsonSchema.builder().required("name").build();
329328
Criteria criteria = Criteria.where("foo").is("bar").andDocumentStructureMatches(schema);
@@ -333,7 +332,7 @@ public void extractsJsonSchemaInChainCorrectly() {
333332
}
334333

335334
@Test // DATAMONGO-1835
336-
public void extractsJsonSchemaFromFactoryMethodCorrectly() {
335+
void extractsJsonSchemaFromFactoryMethodCorrectly() {
337336

338337
MongoJsonSchema schema = MongoJsonSchema.builder().required("name").build();
339338
Criteria criteria = Criteria.matchingDocumentStructure(schema);
@@ -343,15 +342,15 @@ public void extractsJsonSchemaFromFactoryMethodCorrectly() {
343342
}
344343

345344
@Test // DATAMONGO-1808
346-
public void shouldAppendBitsAllClearWithIntBitmaskCorrectly() {
345+
void shouldAppendBitsAllClearWithIntBitmaskCorrectly() {
347346

348347
Criteria numericBitmaskCriteria = new Criteria("field").bits().allClear(0b101);
349348

350349
assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAllClear\" : 5} }");
351350
}
352351

353352
@Test // DATAMONGO-1808
354-
public void shouldAppendBitsAllClearWithPositionListCorrectly() {
353+
void shouldAppendBitsAllClearWithPositionListCorrectly() {
355354

356355
Criteria bitPositionsBitmaskCriteria = new Criteria("field").bits().allClear(Arrays.asList(0, 2));
357356

@@ -360,15 +359,15 @@ public void shouldAppendBitsAllClearWithPositionListCorrectly() {
360359
}
361360

362361
@Test // DATAMONGO-1808
363-
public void shouldAppendBitsAllSetWithIntBitmaskCorrectly() {
362+
void shouldAppendBitsAllSetWithIntBitmaskCorrectly() {
364363

365364
Criteria numericBitmaskCriteria = new Criteria("field").bits().allSet(0b101);
366365

367366
assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAllSet\" : 5} }");
368367
}
369368

370369
@Test // DATAMONGO-1808
371-
public void shouldAppendBitsAllSetWithPositionListCorrectly() {
370+
void shouldAppendBitsAllSetWithPositionListCorrectly() {
372371

373372
Criteria bitPositionsBitmaskCriteria = new Criteria("field").bits().allSet(Arrays.asList(0, 2));
374373

@@ -377,15 +376,15 @@ public void shouldAppendBitsAllSetWithPositionListCorrectly() {
377376
}
378377

379378
@Test // DATAMONGO-1808
380-
public void shouldAppendBitsAnyClearWithIntBitmaskCorrectly() {
379+
void shouldAppendBitsAnyClearWithIntBitmaskCorrectly() {
381380

382381
Criteria numericBitmaskCriteria = new Criteria("field").bits().anyClear(0b101);
383382

384383
assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAnyClear\" : 5} }");
385384
}
386385

387386
@Test // DATAMONGO-1808
388-
public void shouldAppendBitsAnyClearWithPositionListCorrectly() {
387+
void shouldAppendBitsAnyClearWithPositionListCorrectly() {
389388

390389
Criteria bitPositionsBitmaskCriteria = new Criteria("field").bits().anyClear(Arrays.asList(0, 2));
391390

@@ -394,15 +393,15 @@ public void shouldAppendBitsAnyClearWithPositionListCorrectly() {
394393
}
395394

396395
@Test // DATAMONGO-1808
397-
public void shouldAppendBitsAnySetWithIntBitmaskCorrectly() {
396+
void shouldAppendBitsAnySetWithIntBitmaskCorrectly() {
398397

399398
Criteria numericBitmaskCriteria = new Criteria("field").bits().anySet(0b101);
400399

401400
assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAnySet\" : 5} }");
402401
}
403402

404403
@Test // DATAMONGO-1808
405-
public void shouldAppendBitsAnySetWithPositionListCorrectly() {
404+
void shouldAppendBitsAnySetWithPositionListCorrectly() {
406405

407406
Criteria bitPositionsBitmaskCriteria = new Criteria("field").bits().anySet(Arrays.asList(0, 2));
408407

@@ -411,7 +410,7 @@ public void shouldAppendBitsAnySetWithPositionListCorrectly() {
411410
}
412411

413412
@Test // DATAMONGO-2002
414-
public void shouldEqualForSamePattern() {
413+
void shouldEqualForSamePattern() {
415414

416415
Criteria left = new Criteria("field").regex("foo");
417416
Criteria right = new Criteria("field").regex("foo");
@@ -420,7 +419,7 @@ public void shouldEqualForSamePattern() {
420419
}
421420

422421
@Test // DATAMONGO-2002
423-
public void shouldEqualForDocument() {
422+
void shouldEqualForDocument() {
424423

425424
assertThat(new Criteria("field").is(new Document("one", 1).append("two", "two").append("null", null)))
426425
.isEqualTo(new Criteria("field").is(new Document("one", 1).append("two", "two").append("null", null)));
@@ -439,7 +438,7 @@ public void shouldEqualForDocument() {
439438
}
440439

441440
@Test // DATAMONGO-2002
442-
public void shouldEqualForCollection() {
441+
void shouldEqualForCollection() {
443442

444443
assertThat(new Criteria("field").is(Arrays.asList("foo", "bar")))
445444
.isEqualTo(new Criteria("field").is(Arrays.asList("foo", "bar")));
@@ -459,7 +458,7 @@ public void shouldEqualForCollection() {
459458
}
460459

461460
@Test // GH-3414
462-
public void shouldEqualForSamePatternAndFlags() {
461+
void shouldEqualForSamePatternAndFlags() {
463462

464463
Criteria left = new Criteria("field").regex("foo", "iu");
465464
Criteria right = new Criteria("field").regex("foo");
@@ -468,7 +467,7 @@ public void shouldEqualForSamePatternAndFlags() {
468467
}
469468

470469
@Test // GH-3414
471-
public void shouldEqualForNestedPattern() {
470+
void shouldEqualForNestedPattern() {
472471

473472
Criteria left = new Criteria("a").orOperator(new Criteria("foo").regex("value", "i"),
474473
new Criteria("bar").regex("value"));

0 commit comments

Comments
 (0)
Please sign in to comment.