replace tests

Author: schauder

spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/ColumnInfosUnitTests.java

@@ -26,39 +26,41 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.relational.core.sql.SqlIdentifier;
+import org.springframework.data.relational.core.sql.Table;
 
 /**
  * Unit tests for the construction of {@link org.springframework.data.relational.core.mapping.AggregatePath.ColumnInfos}
- * 
+ *
  * @author Jens Schauder
  */
 class ColumnInfosUnitTests {
 
+	static final Table TABLE = Table.create("dummy");
 	static final SqlIdentifier ID = SqlIdentifier.quoted("ID");
 	RelationalMappingContext context = new RelationalMappingContext();
 
-	@Test // GH-574
+	@Test
+		// GH-574
 	void emptyColumnInfos() {
 
 		AggregatePath.ColumnInfos columnInfos = AggregatePath.ColumnInfos.empty(basePath(DummyEntity.class));
 
 		assertThat(columnInfos.isEmpty()).isTrue();
 		assertThrows(NoSuchElementException.class, columnInfos::any);
 		assertThrows(IllegalStateException.class, columnInfos::unique);
-		assertThat(columnInfos.toList(ci -> {
-			throw new IllegalStateException("This should never get called");
-		})).isEmpty();
+		assertThat(columnInfos.toColumnList(TABLE)).isEmpty();
 	}
 
-	@Test // GH-574
+	@Test
+		// GH-574
 	void singleElementColumnInfos() {
 
 		AggregatePath.ColumnInfos columnInfos = basePath(DummyEntity.class).getTableInfo().idColumnInfos();
 
 		assertThat(columnInfos.isEmpty()).isFalse();
 		assertThat(columnInfos.any().name()).isEqualTo(ID);
 		assertThat(columnInfos.unique().name()).isEqualTo(ID);
-		assertThat(columnInfos.toList(ci -> ci.name())).containsExactly(ID);
+		assertThat(columnInfos.toColumnList(TABLE)).containsExactly(TABLE.column(ID));
 	}
 
 	@Test // GH-574
@@ -69,10 +71,10 @@ void multiElementColumnInfos() {
 		assertThat(columnInfos.isEmpty()).isFalse();
 		assertThat(columnInfos.any().name()).isEqualTo(SqlIdentifier.quoted("ONE"));
 		assertThrows(IllegalStateException.class, columnInfos::unique);
-		assertThat(columnInfos.toList(ci -> ci.name())) //
+		assertThat(columnInfos.toColumnList(TABLE)) //
 				.containsExactly( //
-						SqlIdentifier.quoted("ONE"), //
-						SqlIdentifier.quoted("TWO") //
+						TABLE.column(SqlIdentifier.quoted("ONE")), //
+						TABLE.column(SqlIdentifier.quoted("TWO")) //
 				);
 
 		List<String> collector = new ArrayList<>();

spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/DefaultAggregatePathUnitTests.java

@@ -30,7 +30,9 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.ReadOnlyProperty;
 import org.springframework.data.mapping.PersistentPropertyPath;
+import org.springframework.data.relational.core.sql.Column;
 import org.springframework.data.relational.core.sql.SqlIdentifier;
+import org.springframework.data.relational.core.sql.Table;
 
 /**
  * Tests for {@link AggregatePath}.
@@ -147,8 +149,8 @@ void reverseColumnName() {
 	void reverseColumnNames() {
 
 		assertSoftly(softly -> {
-			softly.assertThat(path(CompoundIdEntity.class, "second").getTableInfo().backReferenceColumnInfos().toList(x -> x))
-					.extracting(AggregatePath.ColumnInfo::name)
+			softly.assertThat(path(CompoundIdEntity.class, "second").getTableInfo().backReferenceColumnInfos().toColumnList(Table.create("dummy")))
+					.extracting(Column::getName)
 					.containsExactlyInAnyOrder(quoted("COMPOUND_ID_ENTITY_ONE"), quoted("COMPOUND_ID_ENTITY_TWO"));
 
 		});