Add second test OpifyOp

hinerm · hinerm · commit 8c78030877ec · 2024-01-19T12:52:18.000-06:00
Since aliases are no longer returned in help text, many of these tests
require two separate classes to be registered in a bare op environment.
diff --git a/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpEnvironmentTest.java b/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpEnvironmentTest.java
@@ -47,29 +47,29 @@ public class OpEnvironmentTest extends AbstractTestEnvironment {
 
 	@Test
 	public void testClassOpification() {
-		OpInfo opifyOpInfo = ops.opify(OpifyOp.class, OpifyOp.class.getName());
-		Assertions.assertEquals(OpifyOp.class.getName(), opifyOpInfo.implementationName());
+		OpInfo opifyOpInfo = ops.opify(OpifyOp1.class, OpifyOp1.class.getName());
+		Assertions.assertEquals(OpifyOp1.class.getName(), opifyOpInfo.implementationName());
 		// assert default priority
 		Assertions.assertEquals(Priority.NORMAL, opifyOpInfo.priority(), 0.);
 	}
 
 	@Test
 	public void testClassOpificationWithPriority() {
-		OpInfo opifyOpInfo = ops.opify(OpifyOp.class, Priority.HIGH, OpifyOp.class.getName());
-		Assertions.assertEquals(OpifyOp.class.getName(), opifyOpInfo.implementationName());
+		OpInfo opifyOpInfo = ops.opify(OpifyOp1.class, Priority.HIGH, OpifyOp1.class.getName());
+		Assertions.assertEquals(OpifyOp1.class.getName(), opifyOpInfo.implementationName());
 		// assert default priority
 		Assertions.assertEquals(Priority.HIGH, opifyOpInfo.priority(), 0.);
 	}
 
 	@Test
 	public void testRegister() {
 		String opName = "test.opifyOp";
-		OpInfo opifyOpInfo = ops.opify(OpifyOp.class, Priority.HIGH, opName);
+		OpInfo opifyOpInfo = ops.opify(OpifyOp1.class, Priority.HIGH, opName);
 		ops.register(opifyOpInfo);
 
 		String actual = ops.op(opName).arity0().outType(String.class).create();
 
-		String expected = new OpifyOp().getString();
+		String expected = new OpifyOp1().getString();
 		Assertions.assertEquals(expected, actual);
 	}
 
@@ -99,7 +99,7 @@ public void testHelpVerboseOp() {
 
 		// Get the Op matching the description
 		String descriptions = helpEnv.helpVerbose("help.verbose1");
-		String expected = "help.verbose1:\n\t- org.scijava.ops.engine.OpifyOp\n\t\tReturns : java.lang.String\nKey: *=container, ^=mutable";
+		String expected = "help.verbose1:\n\t- org.scijava.ops.engine.OpifyOp1\n\t\tReturns : java.lang.String\nKey: *=container, ^=mutable";
 		Assertions.assertEquals(expected, descriptions);
 	}
 
@@ -125,26 +125,24 @@ public void testInternalNamespaceHelp() {
 		Assertions.assertEquals(expected, actual);
 	}
 
-	private OpEnvironment makeHelpEnv(String... names) {
+	private OpEnvironment makeHelpEnv(String n1, String n2) {
 		// NB We use a new OpEnvironment here for a clean list of Ops.
 		OpEnvironment helpEnv = barebonesEnvironment();
 		// Register an Op under an "internal" namespace and an "external" namespace
 		helpEnv.register( //
-				helpEnv.opify(OpifyOp.class, Priority.HIGH, names) //
+				helpEnv.opify(OpifyOp1.class, Priority.HIGH, n1) //
+		);
+		helpEnv.register( //
+				helpEnv.opify(OpifyOp2.class, Priority.HIGH, n2) //
 		);
 		return helpEnv;
 	}
 
 }
 
-/**
- * Test class to be opified (and added to the {@link OpEnvironment})
- *
- * TODO: remove @Parameter annotation when it is no longer necessary
- *
- * @author Gabriel Selzer
- */
-class OpifyOp implements Producer<String> {
+// -- Test classes to be registered --
+
+class OpifyOp1 implements Producer<String> {
 
 	@Override
 	public String create() {
@@ -156,3 +154,11 @@ public String getString() {
 	}
 
 }
+
+class OpifyOp2 implements Producer<String> {
+
+	@Override
+	public String create() { return getString(); }
+
+	public String getString() { return "This Op tests opify!"; }
+}
