Remove ugly casts in ProvenanceTest

gselzer · ctrueden · commit f9cbd53b4cc5 · 2021-11-19T22:29:07.000-06:00
We can use the OpHistory for this!
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpHistory.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpHistory.java
@@ -45,6 +45,10 @@ public interface OpHistory {
 	 */
 	InfoChain opExecutionChain(Object op);
 
+	default String signatureOf(Object op) {
+		return opExecutionChain(op).signature();
+	}
+
 	// -- HISTORY MAINTENANCE API -- //
 
 	/**
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
@@ -195,10 +195,8 @@ public void testOpWithDependencyRecoveryFromString() {
 	@Test
 	public void testAdaptationRecoveryFromString() {
 		Function<Double[], Thing[]> f = ops.op("test.provenanceMapped").inType(Double[].class).outType(Thing[].class).function();
+		String signature = ops.history().signatureOf(f);
 		Thing[] apply = f.apply(new Double[] {1., 2., 3.});
-		@SuppressWarnings("unchecked")
-		InfoChain chain = ((RichOp<Function<Double[], Thing[]>>) f).infoChain();
-		String signature = chain.signature();
 		Nil<Function<Double[], Thing[]>> special = new Nil<>() {};
 		Nil<Double[]> inType = Nil.of(Double[].class);
 		Nil<Thing[]> outType = Nil.of(Thing[].class);
@@ -209,9 +207,7 @@ public void testAdaptationRecoveryFromString() {
 	@Test
 	public void testAdaptedOpWithDependencies() {
 		Function<Double[][], Thing[]> f = ops.op("test.provenanceMapper").inType(Double[][].class).outType(Thing[].class).function();
-		@SuppressWarnings("unchecked")
-		InfoChain chain = ((RichOp<Function<Double[], Thing[]>>) f).infoChain();
-		String signature = chain.signature();
+		String signature = ops.history().signatureOf(f);
 		Nil<Function<Double[][], Thing[]>> special = new Nil<>() {};
 		Nil<Double[][]> inType = Nil.of(Double[][].class);
 		Nil<Thing[]> outType = Nil.of(Thing[].class);
@@ -222,9 +218,7 @@ public void testAdaptedOpWithDependencies() {
 	@Test
 	public void testSimplificationRecovery() {
 		Computers.Arity1<Integer[], Integer[]> c = ops.op("test.provenanceComputer").inType(Integer[].class).outType(Integer[].class).computer();
-		@SuppressWarnings("unchecked")
-		InfoChain chain = ((RichOp<Computers.Arity1<Double[], Double[]>>) c).infoChain();
-		String signature = chain.signature();
+		String signature = ops.history().signatureOf(c);
 		Nil<Computers.Arity1<Integer[], Integer[]>> special = new Nil<>() {};
 		Nil<Integer[]> inType = Nil.of(Integer[].class);
 		Nil<Integer[]> outType = Nil.of(Integer[].class);
@@ -239,9 +233,7 @@ public void testSimplificationRecovery() {
 	@Test
 	public void testSimplificationAdaptationRecovery() {
 		Function<Integer[], Integer[]> c = ops.op("test.provenanceComputer").inType(Integer[].class).outType(Integer[].class).function();
-		@SuppressWarnings("unchecked")
-		InfoChain chain = ((RichOp<Function<Double[], Double[]>>) c).infoChain();
-		String signature = chain.signature();
+		String signature = ops.history().signatureOf(c);
 		Nil<Function<Integer[], Integer[]>> special = new Nil<>() {};
 		Nil<Integer[]> inType = Nil.of(Integer[].class);
 		Nil<Integer[]> outType = Nil.of(Integer[].class);
