Skip to content

Commit 6d66246

Browse files
christophstroblmp911de
authored andcommitted
Polishing.
Reduce method visibility in tests, enable missed test and format code. Closes #3546. Original pull request: #3551.
1 parent 597d682 commit 6d66246

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ enum DocumentToNamedMongoScriptConverter implements Converter<Document, NamedMon
294294
@Override
295295
public NamedMongoScript convert(Document source) {
296296

297-
if(source.isEmpty()) {
297+
if (source.isEmpty()) {
298298
return null;
299299
}
300300

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@
9999
* @author Heesu Jung
100100
*/
101101
@ExtendWith(MockitoExtension.class)
102-
public class MappingMongoConverterUnitTests {
102+
class MappingMongoConverterUnitTests {
103103

104104
private MappingMongoConverter converter;
105105
private MongoMappingContext mappingContext;
106106
@Mock ApplicationContext context;
107107
@Mock DbRefResolver resolver;
108108

109109
@BeforeEach
110-
void setUp() {
110+
void beforeEach() {
111111

112112
MongoCustomConversions conversions = new MongoCustomConversions();
113113

@@ -526,6 +526,7 @@ void writesBigIntegerIdCorrectly() {
526526
assertThat(result.get("_id")).isInstanceOf(String.class);
527527
}
528528

529+
@Test
529530
public void convertsObjectsIfNecessary() {
530531

531532
ObjectId id = new ObjectId();

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
* @author Thomas Darimont
5757
* @author Christoph Strobl
5858
*/
59-
public class MongoConvertersUnitTests {
59+
class MongoConvertersUnitTests {
6060

6161
@Test
62-
public void convertsBigDecimalToStringAndBackCorrectly() {
62+
void convertsBigDecimalToStringAndBackCorrectly() {
6363

6464
BigDecimal bigDecimal = BigDecimal.valueOf(254, 1);
6565
String value = BigDecimalToStringConverter.INSTANCE.convert(bigDecimal);
@@ -70,7 +70,7 @@ public void convertsBigDecimalToStringAndBackCorrectly() {
7070
}
7171

7272
@Test // DATAMONGO-858
73-
public void convertsBoxToDocumentAndBackCorrectly() {
73+
void convertsBoxToDocumentAndBackCorrectly() {
7474

7575
Box box = new Box(new Point(1, 2), new Point(3, 4));
7676

@@ -81,7 +81,7 @@ public void convertsBoxToDocumentAndBackCorrectly() {
8181
}
8282

8383
@Test // DATAMONGO-858
84-
public void convertsCircleToDocumentAndBackCorrectly() {
84+
void convertsCircleToDocumentAndBackCorrectly() {
8585

8686
Circle circle = new Circle(new Point(1, 2), 3);
8787

@@ -92,7 +92,7 @@ public void convertsCircleToDocumentAndBackCorrectly() {
9292
}
9393

9494
@Test // DATAMONGO-858
95-
public void convertsPolygonToDocumentAndBackCorrectly() {
95+
void convertsPolygonToDocumentAndBackCorrectly() {
9696

9797
Polygon polygon = new Polygon(new Point(1, 2), new Point(2, 3), new Point(3, 4), new Point(5, 6));
9898

@@ -103,7 +103,7 @@ public void convertsPolygonToDocumentAndBackCorrectly() {
103103
}
104104

105105
@Test // DATAMONGO-858
106-
public void convertsSphereToDocumentAndBackCorrectly() {
106+
void convertsSphereToDocumentAndBackCorrectly() {
107107

108108
Sphere sphere = new Sphere(new Point(1, 2), 3);
109109

@@ -114,7 +114,7 @@ public void convertsSphereToDocumentAndBackCorrectly() {
114114
}
115115

116116
@Test // DATAMONGO-858
117-
public void convertsPointToListAndBackCorrectly() {
117+
void convertsPointToListAndBackCorrectly() {
118118

119119
Point point = new Point(1, 2);
120120

@@ -125,44 +125,44 @@ public void convertsPointToListAndBackCorrectly() {
125125
}
126126

127127
@Test // DATAMONGO-1372
128-
public void convertsCurrencyToStringCorrectly() {
128+
void convertsCurrencyToStringCorrectly() {
129129
assertThat(CurrencyToStringConverter.INSTANCE.convert(Currency.getInstance("USD"))).isEqualTo("USD");
130130
}
131131

132132
@Test // DATAMONGO-1372
133-
public void convertsStringToCurrencyCorrectly() {
133+
void convertsStringToCurrencyCorrectly() {
134134
assertThat(StringToCurrencyConverter.INSTANCE.convert("USD")).isEqualTo(Currency.getInstance("USD"));
135135
}
136136

137137
@Test // DATAMONGO-1416
138-
public void convertsAtomicLongToLongCorrectly() {
138+
void convertsAtomicLongToLongCorrectly() {
139139
assertThat(AtomicLongToLongConverter.INSTANCE.convert(new AtomicLong(100L))).isEqualTo(100L);
140140
}
141141

142142
@Test // DATAMONGO-1416
143-
public void convertsAtomicIntegerToIntegerCorrectly() {
143+
void convertsAtomicIntegerToIntegerCorrectly() {
144144
assertThat(AtomicIntegerToIntegerConverter.INSTANCE.convert(new AtomicInteger(100))).isEqualTo(100);
145145
}
146146

147147
@Test // DATAMONGO-1416
148-
public void convertsLongToAtomicLongCorrectly() {
148+
void convertsLongToAtomicLongCorrectly() {
149149
assertThat(LongToAtomicLongConverter.INSTANCE.convert(100L)).isInstanceOf(AtomicLong.class);
150150
}
151151

152152
@Test // DATAMONGO-1416
153-
public void convertsIntegerToAtomicIntegerCorrectly() {
153+
void convertsIntegerToAtomicIntegerCorrectly() {
154154
assertThat(IntegerToAtomicIntegerConverter.INSTANCE.convert(100)).isInstanceOf(AtomicInteger.class);
155155
}
156156

157157
@Test // DATAMONGO-2113
158-
public void convertsBsonTimestampToInstantCorrectly() {
158+
void convertsBsonTimestampToInstantCorrectly() {
159159

160160
assertThat(BsonTimestampToInstantConverter.INSTANCE.convert(new BsonTimestamp(6615900307735969796L)))
161161
.isCloseTo(Instant.ofEpochSecond(1540384327), new TemporalUnitLessThanOffset(100, ChronoUnit.MILLIS));
162162
}
163163

164164
@Test // DATAMONGO-2210
165-
public void convertsUrisToString() {
165+
void convertsUrisToString() {
166166

167167
MongoCustomConversions conversions = new MongoCustomConversions();
168168

0 commit comments

Comments
 (0)