Skip to content

Commit 1cc7a10

Browse files
gselzergselzer
committed
Fix Boolean Logic Tests
1 parent 71c4261 commit 1cc7a10

2 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎src/main/java/net/imagej/ops/create/Creators.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import net.imglib2.img.array.ArrayImgFactory;
2626
import net.imglib2.roi.labeling.ImgLabeling;
2727
import net.imglib2.roi.labeling.LabelingMapping;
28+
import net.imglib2.type.BooleanType;
2829
import net.imglib2.type.NativeType;
2930
import net.imglib2.type.Type;
3031
import net.imglib2.type.logic.BitType;
@@ -57,7 +58,7 @@
5758
import org.scijava.struct.ItemIO;
5859

5960
@Plugin(type = OpCollection.class)
60-
public class Creators<N extends NativeType<N>, L, I extends IntegerType<I>, T extends Type<T>, C extends ComplexType<C>, W extends ComplexType<W> & NativeType<W>> {
61+
public class Creators<N extends NativeType<N>, L, I extends IntegerType<I>, T extends Type<T>, C extends ComplexType<C>, W extends ComplexType<W> & NativeType<W>, B extends BooleanType<B>> {
6162

6263
/* ImgFactories */
6364

@@ -195,6 +196,11 @@ public class Creators<N extends NativeType<N>, L, I extends IntegerType<I>, T ex
195196
@Parameter(key = "sampleType")
196197
@Parameter(key = "type", type = ItemIO.OUTPUT)
197198
public final Function<T, T> typeFromSampleType = (sample) -> sample.createVariable();
199+
200+
// TODO: is this safe?
201+
@OpField(names = "create.type")
202+
@Parameter(key = "booleanType", type = ItemIO.OUTPUT)
203+
public final Source<BitType> booleanTypeSource = () -> new BitType();
198204

199205
/* ImgLabeling */
200206

‎src/test/java/net/imagej/ops/logic/BooleanTypeLogicTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,42 +54,42 @@ public void testAnd() {
5454

5555
@Test
5656
public void testComparableGreaterThan() {
57-
assertTrue(((BitType) ops.run("logic.greaterThan", new BitType(), 5.0, 3.0)).get());
58-
assertFalse(((BitType) ops.run("logic.greaterThan", new BitType(), 5.0, 6.0)).get());
57+
assertTrue(((BitType) ops.run("logic.greaterThan", 5.0, 3.0)).get());
58+
assertFalse(((BitType) ops.run("logic.greaterThan", 5.0, 6.0)).get());
5959
}
6060

6161
@Test
6262
public void testComparableGreaterThanOrEqual() {
63-
assertTrue(((BitType) ops.run("logic.greaterThanOrEqual", new BitType(), 5.0, 3.0)).get());
64-
assertTrue(((BitType) ops.run("logic.greaterThanOrEqual", new BitType(), 5.0, 5.0)).get());
65-
assertFalse(((BitType) ops.run("logic.greaterThanOrEqual", new BitType(), 5.0, 6.0)).get());
63+
assertTrue(((BitType) ops.run("logic.greaterThanOrEqual", 5.0, 3.0)).get());
64+
assertTrue(((BitType) ops.run("logic.greaterThanOrEqual", 5.0, 5.0)).get());
65+
assertFalse(((BitType) ops.run("logic.greaterThanOrEqual", 5.0, 6.0)).get());
6666
}
6767

6868
@Test
6969
public void testComparableLessThan() {
70-
assertFalse(((BitType) ops.run("logic.lessThan", new BitType(), 5.0, 3.0)).get());
71-
assertTrue(((BitType) ops.run("logic.lessThan", new BitType(), 5.0, 6.0)).get());
70+
assertFalse(((BitType) ops.run("logic.lessThan", 5.0, 3.0)).get());
71+
assertTrue(((BitType) ops.run("logic.lessThan", 5.0, 6.0)).get());
7272
}
7373

7474
@Test
7575
public void testComparableLessThanOrEqual() {
76-
assertFalse(((BitType) ops.run("logic.lessThanOrEqual", new BitType(), 5.0, 3.0)).get());
77-
assertTrue(((BitType) ops.run("logic.lessThanOrEqual", new BitType(), 5.0, 6.0)).get());
78-
assertTrue(((BitType) ops.run("logic.lessThanOrEqual", new BitType(), 5.0, 5.0)).get());
76+
assertFalse(((BitType) ops.run("logic.lessThanOrEqual", 5.0, 3.0)).get());
77+
assertTrue(((BitType) ops.run("logic.lessThanOrEqual", 5.0, 6.0)).get());
78+
assertTrue(((BitType) ops.run("logic.lessThanOrEqual", 5.0, 5.0)).get());
7979
}
8080

8181
@Test
8282
public void testObjectsEqual() {
83-
assertFalse(((BitType) ops.run("logic.equal", new BitType(), 2, 1)).get());
84-
assertTrue(((BitType) ops.run("logic.equal", new BitType(), 2, 2)).get());
85-
assertFalse(((BitType) ops.run("logic.equal", new BitType(), 2, 3)).get());
83+
assertFalse(((BitType) ops.run("logic.equal", 2, 1)).get());
84+
assertTrue(((BitType) ops.run("logic.equal", 2, 2)).get());
85+
assertFalse(((BitType) ops.run("logic.equal", 2, 3)).get());
8686
}
8787

8888
@Test
8989
public void testObjectsNotEqual() {
90-
assertTrue(((BitType) ops.run("logic.notEqual", new BitType(), 2, 1)).get());
91-
assertFalse(((BitType) ops.run("logic.notEqual", new BitType(), 2, 2)).get());
92-
assertTrue(((BitType) ops.run("logic.notEqual", new BitType(), 2, 3)).get());
90+
assertTrue(((BitType) ops.run("logic.notEqual", 2, 1)).get());
91+
assertFalse(((BitType) ops.run("logic.notEqual", 2, 2)).get());
92+
assertTrue(((BitType) ops.run("logic.notEqual", 2, 3)).get());
9393
}
9494

9595
@Test

0 commit comments

Comments
 (0)