Minor test refactoring

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();

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 -> {

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();

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()));

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 ->

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

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())

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<Phone> phoneNumbers; setPhoneNumbers(List<Phone>)>

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(

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<Phone> phoneNumbers;