Skip to content

Commit 5a0145e

Browse files
author
tibuch
committed
Update tests.
1 parent 65fbedc commit 5a0145e

File tree

4 files changed

+76
-60
lines changed

4 files changed

+76
-60
lines changed

‎src/test/java/net/imagej/ops/features/sets/processors/AbstractComputerSetProcessorTest.java‎

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434

3535
import net.imagej.ops.features.AbstractFeatureTest;
3636
import net.imagej.ops.features.sets.ComputerSet;
37-
import net.imagej.table.Column;
38-
import net.imagej.table.Table;
37+
import net.imagej.table.GenericTable;
3938
import net.imglib2.type.numeric.real.DoubleType;
4039

4140
import org.junit.Assert;
@@ -47,26 +46,46 @@
4746
*/
4847
public abstract class AbstractComputerSetProcessorTest extends AbstractFeatureTest {
4948

49+
/**
50+
* Check for the correct column names from a start index. If the result
51+
* table was generate based on a labeling, the label would be stored in the
52+
* first column.
53+
*
54+
* Note: No duplicate ComputerSets.
55+
*
56+
* @param result the result table
57+
* @param computerSets the computer sets
58+
* @param startIdx the start index
59+
*/
60+
protected void checkAllResultTableForOneComputerSet(final GenericTable result,
61+
final List<ComputerSet<?, DoubleType>> computerSets, final int startIdx) {
62+
String computerSetName = ComputerSetProcessorUtils.getUniqueNames(computerSets).get(computerSets.get(0));
5063

51-
protected void checkAllResultTableForOneComputerSet(
52-
Table<Column<DoubleType>, DoubleType> result, List<ComputerSet<?, DoubleType>> tmp) {
53-
String computerSetName = ComputerSetProcessorUtils.getUniqueNames(tmp).get(tmp.get(0));
64+
String[] names = computerSets.get(0).getComputerNames();
5465

55-
String[] names = tmp.get(0).getComputerNames();
56-
57-
for (int i = 0; i < result.getColumnCount(); i++) {
58-
String tmpName = computerSetName + "_" + names[i];
66+
for (int i = startIdx; i < result.getColumnCount(); i++) {
67+
String tmpName = computerSetName + "_" + names[i-startIdx];
5968
Assert.assertTrue("Wrong column order.", tmpName.equals(result.get(i).getHeader()));
6069
}
6170
}
62-
6371

64-
protected void checkResultTableForManyComputerSets(Table<Column<DoubleType>, DoubleType> result,
65-
List<ComputerSet<?, DoubleType>> tmp) {
66-
Map<ComputerSet<?, DoubleType>, String> computerSetNames = ComputerSetProcessorUtils.getUniqueNames(tmp);
72+
/**
73+
* Check for the correct column names from a start index. If the result
74+
* table was generate based on a labeling, the label would be stored in the
75+
* first column.
76+
*
77+
* Note: Checks correct column names for duplicate ComputerSets.
78+
*
79+
* @param result the result table
80+
* @param computerSets the computer sets
81+
* @param startIdx the start index
82+
*/
83+
protected void checkResultTableForManyComputerSets(final GenericTable result,
84+
final List<ComputerSet<?, DoubleType>> computerSets, final int startIdx) {
85+
Map<ComputerSet<?, DoubleType>, String> computerSetNames = ComputerSetProcessorUtils.getUniqueNames(computerSets);
6786

68-
int i = 0;
69-
for (ComputerSet<?, DoubleType> set : tmp) {
87+
int i = startIdx;
88+
for (ComputerSet<?, DoubleType> set : computerSets) {
7089
String computerSetName = computerSetNames.get(set);
7190
String[] names = set.getComputerNames();
7291
for (String s : names) {

‎src/test/java/net/imagej/ops/features/sets/processors/IterableComputerSetProcessorTest.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
import net.imagej.ops.features.sets.ComputerSet;
3939
import net.imagej.ops.features.sets.FirstOrderStatsComputerSet;
4040
import net.imagej.ops.features.sets.tables.DefaultComputerSetTableService;
41-
import net.imagej.table.Column;
42-
import net.imagej.table.Table;
41+
import net.imagej.table.GenericTable;
4342
import net.imglib2.type.numeric.real.DoubleType;
4443
import net.imglib2.type.numeric.real.FloatType;
4544

@@ -62,11 +61,11 @@ public void IterableComputerSetProcessorAllComputersAreActiveTest() {
6261
IterableComputerSetProcessor<FloatType, DoubleType> processor = ops.op(IterableComputerSetProcessor.class,
6362
Iterable.class, new ComputerSet[] { stats }, new DefaultComputerSetTableService<>());
6463

65-
Table<Column<DoubleType>, DoubleType> result = processor.compute1(getTestImage2D());
64+
GenericTable result = processor.compute1(getTestImage2D());
6665

67-
List<ComputerSet<?, DoubleType>> tmp = new ArrayList<>();
68-
tmp.add(stats);
69-
checkAllResultTableForOneComputerSet(result, tmp);
66+
List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
67+
computerSets.add(stats);
68+
checkAllResultTableForOneComputerSet(result, computerSets, 0);
7069
}
7170

7271
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -78,11 +77,11 @@ public void IterableComputerSetProcessorSomeComputersAreActiveTest() {
7877
IterableComputerSetProcessor<FloatType, DoubleType> processor = ops.op(IterableComputerSetProcessor.class,
7978
Iterable.class, new ComputerSet[] { stats }, new DefaultComputerSetTableService<>());
8079

81-
Table<Column<DoubleType>, DoubleType> result = processor.compute1(getTestImage2D());
80+
GenericTable result = processor.compute1(getTestImage2D());
8281

83-
List<ComputerSet<?, DoubleType>> tmp = new ArrayList<>();
84-
tmp.add(stats);
85-
checkAllResultTableForOneComputerSet(result, tmp);
82+
List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
83+
computerSets.add(stats);
84+
checkAllResultTableForOneComputerSet(result, computerSets, 0);
8685
}
8786

8887
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -96,12 +95,12 @@ public void IterableComputerSetProcessorWithTwoComputerSetsTest() {
9695
IterableComputerSetProcessor<FloatType, DoubleType> processor = ops.op(IterableComputerSetProcessor.class,
9796
Iterable.class, new ComputerSet[] { stats, stats1 }, new DefaultComputerSetTableService<>());
9897

99-
Table<Column<DoubleType>, DoubleType> result = processor.compute1(getTestImage2D());
98+
GenericTable result = processor.compute1(getTestImage2D());
10099

101-
List<ComputerSet<?, DoubleType>> tmp = new ArrayList<>();
102-
tmp.add(stats);
103-
tmp.add(stats1);
104-
checkResultTableForManyComputerSets(result, tmp);
100+
List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
101+
computerSets.add(stats);
102+
computerSets.add(stats1);
103+
checkResultTableForManyComputerSets(result, computerSets, 0);
105104
}
106105

107106
}

‎src/test/java/net/imagej/ops/features/sets/processors/LabelRegionsComputerSetProcessorTest.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
import net.imagej.ops.features.sets.ComputerSet;
4040
import net.imagej.ops.features.sets.Geometric2DComputerSet;
4141
import net.imagej.ops.features.sets.tables.DefaultComputerSetTableService;
42-
import net.imagej.table.Column;
43-
import net.imagej.table.Table;
42+
import net.imagej.table.GenericTable;
4443
import net.imglib2.roi.geometric.Polygon;
4544
import net.imglib2.roi.labeling.LabelRegions;
4645
import net.imglib2.type.numeric.real.DoubleType;
@@ -72,11 +71,11 @@ public void LabelRegionsComputerSetProcessorAllComputersAreActiveTest() {
7271
LabelRegionsComputerSetProcessor.class, LabelRegions.class, new ComputerSet[] { geom },
7372
new DefaultComputerSetTableService<>());
7473

75-
Table<Column<DoubleType>, DoubleType> result = processor.compute1(roi);
74+
GenericTable result = processor.compute1(roi);
7675

77-
List<ComputerSet<?, DoubleType>> tmp = new ArrayList<>();
78-
tmp.add(geom);
79-
checkAllResultTableForOneComputerSet(result, tmp);
76+
List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
77+
computerSets.add(geom);
78+
checkAllResultTableForOneComputerSet(result, computerSets, 1);
8079
}
8180

8281
@SuppressWarnings({ "unchecked" })
@@ -89,11 +88,11 @@ public void LabelRegionsComputerSetProcessorSomeComputersAreActiveTest() {
8988
LabelRegionsComputerSetProcessor.class, LabelRegions.class, new ComputerSet[] { geom },
9089
new DefaultComputerSetTableService<>());
9190

92-
Table<Column<DoubleType>, DoubleType> result = processor.compute1(roi);
91+
GenericTable result = processor.compute1(roi);
9392

94-
List<ComputerSet<?, DoubleType>> tmp = new ArrayList<>();
95-
tmp.add(geom);
96-
checkAllResultTableForOneComputerSet(result, tmp);
93+
List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
94+
computerSets.add(geom);
95+
checkAllResultTableForOneComputerSet(result, computerSets, 1);
9796
}
9897

9998
@SuppressWarnings({ "unchecked" })
@@ -107,12 +106,12 @@ public void LabelRegionsComputerSetProcessorWithTwoComputerSetsTest() {
107106
LabelRegionsComputerSetProcessor.class, LabelRegions.class, new ComputerSet[] { geom, geom1 },
108107
new DefaultComputerSetTableService<>());
109108

110-
Table<Column<DoubleType>, DoubleType> result = processor.compute1(roi);
109+
GenericTable result = processor.compute1(roi);
111110

112-
List<ComputerSet<?, DoubleType>> tmp = new ArrayList<>();
113-
tmp.add(geom);
114-
tmp.add(geom1);
115-
checkResultTableForManyComputerSets(result, tmp);
111+
List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
112+
computerSets.add(geom);
113+
computerSets.add(geom1);
114+
checkResultTableForManyComputerSets(result, computerSets, 1);
116115
}
117116

118117
}

‎src/test/java/net/imagej/ops/features/sets/processors/ROIComputerSetProcessorTest.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
import net.imagej.ops.features.sets.ComputerSet;
4040
import net.imagej.ops.features.sets.FirstOrderStatsComputerSet;
4141
import net.imagej.ops.features.sets.tables.DefaultComputerSetTableService;
42-
import net.imagej.table.Column;
43-
import net.imagej.table.Table;
42+
import net.imagej.table.GenericTable;
4443
import net.imglib2.RandomAccessible;
4544
import net.imglib2.roi.labeling.LabelRegions;
4645
import net.imglib2.type.numeric.real.DoubleType;
@@ -66,11 +65,11 @@ public void ROIComputerSetProcessorAllComputersAreActiveTest() throws IOExceptio
6665
RandomAccessible.class, LabelRegions.class, new ComputerSet[] { stats },
6766
new DefaultComputerSetTableService<>());
6867

69-
Table<Column<DoubleType>, DoubleType> result = processor.compute2(getTestImage2D(), createLabelRegions2D());
68+
GenericTable result = processor.compute2(getTestImage2D(), createLabelRegions2D());
7069

71-
List<ComputerSet<?, DoubleType>> tmp = new ArrayList<>();
72-
tmp.add(stats);
73-
checkAllResultTableForOneComputerSet(result, tmp);
70+
List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
71+
computerSets.add(stats);
72+
checkAllResultTableForOneComputerSet(result, computerSets, 1);
7473
}
7574

7675
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -83,11 +82,11 @@ public void ROIComputerSetProcessorSomeComputersAreActiveTest() throws IOExcepti
8382
RandomAccessible.class, LabelRegions.class, new ComputerSet[] { stats },
8483
new DefaultComputerSetTableService<>());
8584

86-
Table<Column<DoubleType>, DoubleType> result = processor.compute2(getTestImage2D(), createLabelRegions2D());
85+
GenericTable result = processor.compute2(getTestImage2D(), createLabelRegions2D());
8786

88-
List<ComputerSet<?, DoubleType>> tmp = new ArrayList<>();
89-
tmp.add(stats);
90-
checkAllResultTableForOneComputerSet(result, tmp);
87+
List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
88+
computerSets.add(stats);
89+
checkAllResultTableForOneComputerSet(result, computerSets, 1);
9190
}
9291

9392
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -102,12 +101,12 @@ public void ROIComputerSetProcessorWithTwoComputerSetsTest() throws IOException
102101
RandomAccessible.class, LabelRegions.class, new ComputerSet[] { stats, stats1 },
103102
new DefaultComputerSetTableService<>());
104103

105-
Table<Column<DoubleType>, DoubleType> result = processor.compute2(getTestImage2D(), createLabelRegions2D());
104+
GenericTable result = processor.compute2(getTestImage2D(), createLabelRegions2D());
106105

107-
List<ComputerSet<?, DoubleType>> tmp = new ArrayList<>();
108-
tmp.add(stats);
109-
tmp.add(stats1);
110-
checkResultTableForManyComputerSets(result, tmp);
106+
List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
107+
computerSets.add(stats);
108+
computerSets.add(stats1);
109+
checkResultTableForManyComputerSets(result, computerSets, 1);
111110
}
112111

113112
}

0 commit comments

Comments
 (0)