GH-2526 - Extend test case.

Author: meistermeier

src/test/java/org/springframework/data/neo4j/integration/issues/gh2526/GH2526IT.java

@@ -56,6 +56,8 @@
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+import static org.assertj.core.api.InstanceOfAssertFactories.collection;
 
 /**
  * Test setup for GH-2526: Query creation of and picking the correct named relationship out of the result.
@@ -81,16 +83,29 @@ void setupData(@Autowired Driver driver, @Autowired BookmarkCapture bookmarkCapt
 
 	@Test
 	void relationshipWillGetFoundInResultOfMultilevelInheritance(@Autowired BaseNodeRepository repository) {
-		Projection m = repository.findByNodeId("acc1", Projection.class);
+		MeasurementProjection m = repository.findByNodeId("acc1", MeasurementProjection.class);
 		assertThat(m).isNotNull();
 		assertThat(m.getDataPoints()).isNotEmpty();
+		assertThat(m).extracting(MeasurementProjection::getDataPoints, collection(DataPoint.class))
+				.extracting(DataPoint::isManual, DataPoint::getMeasurand).contains(tuple(true, new Measurand("o1")));
 	}
 
-	interface Projection {
+	interface BaseNodeFieldsProjection{
 		String getNodeId();
+	}
+
+
+	interface MeasurementProjection extends BaseNodeFieldsProjection {
 		Set<DataPoint> getDataPoints();
+		Set<VariableProjection> getVariables();
 	}
 
+	interface VariableProjection {
+		BaseNodeFieldsProjection getMeasurement();
+		String getVariable();
+	}
+
+
 	/**
 	 * Defining most concrete entity
 	 */
@@ -155,6 +170,34 @@ public static class MeasurementMeta extends BaseNodeEntity {
 
 		@Relationship(type = "IS_MEASURED_BY", direction = Relationship.Direction.INCOMING)
 		private Set<DataPoint> dataPoints;
+
+		@Relationship(type = "USES", direction = Relationship.Direction.OUTGOING)
+		private Set<Variable> variables;
+	}
+
+	@RelationshipProperties
+	@Value
+	@With
+	@AllArgsConstructor
+	@EqualsAndHashCode
+	@Immutable
+	public static class Variable {
+		@RelationshipId
+		Long id;
+
+		@TargetNode
+		MeasurementMeta measurement;
+
+		String variable;
+
+		public static Variable create(MeasurementMeta measurement, String variable) {
+			return new Variable(null, measurement, variable);
+		}
+
+		@Override
+		public String toString() {
+			return variable + ": " + measurement.getNodeId();
+		}
 	}
 
 	/**