Commit a79c630

committed

Adapt tests to MappingException cause when entity creation fails.

Closes #1602

1 parent 0ec97e3 commit a79c630Copy full SHA for a79c630

File tree

3 files changed

-4

lines changed

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping

3 files changed

-4

lines changed

`‎spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleEntityUnitTests.java‎`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,21 +64,22 @@ void shouldCreateElementsInOrder() {`
`64`	`64`	`void shouldReportDuplicateMappings() {`
`65`	`65`
`66`	`66`	`assertThatThrownBy(() -> this.mappingContext.getRequiredPersistentEntity(DuplicateElement.class))`
`67`		`- .isInstanceOf(MappingException.class).hasMessageContaining("Duplicate ordinal [0]");`
	`67`	`+ .isInstanceOf(MappingException.class).cause().hasMessageContaining("Duplicate ordinal [0]");`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@Test // DATACASS-523`
`71`	`71`	`void shouldReportMissingOrdinalMappings() {`
`72`	`72`
`73`	`73`	`assertThatThrownBy(() -> this.mappingContext.getRequiredPersistentEntity(MissingElementOrdinals.class))`
`74`		`- .isInstanceOf(MappingException.class).hasMessageContaining("Mapped tuple has no")`
	`74`	`+ .isInstanceOf(MappingException.class).rootCause().hasMessageContaining("Mapped tuple has no")`
`75`	`75`	`.hasMessageContaining("for ordinal(s): 0");`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@Test // DATACASS-523`
`79`	`79`	`void shouldReportNegativeOrdinalIndex() {`
`80`	`80`
`81`	`81`	`assertThatThrownBy(() -> this.mappingContext.getRequiredPersistentEntity(NegativeIndex.class))`
	`82`	`+ .rootCause()`
`82`	`83`	`.isInstanceOf(IllegalArgumentException.class)`
`83`	`84`	`.hasMessageContaining("Element ordinal must be greater or equal to zero for property [street] in entity");`
`84`	`85`	`}`
`@@ -88,6 +89,7 @@ void shouldReportNoElements() {`
`88`	`89`
`89`	`90`	`assertThatThrownBy(() -> this.mappingContext.getRequiredPersistentEntity(NoElements.class))`
`90`	`91`	`.isInstanceOf(MappingException.class)`
	`92`	`+ .rootCause()`
`91`	`93`	`.hasMessageContaining("Mapped tuple contains no persistent elements annotated");`
`92`	`94`	`}`
`93`	`95`
`@@ -96,6 +98,7 @@ void shouldReportMissingAnnotations() {`
`96`	`98`
`97`	`99`	`assertThatThrownBy(() -> this.mappingContext.getRequiredPersistentEntity(MissingAnnotation.class))`
`98`	`100`	`.isInstanceOf(MappingException.class)`
	`101`	`+ .cause()`
`99`	`102`	`.hasMessageContaining("Missing @Element annotation in mapped tuple type for property [street]");`
`100`	`103`	`}`
`101`	`104`

`‎spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ void shouldNotRetainInvalidEntitiesInCache() {`
`365`	`365`	`mappingContext.getPersistentEntity(InvalidEntityWithIdAndPrimaryKeyColumn.class);`
`366`	`366`	`fail("Missing MappingException");`
`367`	`367`	`} catch (MappingException e) {`
`368`		`- assertThat(e).isInstanceOf(VerifierMappingExceptions.class);`
	`368`	`+ assertThat(e).hasCauseInstanceOf(VerifierMappingExceptions.class);`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`assertThat(mappingContext.getUserDefinedTypeEntities()).isEmpty();`

`‎spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ void shouldFailWithPersistentAndPrimaryKeyClassAnnotations() {`
`67`	`67`	`verifier.verify(context.getRequiredPersistentEntity(TooManyAnnotations.class));`
`68`	`68`	`fail("Missing MappingException");`
`69`	`69`	`} catch (MappingException e) {`
`70`		`- assertThat(e).hasMessageContaining("Entity cannot be of type @Table and @PrimaryKeydiff-2df5d87867474c8e4f8f0aab4afd855960b663c917102474128fa27c5c2a9f87-70-70-0" data-selected="false" role="gridcell" tabindex="-1">`	`70`	`+ assertThat(e).cause().hasMessageContaining("Entity cannot be of type @Table and @PrimaryKeyClass");`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a79c630

File tree

3 files changed

3 files changed

`‎spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleEntityUnitTests.java‎`

`‎spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java‎`

`‎spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java‎`

0 commit comments