Fix priority bug

gselzer · ctrueden · commit e3ef2a02541d · 2019-06-11T12:22:51.000-05:00
The matcher was sorting ops from lowest to highest priority, which is
flipped. We want highest to lowest priority, which is how it now works.
diff --git a/src/main/java/org/scijava/ops/matcher/DefaultOpTypeMatchingService.java b/src/main/java/org/scijava/ops/matcher/DefaultOpTypeMatchingService.java
@@ -113,7 +113,7 @@ public List<OpCandidate> filterMatches(final List<OpCandidate> candidates) {
 		// List of valid candidates needs to be sorted according to priority.
 		// This is used as an optimization in order to not look at ops with
 		// lower priority than the already found one.
-		validCandidates.sort((c1, c2) -> Double.compare(c1.opInfo().priority(), c2.opInfo().priority()));
+		validCandidates.sort((c1, c2) -> Double.compare(c2.opInfo().priority(), c1.opInfo().priority()));
 
 		List<OpCandidate> matches;
 		matches = filterMatches(validCandidates, (cand) -> typesPerfectMatch(cand));
diff --git a/src/test/java/org/scijava/ops/OpPriorityTest.java b/src/test/java/org/scijava/ops/OpPriorityTest.java
@@ -29,13 +29,39 @@
 
 package org.scijava.ops;
 import static org.junit.Assert.assertTrue;
+
 import java.util.function.BiFunction;
 
 import org.junit.Test;
-import org.scijava.param.ValidityException;
+import org.scijava.core.Priority;
+import org.scijava.ops.core.Op;
+import org.scijava.ops.core.Source;
 import org.scijava.ops.types.Nil;
+import org.scijava.param.Parameter;
+import org.scijava.param.ValidityException;
+import org.scijava.plugin.Plugin;
+import org.scijava.struct.ItemIO;
 
 public class OpPriorityTest extends AbstractTestEnvironment {
+	
+	@Plugin(type = Op.class, name = "test.priority", priority = Priority.HIGH)
+	@Parameter(key = "result", type = ItemIO.OUTPUT)
+	private static final class testDouble implements Source<Number>{
+		@Override
+		public Number create() {
+			return new Double(0.0);
+		}
+	}
+
+	@Plugin(type = Op.class, name = "test.priority", priority = Priority.LOW)
+	@Parameter(key = "result", type = ItemIO.OUTPUT)
+	private static final class testFloat implements Source<Number>{
+		@Override
+		public Number create() {
+			return new Float(0.0);
+		}
+	}
+	
 
 	Nil<Double> nilDouble = new Nil<Double>() {
 	};
@@ -52,4 +78,12 @@ public void testOpCollection() throws ValidityException {
 		// The found op is assumed to come from the MathOpCollection
 		assertTrue(divFunction.getClass().getName().contains("MathOpCollection$$Lambda"));
 	}
+	
+	@Test
+	public void testOpPriority() {
+
+		Source<Number> testFunc = ops().findOp("test.priority", new Nil<Source<Number>>() {}, new Nil[] {}, new Nil<Number>() {});
+		Number x = testFunc.create();
+		assertTrue(x instanceof Double);
+	}
 }
