Adapt tests to MappingException cause when entity creation fails.

See #3045

Author: mp911de

src/test/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jPersistentEntityTests.java

@@ -45,7 +45,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 
 /**
  * @author Gerrit Meier
@@ -608,25 +607,32 @@ class DuplicateProperties {
 
 		@Test
 		void failsOnDuplicatedProperties() {
-			assertThatIllegalStateException()
+			assertThatExceptionOfType(MappingException.class)
 				.isThrownBy(() -> new Neo4jMappingContext().getPersistentEntity(EntityWithDuplicatedProperties.class))
+				.withCauseInstanceOf(IllegalStateException.class)
+				.havingCause()
 				.withMessage("Duplicate definition of property [name] in entity class "
 						+ "org.springframework.data.neo4j.core.mapping.DefaultNeo4jPersistentEntityTests$EntityWithDuplicatedProperties");
 		}
 
 		@Test
 		void failsOnMultipleDuplicatedProperties() {
-			assertThatIllegalStateException().isThrownBy(
-					() -> new Neo4jMappingContext().getPersistentEntity(EntityWithMultipleDuplicatedProperties.class))
+			assertThatExceptionOfType(MappingException.class)
+				.isThrownBy(() -> new Neo4jMappingContext()
+					.getPersistentEntity(EntityWithMultipleDuplicatedProperties.class))
+				.withCauseInstanceOf(IllegalStateException.class)
+				.havingCause()
 				.withMessage("Duplicate definition of properties [foo, name] in entity class "
 						+ "org.springframework.data.neo4j.core.mapping.DefaultNeo4jPersistentEntityTests$EntityWithMultipleDuplicatedProperties");
 		}
 
 		@Test // GH-1903
 		void failsOnMultipleInheritedDuplicatedProperties() {
-			assertThatIllegalStateException()
+			assertThatExceptionOfType(MappingException.class)
 				.isThrownBy(() -> new Neo4jMappingContext()
 					.getPersistentEntity(EntityWithInheritedMultipleDuplicatedProperties.class))
+				.withCauseInstanceOf(IllegalStateException.class)
+				.havingCause()
 				.withMessage("Duplicate definition of property [name] in entity class "
 						+ "org.springframework.data.neo4j.core.mapping.DefaultNeo4jPersistentEntityTests$EntityWithInheritedMultipleDuplicatedProperties");
 		}
@@ -651,8 +657,10 @@ class Relationships {
 		void failsOnDynamicRelationshipsWithExplicitType(Class<?> entityToTest) {
 
 			String expectedMessage = "Dynamic relationships cannot be used with a fixed type\\; omit @Relationship or use @Relationship\\(direction = (OUTGOING|INCOMING)\\) without a type in class .*MixedDynamicAndExplicitRelationship\\d on field dynamicRelationships";
-			assertThatIllegalStateException()
+			assertThatExceptionOfType(MappingException.class)
 				.isThrownBy(() -> new Neo4jMappingContext().getPersistentEntity(entityToTest))
+				.withCauseInstanceOf(IllegalStateException.class)
+				.havingCause()
 				.withMessageMatching(expectedMessage);
 		}
 
@@ -664,7 +672,9 @@ void multipleDynamicAssociationsToTheSameEntityAreNotAllowed(Class<?> entityToTe
 			String expectedMessage = ".*TypeWithInvalidDynamicRelationshipMappings\\d already contains a dynamic relationship to class org\\.springframework\\.data\\.neo4j\\.core\\.mapping\\.Neo4jMappingContextTests\\$BikeNode; only one dynamic relationship between to entities is permitted";
 			Neo4jMappingContext schema = new Neo4jMappingContext();
 			schema.setInitialEntitySet(new HashSet<>(Arrays.asList(entityToTest)));
-			assertThatIllegalStateException().isThrownBy(() -> schema.initialize())
+			assertThatExceptionOfType(MappingException.class).isThrownBy(() -> schema.initialize())
+				.withCauseInstanceOf(IllegalStateException.class)
+				.havingCause()
 				.withMessageMatching(expectedMessage);
 		}
 
@@ -682,6 +692,7 @@ void doesFailOnRelationshipPropertiesWithMissingTargetNode() {
 			assertThatExceptionOfType(MappingException.class)
 				.isThrownBy(() -> new Neo4jMappingContext()
 					.getPersistentEntity(EntityWithInCorrectRelationshipProperties.class))
+				.havingCause()
 				.withMessageContaining("Missing @TargetNode declaration in");
 		}
 
@@ -870,26 +881,32 @@ void shouldDetectValidInheritedDynamicLabels() {
 		@Test
 		void shouldDetectInvalidInheritedDynamicLabels() {
 
-			assertThatIllegalStateException()
+			assertThatExceptionOfType(MappingException.class)
 				.isThrownBy(() -> new Neo4jMappingContext().getPersistentEntity(InvalidInheritedDynamicLabels.class))
+				.withCauseInstanceOf(IllegalStateException.class)
+				.havingCause()
 				.withMessageMatching(
 						"Multiple properties in entity class .*DefaultNeo4jPersistentEntityTests\\$InvalidInheritedDynamicLabels are annotated with @DynamicLabels: \\[dynamicLabels, localDynamicLabels]");
 		}
 
 		@Test
 		void shouldDetectInvalidDynamicLabels() {
 
-			assertThatIllegalStateException()
+			assertThatExceptionOfType(MappingException.class)
 				.isThrownBy(() -> new Neo4jMappingContext().getPersistentEntity(NodeWithInvalidDynamicLabels.class))
+				.withCauseInstanceOf(IllegalStateException.class)
+				.havingCause()
 				.withMessageMatching(
 						"Multiple properties in entity class .*DefaultNeo4jPersistentEntityTests\\$NodeWithInvalidDynamicLabels are annotated with @DynamicLabels: \\[dynamicLabels, moarDynamicLabels]");
 		}
 
 		@Test
 		void shouldDetectInvalidDynamicLabelsTarget() {
 
-			assertThatIllegalStateException()
+			assertThatExceptionOfType(MappingException.class)
 				.isThrownBy(() -> new Neo4jMappingContext().getPersistentEntity(InvalidDynamicLabels.class))
+				.withCauseInstanceOf(IllegalStateException.class)
+				.havingCause()
 				.withMessageMatching(
 						"Property dynamicLabels on class .*DefaultNeo4jPersistentEntityTests\\$InvalidDynamicLabels must extends java\\.util\\.Collection");
 		}
@@ -909,8 +926,10 @@ void validVectorProperties() {
 
 		@Test
 		void invalidVectorProperties() {
-			assertThatIllegalStateException()
+			assertThatExceptionOfType(MappingException.class)
 				.isThrownBy(() -> new Neo4jMappingContext().getPersistentEntity(VectorInvalid.class))
+				.withCauseInstanceOf(IllegalStateException.class)
+				.havingCause()
 				.withMessageContaining(
 						"There are multiple fields of type interface org.springframework.data.domain.Vector in entity org.springframework.data.neo4j.core.mapping.DefaultNeo4jPersistentEntityTests$VectorInvalid:")
 				// the order of properties might be not the same all the time

src/test/java/org/springframework/data/neo4j/core/mapping/Neo4jMappingContextTests.java

@@ -44,6 +44,7 @@
 import org.springframework.core.convert.converter.GenericConverter;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.SimpleAssociationHandler;
 import org.springframework.data.neo4j.config.Neo4jEntityScanner;
 import org.springframework.data.neo4j.core.convert.Neo4jConversionService;
@@ -77,8 +78,8 @@
 import org.springframework.data.neo4j.test.LogbackCapturingExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 
 /**
  * @author Michael J. Simons
@@ -158,7 +159,9 @@ void shouldPreventIllegalIdAnnotations() {
 
 		Neo4jMappingContext schema = new Neo4jMappingContext();
 		schema.setInitialEntitySet(new HashSet<>(Arrays.asList(InvalidId.class)));
-		assertThatIllegalArgumentException().isThrownBy(() -> schema.initialize())
+		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> schema.initialize())
+			.withCauseInstanceOf(IllegalArgumentException.class)
+			.havingCause()
 			.withMessageMatching(
 					"Cannot use internal id strategy with custom property getMappingFunctionFor on entity .*");
 	}
@@ -168,15 +171,19 @@ void shouldPreventIllegalIdTypes() {
 
 		Neo4jMappingContext schema = new Neo4jMappingContext();
 		schema.setInitialEntitySet(new HashSet<>(Arrays.asList(InvalidIdType.class)));
-		assertThatIllegalArgumentException().isThrownBy(schema::initialize)
+		assertThatExceptionOfType(MappingException.class).isThrownBy(schema::initialize)
+			.withCauseInstanceOf(IllegalArgumentException.class)
+			.havingCause()
 			.withMessageMatching("Internally generated ids can only be assigned to one of .*");
 	}
 
 	@Test
 	void missingIdDefinitionShouldRaiseError() {
 
 		Neo4jMappingContext schema = new Neo4jMappingContext();
-		assertThatIllegalStateException().isThrownBy(() -> schema.getPersistentEntity(MissingId.class))
+		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> schema.getPersistentEntity(MissingId.class))
+			.withCauseInstanceOf(IllegalStateException.class)
+			.havingCause()
 			.withMessage("Missing id property on " + MissingId.class);
 	}
 
@@ -383,11 +390,14 @@ void shouldNotOverwriteDiscoveredBaseClassWhenSeeingClassAsGenericPropertyAgain(
 			InvalidMultiDynamics4.class })
 	void shouldDetectAllVariantsOfMultipleDynamicRelationships(Class<?> thingWithRelations) {
 
-		assertThatIllegalStateException().isThrownBy(() -> {
+		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> {
 			Neo4jMappingContext schema = new Neo4jMappingContext();
 			schema.setInitialEntitySet(new HashSet<>(Arrays.asList(TripNode.class, thingWithRelations)));
 			schema.initialize();
-		}).withMessageMatching(".*; only one dynamic relationship between to entities is permitted");
+		})
+			.withCauseInstanceOf(IllegalStateException.class)
+			.havingCause()
+			.withMessageMatching(".*; only one dynamic relationship between to entities is permitted");
 	}
 
 	@ParameterizedTest // GH-2201
@@ -1237,11 +1247,12 @@ class InvalidRelationshipProperties {
 		void startupWithoutInternallyGeneratedIDShouldFail() {
 
 			Neo4jMappingContext schema = new Neo4jMappingContext();
-			assertThatIllegalStateException().isThrownBy(() -> {
+			assertThatExceptionOfType(MappingException.class).isThrownBy(() -> {
 				schema.setInitialEntitySet(new HashSet<>(Arrays.asList(IrrelevantSourceContainer.class,
 						InvalidRelationshipPropertyContainer.class, IrrelevantTargetContainer.class)));
 				schema.initialize();
 			})
+				.havingRootCause()
 				.withMessage(
 						"The class `org.springframework.data.neo4j.core.mapping.Neo4jMappingContextTests$InvalidRelationshipPropertyContainer` for the properties of a relationship is missing a property for the generated, internal ID (`@Id @GeneratedValue Long id` or `@Id @GeneratedValue String id`) which is needed for safely updating properties");
 		}
@@ -1250,11 +1261,12 @@ void startupWithoutInternallyGeneratedIDShouldFail() {
 		void startupWithWrongKindOfGeneratedIDShouldFail() {
 
 			Neo4jMappingContext schema = new Neo4jMappingContext();
-			assertThatIllegalStateException().isThrownBy(() -> {
+			assertThatExceptionOfType(MappingException.class).isThrownBy(() -> {
 				schema.setInitialEntitySet(new HashSet<>(Arrays.asList(IrrelevantSourceContainer3.class,
 						InvalidRelationshipPropertyContainer2.class, IrrelevantTargetContainer.class)));
 				schema.initialize();
 			})
+				.havingRootCause()
 				.withMessage(
 						"The class `org.springframework.data.neo4j.core.mapping.Neo4jMappingContextTests$InvalidRelationshipPropertyContainer2` for the properties of a relationship is missing a property for the generated, internal ID (`@Id @GeneratedValue Long id` or `@Id @GeneratedValue String id`) which is needed for safely updating properties");
 		}