Skip to content

Commit ae714af

Browse files
awalter17imagejan
awalter17
authored and
imagejan
committed
Add insert row/column test for remaining primitive tables
1 parent 6af44ca commit ae714af

File tree

7 files changed

+207
-0
lines changed

7 files changed

+207
-0
lines changed

‎src/test/java/net/imagej/table/DefaultBoolTableTest.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,21 @@ public void testRemoveColumn() {
118118
checkTableModifiedColumn(table, null, 2);
119119
}
120120

121+
@Test
122+
public void testInsertColumn() {
123+
final BoolTable table = createTable();
124+
final boolean[] values =
125+
{ true, true, true, true, false, true, false, true };
126+
127+
final BoolColumn col = table.insertColumn(1, "Header4");
128+
col.fill(values);
129+
130+
assertEquals(table.getColumnCount(), 4);
131+
assertEquals(table.get(1).getHeader(), "Header4");
132+
133+
checkTableModifiedColumn(table, values, 1);
134+
}
135+
121136
@Test
122137
public void testAppendRow() {
123138
final BoolTable table = createTable();
@@ -148,6 +163,21 @@ public void testRemoveRow() {
148163
checkTableModifiedRow(table, null, 1);
149164
}
150165

166+
@Test
167+
public void testInsertRow() {
168+
final BoolTable table = createTable();
169+
final boolean[] values = { true, true, false };
170+
171+
table.insertRow(6);
172+
173+
assertEquals(table.getRowCount(), 9);
174+
for (int i = 0; i < table.getColumnCount(); i++) {
175+
table.setValue(i, 6, values[i]);
176+
}
177+
178+
checkTableModifiedRow(table, values, 6);
179+
}
180+
151181
// TODO - Add more tests.
152182

153183
// -- Helper methods --

‎src/test/java/net/imagej/table/DefaultByteTableTest.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,20 @@ public void testRemoveColumn() {
116116
checkTableModifiedColumn(table, null, 1);
117117
}
118118

119+
@Test
120+
public void testInsertColumn() {
121+
final ByteTable table = createTable();
122+
final byte[] values = { 17, 23, -12, 0, -93, -7, 127 };
123+
124+
final ByteColumn col = table.insertColumn(0, "Header3");
125+
col.fill(values);
126+
127+
assertEquals(table.getColumnCount(), 3);
128+
assertEquals(table.get(0).getHeader(), "Header3");
129+
130+
checkTableModifiedColumn(table, values, 0);
131+
}
132+
119133
@Test
120134
public void testAppendRow() {
121135
final ByteTable table = createTable();
@@ -147,6 +161,21 @@ public void testRemoveRow() {
147161
checkTableModifiedRow(table, null, 2);
148162
}
149163

164+
@Test
165+
public void testInsertRow() {
166+
final ByteTable table = createTable();
167+
final byte[] values = { 79, 8 };
168+
169+
table.insertRow(5);
170+
171+
assertEquals(table.getRowCount(), 8);
172+
for (int i = 0; i < table.getColumnCount(); i++) {
173+
table.setValue(i, 5, values[i]);
174+
}
175+
176+
checkTableModifiedRow(table, values, 5);
177+
}
178+
150179
// TODO - Add more tests.
151180

152181
// -- Helper methods --

‎src/test/java/net/imagej/table/DefaultCharTableTest.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,20 @@ public void testRemoveColumn() {
119119
checkTableModifiedColumn(table, null, 2);
120120
}
121121

122+
@Test
123+
public void testInsertColumn() {
124+
final CharTable table = createTable();
125+
final char[] values = { '2', 'W', '!', '*', 'o', 'E', ' ', 'A', '\t' };
126+
127+
final CharColumn col = table.insertColumn(2, "Header4");
128+
col.fill(values);
129+
130+
assertEquals(table.getColumnCount(), 4);
131+
assertEquals(table.get(2).getHeader(), "Header4");
132+
133+
checkTableModifiedColumn(table, values, 2);
134+
}
135+
122136
@Test
123137
public void testAppendRow() {
124138
final CharTable table = createTable();
@@ -149,6 +163,21 @@ public void testRemoveRow() {
149163
checkTableModifiedRow(table, null, 7);
150164
}
151165

166+
@Test
167+
public void testInsertRow() {
168+
final CharTable table = createTable();
169+
final char[] values = { '\t', '\uffff', '\u0000' };
170+
171+
table.insertRow(7);
172+
173+
assertEquals(table.getRowCount(), 10);
174+
for (int i = 0; i < table.getColumnCount(); i++) {
175+
table.setValue(i, 7, values[i]);
176+
}
177+
178+
checkTableModifiedRow(table, values, 7);
179+
}
180+
152181
// TODO - Add more tests.
153182

154183
// -- Helper methods --

‎src/test/java/net/imagej/table/DefaultFloatTableTest.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,21 @@ public void testRemoveColumn() {
118118
checkTableModifiedColumn(table, null, 1);
119119
}
120120

121+
@Test
122+
public void testInsertColumn() {
123+
final FloatTable table = createTable();
124+
final float[] values =
125+
{ 17.0625f, 22.125f, -0.00000762939f, 0f, -2.03125f, -717.5f, 127.5f };
126+
127+
final FloatColumn col = table.insertColumn(4, "Header6");
128+
col.fill(values);
129+
130+
assertEquals(table.getColumnCount(), 6);
131+
assertEquals(table.get(4).getHeader(), "Header6");
132+
133+
checkTableModifiedColumn(table, values, 4);
134+
}
135+
121136
@Test
122137
public void testAppendRow() {
123138
final FloatTable table = createTable();
@@ -149,6 +164,21 @@ public void testRemoveRow() {
149164
checkTableModifiedRow(table, null, 4);
150165
}
151166

167+
@Test
168+
public void testInsertRow() {
169+
final FloatTable table = createTable();
170+
final float[] values = { -0.0625f, 5.5f, -4.03125f, 46.125f, 10489.5f };
171+
172+
table.insertRow(0);
173+
174+
assertEquals(table.getRowCount(), 8);
175+
for (int i = 0; i < table.getColumnCount(); i++) {
176+
table.setValue(i, 0, values[i]);
177+
}
178+
179+
checkTableModifiedRow(table, values, 0);
180+
}
181+
152182
// TODO - Add more tests.
153183

154184
// -- Helper methods --

‎src/test/java/net/imagej/table/DefaultIntTableTest.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,22 @@ public void testRemoveColumn() {
132132
checkTableModifiedColumn(table, null, 5);
133133
}
134134

135+
@Test
136+
public void testInsertColumn() {
137+
final IntTable table = createTable();
138+
final int[] values =
139+
{ 30, 3109842, 28, 25, -432579, 22, -12, 0, 54235423, -7858345, -34, -3,
140+
-35648443, 43512356, 999 };
141+
142+
final IntColumn col = table.insertColumn(3, "Header7");
143+
col.fill(values);
144+
145+
assertEquals(table.getColumnCount(), 7);
146+
assertEquals(table.get(3).getHeader(), "Header7");
147+
148+
checkTableModifiedColumn(table, values, 3);
149+
}
150+
135151
@Test
136152
public void testAppendRow() {
137153
final IntTable table = createTable();
@@ -162,6 +178,21 @@ public void testRemoveRow() {
162178
checkTableModifiedRow(table, null, 10);
163179
}
164180

181+
@Test
182+
public void testInsertRow() {
183+
final IntTable table = createTable();
184+
final int[] values = { 179, 43148, -36, 1, 6, -356 };
185+
186+
table.insertRow(13);
187+
188+
assertEquals(table.getRowCount(), 16);
189+
for (int i = 0; i < table.getColumnCount(); i++) {
190+
table.setValue(i, 13, values[i]);
191+
}
192+
193+
checkTableModifiedRow(table, values, 13);
194+
}
195+
165196
// TODO - Add more tests.
166197

167198
// -- Helper methods --

‎src/test/java/net/imagej/table/DefaultLongTableTest.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,20 @@ public void testRemoveColumn() {
113113
checkTableModifiedColumn(table, null, 1);
114114
}
115115

116+
@Test
117+
public void testInsertColumn() {
118+
final LongTable table = createTable();
119+
final long[] values = { 542908l, 9574597419085l, -11l };
120+
121+
final LongColumn col = table.insertColumn(1, "Header3");
122+
col.fill(values);
123+
124+
assertEquals(table.getColumnCount(), 3);
125+
assertEquals(table.get(1).getHeader(), "Header3");
126+
127+
checkTableModifiedColumn(table, values, 1);
128+
}
129+
116130
@Test
117131
public void testAppendRow() {
118132
final LongTable table = createTable();
@@ -144,6 +158,21 @@ public void testRemoveRow() {
144158
checkTableModifiedRow(table, null, 0);
145159
}
146160

161+
@Test
162+
public void testInsertRow() {
163+
final LongTable table = createTable();
164+
final long[] values = { 301984l, 15l };
165+
166+
table.insertRow(1);
167+
168+
assertEquals(table.getRowCount(), 4);
169+
for (int i = 0; i < table.getColumnCount(); i++) {
170+
table.setValue(i, 1, values[i]);
171+
}
172+
173+
checkTableModifiedRow(table, values, 1);
174+
}
175+
147176
// TODO - Add more tests.
148177

149178
// -- Helper methods --

‎src/test/java/net/imagej/table/DefaultShortTableTest.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,20 @@ public void testAppendColumn() {
105105
checkTableModifiedColumn(table, values, 4);
106106
}
107107

108+
@Test
109+
public void testInsertColumn() {
110+
final ShortTable table = createTable();
111+
final short[] values = { -11, 32000, 9798, -18687, 97 };
112+
113+
final ShortColumn col = table.insertColumn(2, "Header5");
114+
col.fill(values);
115+
116+
assertEquals(table.getColumnCount(), 5);
117+
assertEquals(table.get(2).getHeader(), "Header5");
118+
119+
checkTableModifiedColumn(table, values, 2);
120+
}
121+
108122
@Test
109123
public void testRemoveColumn() {
110124
final ShortTable table = createTable();
@@ -151,6 +165,21 @@ public void testRemoveRow() {
151165
checkTableModifiedRow(table, null, 2);
152166
}
153167

168+
@Test
169+
public void testInsertRow() {
170+
final ShortTable table = createTable();
171+
final short[] values = { 7911, 937, -1508, -8 };
172+
173+
table.insertRow(3);
174+
175+
assertEquals(table.getRowCount(), 6);
176+
for (int i = 0; i < table.getColumnCount(); i++) {
177+
table.setValue(i, 3, values[i]);
178+
}
179+
180+
checkTableModifiedRow(table, values, 3);
181+
}
182+
154183
// TODO - Add more tests.
155184

156185
// -- Helper methods --

0 commit comments

Comments
 (0)