From 6d662461b89589a8485e4ae3ec37e8bd42c5c500 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Mon, 8 Feb 2021 16:18:10 +0100 Subject: [PATCH] Polishing. Reduce method visibility in tests, enable missed test and format code. Closes #3546. Original pull request: #3551. --- .../mongodb/core/convert/MongoConverters.java | 2 +- .../MappingMongoConverterUnitTests.java | 5 ++-- .../convert/MongoConvertersUnitTests.java | 30 +++++++++---------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java index 1ab8bb627..efc1c1a2e 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java @@ -294,7 +294,7 @@ abstract class MongoConverters { @Override public NamedMongoScript convert(Document source) { - if(source.isEmpty()) { + if (source.isEmpty()) { return null; } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java index 4fe44c7e0..abdd84a4a 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java @@ -99,7 +99,7 @@ import com.mongodb.DBRef; * @author Heesu Jung */ @ExtendWith(MockitoExtension.class) -public class MappingMongoConverterUnitTests { +class MappingMongoConverterUnitTests { private MappingMongoConverter converter; private MongoMappingContext mappingContext; @@ -107,7 +107,7 @@ public class MappingMongoConverterUnitTests { @Mock DbRefResolver resolver; @BeforeEach - void setUp() { + void beforeEach() { MongoCustomConversions conversions = new MongoCustomConversions(); @@ -526,6 +526,7 @@ public class MappingMongoConverterUnitTests { assertThat(result.get("_id")).isInstanceOf(String.class); } + @Test public void convertsObjectsIfNecessary() { ObjectId id = new ObjectId(); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java index 88cf3314d..f7c67a09f 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java @@ -56,10 +56,10 @@ import org.springframework.data.mongodb.core.geo.Sphere; * @author Thomas Darimont * @author Christoph Strobl */ -public class MongoConvertersUnitTests { +class MongoConvertersUnitTests { @Test - public void convertsBigDecimalToStringAndBackCorrectly() { + void convertsBigDecimalToStringAndBackCorrectly() { BigDecimal bigDecimal = BigDecimal.valueOf(254, 1); String value = BigDecimalToStringConverter.INSTANCE.convert(bigDecimal); @@ -70,7 +70,7 @@ public class MongoConvertersUnitTests { } @Test // DATAMONGO-858 - public void convertsBoxToDocumentAndBackCorrectly() { + void convertsBoxToDocumentAndBackCorrectly() { Box box = new Box(new Point(1, 2), new Point(3, 4)); @@ -81,7 +81,7 @@ public class MongoConvertersUnitTests { } @Test // DATAMONGO-858 - public void convertsCircleToDocumentAndBackCorrectly() { + void convertsCircleToDocumentAndBackCorrectly() { Circle circle = new Circle(new Point(1, 2), 3); @@ -92,7 +92,7 @@ public class MongoConvertersUnitTests { } @Test // DATAMONGO-858 - public void convertsPolygonToDocumentAndBackCorrectly() { + void convertsPolygonToDocumentAndBackCorrectly() { Polygon polygon = new Polygon(new Point(1, 2), new Point(2, 3), new Point(3, 4), new Point(5, 6)); @@ -103,7 +103,7 @@ public class MongoConvertersUnitTests { } @Test // DATAMONGO-858 - public void convertsSphereToDocumentAndBackCorrectly() { + void convertsSphereToDocumentAndBackCorrectly() { Sphere sphere = new Sphere(new Point(1, 2), 3); @@ -114,7 +114,7 @@ public class MongoConvertersUnitTests { } @Test // DATAMONGO-858 - public void convertsPointToListAndBackCorrectly() { + void convertsPointToListAndBackCorrectly() { Point point = new Point(1, 2); @@ -125,44 +125,44 @@ public class MongoConvertersUnitTests { } @Test // DATAMONGO-1372 - public void convertsCurrencyToStringCorrectly() { + void convertsCurrencyToStringCorrectly() { assertThat(CurrencyToStringConverter.INSTANCE.convert(Currency.getInstance("USD"))).isEqualTo("USD"); } @Test // DATAMONGO-1372 - public void convertsStringToCurrencyCorrectly() { + void convertsStringToCurrencyCorrectly() { assertThat(StringToCurrencyConverter.INSTANCE.convert("USD")).isEqualTo(Currency.getInstance("USD")); } @Test // DATAMONGO-1416 - public void convertsAtomicLongToLongCorrectly() { + void convertsAtomicLongToLongCorrectly() { assertThat(AtomicLongToLongConverter.INSTANCE.convert(new AtomicLong(100L))).isEqualTo(100L); } @Test // DATAMONGO-1416 - public void convertsAtomicIntegerToIntegerCorrectly() { + void convertsAtomicIntegerToIntegerCorrectly() { assertThat(AtomicIntegerToIntegerConverter.INSTANCE.convert(new AtomicInteger(100))).isEqualTo(100); } @Test // DATAMONGO-1416 - public void convertsLongToAtomicLongCorrectly() { + void convertsLongToAtomicLongCorrectly() { assertThat(LongToAtomicLongConverter.INSTANCE.convert(100L)).isInstanceOf(AtomicLong.class); } @Test // DATAMONGO-1416 - public void convertsIntegerToAtomicIntegerCorrectly() { + void convertsIntegerToAtomicIntegerCorrectly() { assertThat(IntegerToAtomicIntegerConverter.INSTANCE.convert(100)).isInstanceOf(AtomicInteger.class); } @Test // DATAMONGO-2113 - public void convertsBsonTimestampToInstantCorrectly() { + void convertsBsonTimestampToInstantCorrectly() { assertThat(BsonTimestampToInstantConverter.INSTANCE.convert(new BsonTimestamp(6615900307735969796L))) .isCloseTo(Instant.ofEpochSecond(1540384327), new TemporalUnitLessThanOffset(100, ChronoUnit.MILLIS)); } @Test // DATAMONGO-2210 - public void convertsUrisToString() { + void convertsUrisToString() { MongoCustomConversions conversions = new MongoCustomConversions();