From f420c82050d7afe9c880230146ed1100cc256316 Mon Sep 17 00:00:00 2001 From: Arman Sharif Date: Fri, 24 May 2024 22:17:57 -0700 Subject: [PATCH] Minor test refactoring --- .../org/instancio/test/features/assign/AssignPojoTest.java | 2 +- .../features/generator/UserSuppliedClassGeneratorsTest.java | 2 +- .../java/org/instancio/test/features/ignore/IgnoreTest.java | 2 +- .../test/features/nullable/WithNullableAdhocTest.java | 2 +- .../java/org/instancio/test/features/toscope/ToScopeTest.java | 2 +- .../external/errorhandling/AmbiguousAssigmentErrorTest.java | 4 ++-- .../org/instancio/creation/generics/PersonCreationTest.java | 2 +- .../test/java/org/instancio/internal/nodes/NodeStatsTest.java | 2 +- .../instancio/test/support/asserts/ReflectionAssertTest.java | 2 +- .../java/org/instancio/test/support/pojo/person/Address.java | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/assign/AssignPojoTest.java b/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/assign/AssignPojoTest.java index c5dbb51f1..fa81d2999 100644 --- a/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/assign/AssignPojoTest.java +++ b/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/assign/AssignPojoTest.java @@ -75,7 +75,7 @@ void supplyPojoViaGenerator() { .isSameAs(address); // should be populated due to default generator hint - assertThat(address.getAddress()).isNotBlank(); + assertThat(address.getStreet()).isNotBlank(); assertThat(address.getCity()).isNotBlank(); assertThat(address.getCountry()).isNotBlank(); assertThat(address.getPhoneNumbers()).isNotEmpty(); diff --git a/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/generator/UserSuppliedClassGeneratorsTest.java b/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/generator/UserSuppliedClassGeneratorsTest.java index 445ee27f1..9ecd94467 100644 --- a/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/generator/UserSuppliedClassGeneratorsTest.java +++ b/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/generator/UserSuppliedClassGeneratorsTest.java @@ -66,7 +66,7 @@ void userSuppliedStringClassGenerator() { assertThat(person.getName()).isEqualTo(expectedName); assertThat(person.getAddress().getCity()).startsWith(prefix); - assertThat(person.getAddress().getAddress()).startsWith(prefix); + assertThat(person.getAddress().getStreet()).startsWith(prefix); assertThat(person.getAddress().getCountry()).startsWith(prefix); person.getAddress().getPhoneNumbers().forEach(phone -> { diff --git a/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/ignore/IgnoreTest.java b/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/ignore/IgnoreTest.java index 5908f2bc3..8a85c32f1 100644 --- a/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/ignore/IgnoreTest.java +++ b/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/ignore/IgnoreTest.java @@ -157,7 +157,7 @@ void ignoredSelectorWithScope() { .create(); assertThat(person.getName()).isNotNull(); - assertThat(person.getAddress().getAddress()).isNull(); + assertThat(person.getAddress().getStreet()).isNull(); assertThat(person.getAddress().getCity()).isNull(); assertThat(person.getAddress().getCountry()).isNull(); assertThat(person.getAddress().getPhoneNumbers()).extracting(Phone::getNumber).containsOnlyNulls(); diff --git a/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/nullable/WithNullableAdhocTest.java b/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/nullable/WithNullableAdhocTest.java index 730f6caab..28367da22 100644 --- a/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/nullable/WithNullableAdhocTest.java +++ b/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/nullable/WithNullableAdhocTest.java @@ -71,7 +71,7 @@ void nullableWithSelectorScope() { nullableCountryCode.addAll(phoneNumbers.stream().map(Phone::getCountryCode).collect(toSet())); nullablePhoneNumber.addAll(phoneNumbers.stream().map(Phone::getNumber).collect(toSet())); nonNullableResults.add(person.getName()); - nonNullableResults.add(address.getAddress()); + nonNullableResults.add(address.getStreet()); nonNullableResults.add(address.getCity()); nonNullableResults.add(address.getCountry()); nonNullableResults.addAll(Arrays.stream(person.getPets()).map(Pet::getName).collect(toSet())); diff --git a/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/toscope/ToScopeTest.java b/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/toscope/ToScopeTest.java index a8c717a96..76ef9a1fd 100644 --- a/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/toscope/ToScopeTest.java +++ b/instancio-tests/feature-tests/src/test/java/org/instancio/test/features/toscope/ToScopeTest.java @@ -95,7 +95,7 @@ void verifyToScope(final ConvertibleToScope selector) { } private static void assertExpectedStrings(final Address result) { - assertThat(result.getAddress()).isNotEqualTo(FOO); + assertThat(result.getStreet()).isNotEqualTo(FOO); assertThat(result.getCity()).isNotEqualTo(FOO); assertThat(result.getCountry()).isNotEqualTo(FOO); assertThat(result.getPhoneNumbers()).allSatisfy(phone -> diff --git a/instancio-tests/instancio-core-tests/src/test/java/org/external/errorhandling/AmbiguousAssigmentErrorTest.java b/instancio-tests/instancio-core-tests/src/test/java/org/external/errorhandling/AmbiguousAssigmentErrorTest.java index b5d312b87..498613431 100644 --- a/instancio-tests/instancio-core-tests/src/test/java/org/external/errorhandling/AmbiguousAssigmentErrorTest.java +++ b/instancio-tests/instancio-core-tests/src/test/java/org/external/errorhandling/AmbiguousAssigmentErrorTest.java @@ -51,9 +51,9 @@ String expectedMessage() { -> The origin selector 'all(String)' matches multiple values. It's not clear which of these values should be used: - -> Match 1: field Address.address + -> Match 1: field Address.street - <1:Address: String address> + <1:Address: String street> └──<0:Address> -> Match 2: field Address.city diff --git a/instancio-tests/instancio-core-tests/src/test/java/org/instancio/creation/generics/PersonCreationTest.java b/instancio-tests/instancio-core-tests/src/test/java/org/instancio/creation/generics/PersonCreationTest.java index 068fb8d38..919be8a31 100644 --- a/instancio-tests/instancio-core-tests/src/test/java/org/instancio/creation/generics/PersonCreationTest.java +++ b/instancio-tests/instancio-core-tests/src/test/java/org/instancio/creation/generics/PersonCreationTest.java @@ -39,7 +39,7 @@ protected void verify(Person result) { assertThat(result.getAddress()).isNotNull() .satisfies(address -> { - assertThat(address.getAddress()).isNotBlank(); + assertThat(address.getStreet()).isNotBlank(); assertThat(address.getCity()).isNotBlank(); assertThat(address.getCountry()).isNotBlank(); assertThat(address.getPhoneNumbers()) diff --git a/instancio-tests/instancio-core-tests/src/test/java/org/instancio/internal/nodes/NodeStatsTest.java b/instancio-tests/instancio-core-tests/src/test/java/org/instancio/internal/nodes/NodeStatsTest.java index be5782a2b..48c406c4d 100644 --- a/instancio-tests/instancio-core-tests/src/test/java/org/instancio/internal/nodes/NodeStatsTest.java +++ b/instancio-tests/instancio-core-tests/src/test/java/org/instancio/internal/nodes/NodeStatsTest.java @@ -49,7 +49,7 @@ void person() { ├──<1:Person: UUID uuid; setUuid(UUID)> ├──<1:Person: String name; setName(String)> ├──<1:Person: Address address; setAddress(Address)> - │ ├──<2:Address: String address; setAddress(String)> + │ ├──<2:Address: String street; setStreet(String)> │ ├──<2:Address: String city; setCity(String)> │ ├──<2:Address: String country; setCountry(String)> │ └──<2:Address: List phoneNumbers; setPhoneNumbers(List)> diff --git a/instancio-tests/instancio-core-tests/src/test/java/org/instancio/test/support/asserts/ReflectionAssertTest.java b/instancio-tests/instancio-core-tests/src/test/java/org/instancio/test/support/asserts/ReflectionAssertTest.java index 78ef41588..d4efdb78c 100644 --- a/instancio-tests/instancio-core-tests/src/test/java/org/instancio/test/support/asserts/ReflectionAssertTest.java +++ b/instancio-tests/instancio-core-tests/src/test/java/org/instancio/test/support/asserts/ReflectionAssertTest.java @@ -110,7 +110,7 @@ void isFullyPopulatedMap() { private static Address createAddressFilledWithFoo() { return Address.builder() - .address(FOO) + .street(FOO) .city(FOO) .country(FOO) .phoneNumbers(Arrays.asList( diff --git a/instancio-tests/instancio-test-support/src/main/java/org/instancio/test/support/pojo/person/Address.java b/instancio-tests/instancio-test-support/src/main/java/org/instancio/test/support/pojo/person/Address.java index f7194ad7a..3736e59f6 100644 --- a/instancio-tests/instancio-test-support/src/main/java/org/instancio/test/support/pojo/person/Address.java +++ b/instancio-tests/instancio-test-support/src/main/java/org/instancio/test/support/pojo/person/Address.java @@ -30,7 +30,7 @@ @Builder(toBuilder = true) @Pojo public class Address { - private String address; + private String street; private String city; private String country; private List phoneNumbers;