HSEARCH-3920 Clarify that document references in tests expect a type …

…name, not an index name
hibernate · May 19, 2020 · a40f4a5 · a40f4a5
1 parent 103bac6
commit a40f4a5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/...c/main/java/org/hibernate/search/util/impl/integrationtest/common/NormalizationUtils.java b/...c/main/java/org/hibernate/search/util/impl/integrationtest/common/NormalizationUtils.java
@@ -33,8 +33,8 @@ public final class NormalizationUtils {
 	private NormalizationUtils() {
 	}
 
-	public static DocumentReference reference(String indexName, String id) {
-		return new NormalizedDocumentReference( indexName, id );
+	public static DocumentReference reference(String typeName, String id) {
+		return new NormalizedDocumentReference( typeName, id );
 	}
 
 	// The casts will work fine as long as we don't reference subclasses of the normalized classes in our tests

diff --git a/.../org/hibernate/search/util/impl/integrationtest/common/assertion/NormalizedDocRefHit.java b/.../org/hibernate/search/util/impl/integrationtest/common/assertion/NormalizedDocRefHit.java
@@ -21,8 +21,8 @@ public static DocumentReference[] of(Consumer<Builder> contributor) {
 		return builder.build();
 	}
 
-	public static DocumentReference[] of(String indexName, String firstId, String... otherIds) {
-		return of( b -> b.doc( indexName, firstId, otherIds ) );
+	public static DocumentReference[] of(String typeName, String firstId, String... otherIds) {
+		return of( b -> b.doc( typeName, firstId, otherIds ) );
 	}
 
 	private NormalizedDocRefHit() {
@@ -35,10 +35,10 @@ public static class Builder {
 		private Builder() {
 		}
 
-		public Builder doc(String indexName, String firstId, String... otherIds) {
-			expectedHits.add( NormalizationUtils.reference( indexName, firstId ) );
+		public Builder doc(String typeName, String firstId, String... otherIds) {
+			expectedHits.add( NormalizationUtils.reference( typeName, firstId ) );
 			for ( String id : otherIds ) {
-				expectedHits.add( NormalizationUtils.reference( indexName, id ) );
+				expectedHits.add( NormalizationUtils.reference( typeName, id ) );
 			}
 			return this;
 		}

diff --git a/...java/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchHitAssert.java b/...java/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchHitAssert.java
@@ -28,11 +28,11 @@ public SearchHitAssert<H> as(String description) {
 		return this;
 	}
 
-	public void isDocRefHit(String indexName, String id, String... orIds) {
+	public void isDocRefHit(String typeName, String id, String... orIds) {
 		Set<DocumentReference> references = new HashSet<>();
-		references.add( NormalizationUtils.reference( indexName, id ) );
+		references.add( NormalizationUtils.reference( typeName, id ) );
 		for ( String orId : orIds ) {
-			references.add( NormalizationUtils.reference( indexName, orId ) );
+			references.add( NormalizationUtils.reference( typeName, orId ) );
 		}
 
 		DocumentReference actualReference = NormalizationUtils.normalize( (DocumentReference) actual );

diff --git a/...ava/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchHitsAssert.java b/...ava/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchHitsAssert.java
@@ -93,15 +93,15 @@ public final SearchHitsAssert<H> hasHitsAnyOrder(Collection<H> hits) {
 		return hasHitsAnyOrder( (H[]) hits.toArray() );
 	}
 
-	public SearchHitsAssert<H> hasDocRefHitsExactOrder(String indexName, String firstId, String... otherIds) {
+	public SearchHitsAssert<H> hasDocRefHitsExactOrder(String typeName, String firstId, String... otherIds) {
 		return hasDocRefHitsExactOrder( ctx -> {
-			ctx.doc( indexName, firstId, otherIds );
+			ctx.doc( typeName, firstId, otherIds );
 		} );
 	}
 
-	public SearchHitsAssert<H> hasDocRefHitsAnyOrder(String indexName, String firstId, String... otherIds) {
+	public SearchHitsAssert<H> hasDocRefHitsAnyOrder(String typeName, String firstId, String... otherIds) {
 		return hasDocRefHitsAnyOrder( ctx -> {
-			ctx.doc( indexName, firstId, otherIds );
+			ctx.doc( typeName, firstId, otherIds );
 		} );
 	}
 

diff --git a/...a/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchResultAssert.java b/...a/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchResultAssert.java
@@ -94,13 +94,13 @@ public final SearchResultAssert<H> hasHitsAnyOrder(Collection<H> hits) {
 		return this;
 	}
 
-	public SearchResultAssert<H> hasDocRefHitsExactOrder(String indexName, String firstId, String... otherIds) {
-		hits().hasDocRefHitsExactOrder( indexName, firstId, otherIds );
+	public SearchResultAssert<H> hasDocRefHitsExactOrder(String typeName, String firstId, String... otherIds) {
+		hits().hasDocRefHitsExactOrder( typeName, firstId, otherIds );
 		return this;
 	}
 
-	public SearchResultAssert<H> hasDocRefHitsAnyOrder(String indexName, String firstId, String... otherIds) {
-		hits().hasDocRefHitsAnyOrder( indexName, firstId, otherIds );
+	public SearchResultAssert<H> hasDocRefHitsAnyOrder(String typeName, String firstId, String... otherIds) {
+		hits().hasDocRefHitsAnyOrder( typeName, firstId, otherIds );
 		return this;
 	}