Skip to content

Commit 53168f7

Browse files
gselzergselzer
committed
Remove imagej-testutil
Moved TestImgGeneration and its Test into ImageJ Ops2
1 parent f832f41 commit 53168f7

33 files changed

Lines changed: 32 additions & 229 deletions

‎imagej/imagej-ops2-tutorial/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,6 @@
294294
<version>${project.version}</version>
295295
<scope>test</scope>
296296
</dependency>
297-
<dependency>
298-
<groupId>net.imagej</groupId>
299-
<artifactId>imagej-testutil</artifactId>
300-
<version>${project.version}</version>
301-
<scope>test</scope>
302-
</dependency>
303297
<dependency>
304298
<!-- Do not remove - Maven incorrectly identifies it as an unused dependency! -->
305299
<groupId>org.scijava</groupId>

‎imagej/imagej-ops2/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,6 @@
327327
<version>${project.version}</version>
328328
<scope>test</scope>
329329
</dependency>
330-
<dependency>
331-
<groupId>net.imagej</groupId>
332-
<artifactId>imagej-testutil</artifactId>
333-
<version>${project.version}</version>
334-
<scope>test</scope>
335-
</dependency>
336330
<dependency>
337331
<groupId>io.scif</groupId>
338332
<artifactId>scifio</artifactId>

imagej/imagej-testutil/src/main/java/net/imagej/testutil/TestImgGeneration.java renamed to imagej/imagej-ops2/src/test/java/net/imagej/ops2/TestImgGeneration.java

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,44 +26,26 @@
2626
* POSSIBILITY OF SUCH DAMAGE.
2727
* #L%
2828
*/
29-
package net.imagej.testutil;
30-
31-
import java.math.BigInteger;
32-
import java.util.Random;
29+
package net.imagej.ops2;
3330

3431
import net.imglib2.Cursor;
3532
import net.imglib2.FinalInterval;
3633
import net.imglib2.img.Img;
3734
import net.imglib2.img.array.ArrayImg;
3835
import net.imglib2.img.array.ArrayImgs;
39-
import net.imglib2.img.basictypeaccess.array.ByteArray;
40-
import net.imglib2.img.basictypeaccess.array.DoubleArray;
41-
import net.imglib2.img.basictypeaccess.array.FloatArray;
42-
import net.imglib2.img.basictypeaccess.array.IntArray;
43-
import net.imglib2.img.basictypeaccess.array.LongArray;
44-
import net.imglib2.img.basictypeaccess.array.ShortArray;
36+
import net.imglib2.img.basictypeaccess.array.*;
4537
import net.imglib2.img.cell.CellImg;
4638
import net.imglib2.img.cell.CellImgFactory;
4739
import net.imglib2.type.logic.BitType;
48-
import net.imglib2.type.numeric.integer.ByteType;
49-
import net.imglib2.type.numeric.integer.IntType;
50-
import net.imglib2.type.numeric.integer.LongType;
51-
import net.imglib2.type.numeric.integer.ShortType;
52-
import net.imglib2.type.numeric.integer.Unsigned128BitType;
53-
import net.imglib2.type.numeric.integer.Unsigned12BitType;
54-
import net.imglib2.type.numeric.integer.Unsigned2BitType;
55-
import net.imglib2.type.numeric.integer.Unsigned4BitType;
56-
import net.imglib2.type.numeric.integer.UnsignedByteType;
57-
import net.imglib2.type.numeric.integer.UnsignedIntType;
58-
import net.imglib2.type.numeric.integer.UnsignedLongType;
59-
import net.imglib2.type.numeric.integer.UnsignedShortType;
60-
import net.imglib2.type.numeric.integer.UnsignedVariableBitLengthType;
40+
import net.imglib2.type.numeric.integer.*;
6141
import net.imglib2.type.numeric.real.DoubleType;
6242
import net.imglib2.type.numeric.real.FloatType;
6343
import net.imglib2.util.Intervals;
64-
6544
import org.scijava.common3.MersenneTwisterFast;
6645

46+
import java.math.BigInteger;
47+
import java.util.Random;
48+
6749
public final class TestImgGeneration {
6850

6951
private TestImgGeneration() {

imagej/imagej-testutil/src/test/java/net/imagej/testutil/TestImgGenerationTest.java renamed to imagej/imagej-ops2/src/test/java/net/imagej/ops2/TestImgGenerationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* POSSIBILITY OF SUCH DAMAGE.
2727
* #L%
2828
*/
29-
package net.imagej.testutil;
29+
package net.imagej.ops2;
3030

3131
import net.imglib2.Cursor;
3232
import net.imglib2.img.array.ArrayImg;

‎imagej/imagej-ops2/src/test/java/net/imagej/ops2/adapt/LiftFunctionsToImgTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.function.Function;
44

55
import net.imagej.ops2.AbstractOpTest;
6-
import net.imagej.testutil.TestImgGeneration;
6+
import net.imagej.ops2.TestImgGeneration;
77
import net.imglib2.Cursor;
88
import net.imglib2.RandomAccess;
99
import net.imglib2.img.Img;

‎imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
import net.imagej.ops2.AbstractColocalisationTest;
3838
import net.imagej.ops2.coloc.pValue.PValueResult;
39-
import net.imagej.testutil.TestImgGeneration;
39+
import net.imagej.ops2.TestImgGeneration;
4040
import net.imglib2.RandomAccessibleInterval;
4141
import net.imglib2.img.Img;
4242
import net.imglib2.type.numeric.integer.ByteType;

‎imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/FFTTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333

3434
import net.imagej.ops2.AbstractOpTest;
35-
import net.imagej.testutil.TestImgGeneration;
35+
import net.imagej.ops2.TestImgGeneration;
3636
import net.imglib2.Cursor;
3737
import net.imglib2.FinalDimensions;
3838
import net.imglib2.IterableInterval;

‎imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/NonLinearFiltersTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
import net.imagej.ops2.AbstractOpTest;
3838
import net.imagej.ops2.filter.sigma.DefaultSigmaFilter;
39-
import net.imagej.testutil.TestImgGeneration;
39+
import net.imagej.ops2.TestImgGeneration;
4040
import net.imglib2.algorithm.neighborhood.Neighborhood;
4141
import net.imglib2.algorithm.neighborhood.RectangleShape;
4242
import net.imglib2.algorithm.neighborhood.RectangleShape.NeighborhoodsIterableInterval;

‎imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/bilateral/DefaultBilateralTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import static org.junit.jupiter.api.Assertions.assertEquals;
3232

3333
import net.imagej.ops2.AbstractOpTest;
34-
import net.imagej.testutil.TestImgGeneration;
34+
import net.imagej.ops2.TestImgGeneration;
3535
import net.imglib2.Cursor;
3636
import net.imglib2.img.Img;
3737
import net.imglib2.img.array.ArrayImgs;

‎imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import static org.junit.jupiter.api.Assertions.assertEquals;
3232

3333
import net.imagej.ops2.AbstractOpTest;
34-
import net.imagej.testutil.TestImgGeneration;
34+
import net.imagej.ops2.TestImgGeneration;
3535
import net.imglib2.Cursor;
3636
import net.imglib2.RandomAccess;
3737
import net.imglib2.RandomAccessibleInterval;

0 commit comments

Comments
 (0)