Skip to content

Commit 31353d6

Browse files
ctruedenctrueden
committed
Do not export any scijava-ops-engine API
Nothing needs to consume it right now.
1 parent 5168251 commit 31353d6

5 files changed

Lines changed: 12 additions & 27 deletions

File tree

‎scijava-ops-engine/src/main/java/module-info.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
*/
3434

3535
module org.scijava.ops.engine {
36-
37-
exports org.scijava.ops.engine;
38-
exports org.scijava.ops.engine.conversionLoss;
39-
exports org.scijava.ops.engine.util;
40-
4136
requires java.compiler;
4237

4338
requires org.scijava.common3;
@@ -57,7 +52,6 @@
5752
requires org.slf4j;
5853
requires org.yaml.snakeyaml;
5954

60-
6155
uses javax.annotation.processing.Processor;
6256
uses org.scijava.discovery.Discoverer;
6357
uses org.scijava.ops.engine.InfoTreeGenerator;

‎scijava-ops-engine/templates/main/java/module-info.vm‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
*/
55

66
module org.scijava.ops.engine {
7-
8-
exports org.scijava.ops.engine;
9-
exports org.scijava.ops.engine.conversionLoss;
10-
exports org.scijava.ops.engine.util;
11-
127
requires java.compiler;
138

149
requires org.scijava.common3;
@@ -28,7 +23,6 @@ module org.scijava.ops.engine {
2823
requires org.slf4j;
2924
requires org.yaml.snakeyaml;
3025

31-
3226
uses javax.annotation.processing.Processor;
3327
uses org.scijava.discovery.Discoverer;
3428
uses org.scijava.ops.engine.InfoTreeGenerator;

‎scijava-ops-image/src/test/java/org/scijava/ops/image/AbstractOpTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
import org.scijava.ops.api.Hints;
3636
import org.scijava.ops.api.OpEnvironment;
37-
import org.scijava.ops.engine.BaseOpHints;
3837
import org.scijava.ops.spi.Op;
3938

4039
import io.scif.img.IO;
@@ -67,7 +66,7 @@ public abstract class AbstractOpTest {
6766
protected static final OpEnvironment ops = OpEnvironment.build();
6867

6968
static {
70-
ops.setDefaultHints(new Hints(BaseOpHints.Progress.TRACK));
69+
ops.setDefaultHints(new Hints("progress.TRACK"));
7170
}
7271

7372
private int seed;

‎scijava-ops-image/src/test/java/org/scijava/ops/image/math/BinaryNumericTypeMathTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.scijava.ops.image.AbstractOpTest;
3535
import net.imglib2.type.numeric.integer.IntType;
3636
import org.junit.jupiter.api.Test;
37-
import org.scijava.ops.engine.math.MathOps;
3837

3938
/**
4039
* Tests {@link BinaryNumericTypeMath}.
@@ -54,7 +53,7 @@ public class BinaryNumericTypeMathTest extends AbstractOpTest {
5453
public void testAdd() {
5554
IntType e = A.copy();
5655
e.add(B);
57-
test(MathOps.ADD, e.get());
56+
test("math.add", e.get());
5857
}
5958

6059
// SUB
@@ -63,7 +62,7 @@ public void testAdd() {
6362
public void testSub() {
6463
IntType e = A.copy();
6564
e.sub(B);
66-
test(MathOps.SUB, e.get());
65+
test("math.sub", e.get());
6766
}
6867

6968
// DIV
@@ -72,7 +71,7 @@ public void testSub() {
7271
public void testDiv() {
7372
IntType e = A.copy();
7473
e.div(B);
75-
test(MathOps.DIV, e.get());
74+
test("math.div", e.get());
7675
}
7776

7877
// MUL
@@ -81,7 +80,7 @@ public void testDiv() {
8180
public void testMul() {
8281
IntType e = A.copy();
8382
e.mul(B);
84-
test(MathOps.MUL, e.get());
83+
test("math.mul", e.get());
8584
}
8685

8786
// POW
@@ -90,7 +89,7 @@ public void testMul() {
9089
public void testPow() {
9190
IntType e = A.copy();
9291
e.pow(B);
93-
test(MathOps.POW, e.get());
92+
test("math.pow", e.get());
9493
}
9594

9695
// -- Helpers --

‎scijava-ops-image/src/test/java/org/scijava/ops/image/math/BinaryRealTypeMathTest.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import net.imglib2.type.numeric.integer.IntType;
3434
import net.imglib2.type.numeric.real.DoubleType;
3535
import org.junit.jupiter.api.Test;
36-
import org.scijava.ops.engine.math.MathOps;
3736

3837
import static org.junit.jupiter.api.Assertions.assertEquals;
3938

@@ -55,7 +54,7 @@ public class BinaryRealTypeMathTest extends AbstractOpTest {
5554
public void testAdd() {
5655
DoubleType e = A.copy();
5756
e.set(e.get() + B.get());
58-
test(MathOps.ADD, e.get());
57+
test("math.add", e.get());
5958
}
6059

6160
// SUB
@@ -64,7 +63,7 @@ public void testAdd() {
6463
public void testSub() {
6564
DoubleType e = A.copy();
6665
e.set(e.get() - B.get());
67-
test(MathOps.SUB, e.get());
66+
test("math.sub", e.get());
6867
}
6968

7069
// DIV
@@ -73,7 +72,7 @@ public void testSub() {
7372
public void testDiv() {
7473
DoubleType e = A.copy();
7574
e.set(e.get() / B.get());
76-
test(MathOps.DIV, e.get());
75+
test("math.div", e.get());
7776
}
7877

7978
// MUL
@@ -82,7 +81,7 @@ public void testDiv() {
8281
public void testMul() {
8382
DoubleType e = A.copy();
8483
e.set(e.get() * B.get());
85-
test(MathOps.MUL, e.get());
84+
test("math.mul", e.get());
8685
}
8786

8887
// POW
@@ -91,14 +90,14 @@ public void testMul() {
9190
public void testPow() {
9291
DoubleType e = A.copy();
9392
e.set(Math.pow(e.get(), B.get()));
94-
test(MathOps.POW, e.get());
93+
test("math.pow", e.get());
9594
}
9695

9796
// MOD
9897

9998
@Test
10099
public void testMod() {
101-
test(MathOps.MOD, A.get() % B.get());
100+
test("math.mod", A.get() % B.get());
102101
}
103102

104103
// OR

0 commit comments

Comments
 (0)