Extract No Ops message to constant

hinerm · hinerm · commit e606181e26d7 · 2024-04-22T17:07:21.000-05:00
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDescriptionGenerator.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDescriptionGenerator.java
@@ -44,6 +44,9 @@ public interface OpDescriptionGenerator extends
 	Prioritized<OpDescriptionGenerator>
 {
 
+	public static final String NO_OP_MATCHES =
+		"No Ops found matching this request.";
+
 	/**
 	 * Returns a {@link String} with a "simple" description for each Op in
 	 * {@code env} matching {@code request}.
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpDescriptionGenerator.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpDescriptionGenerator.java
@@ -94,7 +94,7 @@ private static String buildOpString(OpRequest req, OpEnvironment env,
 			.map(s -> s.replaceAll("\n", "\n\t")) //
 			.distinct() //
 			.collect(Collectors.joining("\n\t- "));
-		if (opString.isEmpty()) return "No Ops found matching this request.";
+		if (opString.isEmpty()) return NO_OP_MATCHES;
 		return req.getName() + ":\n\t- " + opString;
 	}
 
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
@@ -122,7 +122,7 @@ public void testHelpVerboseNotFound() {
 		OpEnvironment helpEnv = makeHelpEnv("help.verbose1", "help.verbose2");
 		// Finally assert a message is thrown when no Ops match
 		String descriptions = helpEnv.op("help.verbose1").input(null).helpVerbose();
-		String expected = "No Ops found matching this request.";
+		String expected = OpDescriptionGenerator.NO_OP_MATCHES;
 		Assertions.assertEquals(expected, descriptions);
 	}
 
diff --git a/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/DefaultOpDescriptionGeneratorTest.java b/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/DefaultOpDescriptionGeneratorTest.java
@@ -36,6 +36,7 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpDescriptionGenerator;
 import org.scijava.ops.engine.describe.BaseDescriptors;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
@@ -115,7 +116,7 @@ public void testCoalescedDescriptions() {
 		Assertions.assertEquals(expected, actual);
 		// Finally test that with no inputs we don't get any of the Ops
 		actual = ops.op("test.coalesceDescription").output(null).help();
-		expected = "No Ops found matching this request.";
+		expected = OpDescriptionGenerator.NO_OP_MATCHES;
 		Assertions.assertEquals(expected, actual);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ public interface OpDescriptionGenerator extends`
`44`	`44`	`Prioritized<OpDescriptionGenerator>`
`45`	`45`	`{`
`46`	`46`
	`47`	`+ public static final String NO_OP_MATCHES =`
	`48`	`+ "No Ops found matching this request.";`
	`49`	`+`
`47`	`50`	`/**`
`48`	`51`	`* Returns a {@link String} with a "simple" description for each Op in`
`49`	`52`	`* {@code env} matching {@code request}.`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private static String buildOpString(OpRequest req, OpEnvironment env,`
`94`	`94`	`.map(s -> s.replaceAll("\n", "\n\t")) //`
`95`	`95`	`.distinct() //`
`96`	`96`	`.collect(Collectors.joining("\n\t- "));`
`97`		`- if (opString.isEmpty()) return "No Ops found matching this request.";`
	`97`	`+ if (opString.isEmpty()) return NO_OP_MATCHES;`
`98`	`98`	`return req.getName() + ":\n\t- " + opString;`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public void testHelpVerboseNotFound() {`
`122`	`122`	`OpEnvironment helpEnv = makeHelpEnv("help.verbose1", "help.verbose2");`
`123`	`123`	`// Finally assert a message is thrown when no Ops match`
`124`	`124`	`String descriptions = helpEnv.op("help.verbose1").input(null).helpVerbose();`
`125`		`- String expected = "No Ops found matching this request.";`
	`125`	`+ String expected = OpDescriptionGenerator.NO_OP_MATCHES;`
`126`	`126`	`Assertions.assertEquals(expected, descriptions);`
`127`	`127`	`}`
`128`	`128`