Skip to content

Commit 447c4ef

Browse files
awalter17imagejan
awalter17
authored and
imagejan
committed
Clean up table test
1 parent 6280b4e commit 447c4ef

1 file changed

Lines changed: 46 additions & 42 deletions

File tree

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

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
*/
4747
public class DefaultResultsTableTest {
4848

49-
private static final String[] HEADERS = {"Year", "Age", "BA"};
49+
private static final String[] HEADERS = { "Year", "Age", "BA" };
5050

5151
// Paul Molitor
5252
private static final double[][] DATA = {
@@ -78,7 +78,7 @@ public void testStructure() {
7878
final ResultsTable table = createTable();
7979
assertEquals(3, table.getColumnCount());
8080
assertEquals(21, table.getRowCount());
81-
for (DoubleColumn column : table) {
81+
for (final DoubleColumn column : table) {
8282
assertEquals(21, column.size());
8383
}
8484

@@ -108,9 +108,10 @@ public void testGetColumnType() {
108108
@Test
109109
public void testAppendColumn() {
110110
final ResultsTable table = createTable();
111-
final Double[] values = { -0.25, 0.5, 0.625, -1.25, 0.0, 0.0325, 100.5,
112-
13.25, 110.5, -2.25, 4.625, -3.0, 100.0, 1209.25, -10.5, 16.25, -200.0,
113-
-0.0325, 940385034958.5, -301284390284.25, 17.25 };
111+
final Double[] values =
112+
{ -0.25, 0.5, 0.625, -1.25, 0.0, 0.0325, 100.5, 13.25, 110.5, -2.25,
113+
4.625, -3.0, 100.0, 1209.25, -10.5, 16.25, -200.0, -0.0325,
114+
940385034958.5, -301284390284.25, 17.25 };
114115

115116
final DoubleColumn col = table.appendColumn("Header4");
116117
col.fill(values);
@@ -139,9 +140,10 @@ public void testRemoveColumn() {
139140
@Test
140141
public void testInsertColumn() {
141142
final ResultsTable table = createTable();
142-
final Double[] values = { -0.25, 0.5, 0.625, -1.25, 0.0, 0.0325, 100.5,
143-
13.25, 110.5, -2.25, 4.625, -3.0, 100.0, 1209.25, -10.5, 16.25, -200.0,
144-
-0.0325, 940385034958.5, -301284390284.25, 17.25 };
143+
final Double[] values =
144+
{ -0.25, 0.5, 0.625, -1.25, 0.0, 0.0325, 100.5, 13.25, 110.5, -2.25,
145+
4.625, -3.0, 100.0, 1209.25, -10.5, 16.25, -200.0, -0.0325,
146+
940385034958.5, -301284390284.25, 17.25 };
145147

146148
final DoubleColumn col = table.insertColumn(1, "Header4");
147149
col.fill(values);
@@ -155,16 +157,16 @@ public void testInsertColumn() {
155157
@Test
156158
public void testAppendColumns() {
157159
final ResultsTable table = createTable();
158-
final Double[][] values = {
159-
{ -0.25, 0.5, 0.625, -1.25, 0.0, 0.0325, 100.5, 13.25, 110.5, -2.25,
160-
4.625, -3.0, 100.0, 1209.25, -10.5, 16.25, -200.0, -0.0325,
161-
940385034958.5, -301284390284.25, 17.25 },
160+
final Double[][] values =
161+
{
162+
{ -0.25, 0.5, 0.625, -1.25, 0.0, 0.0325, 100.5, 13.25, 110.5, -2.25,
163+
4.625, -3.0, 100.0, 1209.25, -10.5, 16.25, -200.0, -0.0325,
164+
940385034958.5, -301284390284.25, 17.25 },
162165
{ 0.5, 0.5, 0.25, 1.25, 0.0, 0.625, 100.5, 13.25, 11.5, -112.25, 4.625,
163166
-3.5, 105.0, 19.625, -10.5, 16.25, 200.0325, -0.0325, 940385034958.5,
164-
-1.25, 17.25 }
165-
};
167+
-1.25, 17.25 } };
166168

167-
final String[] headers = {"Header4", "Header5"};
169+
final String[] headers = { "Header4", "Header5" };
168170
final List<DoubleColumn> col = table.appendColumns(headers);
169171
col.get(0).fill(values[0]);
170172
col.get(1).fill(values[1]);
@@ -181,7 +183,7 @@ public void testAppendColumns() {
181183
public void testRemoveColumns() {
182184
final ResultsTable table = createTable();
183185

184-
final List<DoubleColumn> col = table.removeColumns(0,2);
186+
final List<DoubleColumn> col = table.removeColumns(0, 2);
185187

186188
// Test removing a column
187189
for (int q = 0; q < col.size(); q++) {
@@ -197,16 +199,16 @@ public void testRemoveColumns() {
197199
@Test
198200
public void testInsertColumns() {
199201
final ResultsTable table = createTable();
200-
final Double[][] values = {
201-
{ -0.25, 0.5, 0.625, -1.25, 0.0, 0.0325, 100.5, 13.25, 110.5, -2.25,
202-
4.625, -3.0, 100.0, 1209.25, -10.5, 16.25, -200.0, -0.0325,
203-
940385034958.5, -301284390284.25, 17.25 },
202+
final Double[][] values =
203+
{
204+
{ -0.25, 0.5, 0.625, -1.25, 0.0, 0.0325, 100.5, 13.25, 110.5, -2.25,
205+
4.625, -3.0, 100.0, 1209.25, -10.5, 16.25, -200.0, -0.0325,
206+
940385034958.5, -301284390284.25, 17.25 },
204207
{ 0.5, 0.5, 0.25, 1.25, 0.0, 0.625, 100.5, 13.25, 11.5, -112.25, 4.625,
205208
-3.5, 105.0, 19.625, -10.5, 16.25, 200.0325, -0.0325, 940385034958.5,
206-
-1.25, 17.25 }
207-
};
209+
-1.25, 17.25 } };
208210

209-
final String[] headers = {"Header4", "Header5"};
211+
final String[] headers = { "Header4", "Header5" };
210212
final List<DoubleColumn> col = table.insertColumns(1, headers);
211213
col.get(0).fill(values[0]);
212214
col.get(1).fill(values[1]);
@@ -318,15 +320,15 @@ public void testInsertRows() {
318320
checkTableModifiedRows(table, values, 3, 6);
319321
}
320322

321-
//TODO - Add more tests.
323+
// TODO - Add more tests.
322324

323325
// -- Helper methods --
324326

325327
private ResultsTable createTable() {
326328
final ResultsTable table =
327329
new DefaultResultsTable(DATA[0].length, DATA.length);
328330

329-
for (int c=0; c<HEADERS.length; c++) {
331+
for (int c = 0; c < HEADERS.length; c++) {
330332
table.setColumnHeader(c, HEADERS[c]);
331333
}
332334

@@ -344,13 +346,13 @@ private void checkTableModifiedColumn(final ResultsTable table,
344346
{
345347
for (int r = 0; r < table.getRowCount(); r++) {
346348
for (int c = 0; c < table.getColumnCount(); c++) {
347-
if ( c == mod && values != null ) {
349+
if (c == mod && values != null) {
348350
assertEquals(table.getValue(c, r), values[r], 0);
349351
}
350-
else if ( c > mod && values != null ) {
352+
else if (c > mod && values != null) {
351353
assertEquals(table.getValue(c, r), DATA[r][c - 1], 0);
352354
}
353-
else if ( c >= mod && values == null ) {
355+
else if (c >= mod && values == null) {
354356
assertEquals(table.getValue(c, r), DATA[r][c + 1], 0);
355357
}
356358
else {
@@ -365,14 +367,14 @@ private void checkTableModifiedRow(final ResultsTable table,
365367
{
366368
for (int r = 0; r < table.getRowCount(); r++) {
367369
for (int c = 0; c < table.getColumnCount(); c++) {
368-
if ( r == mod && values != null ) {
370+
if (r == mod && values != null) {
369371
assertEquals(table.getValue(c, r), values[c], 0);
370372
}
371-
else if ( r > mod && values != null) {
372-
assertEquals(table.getValue(c, r), DATA[r-1][c], 0);
373+
else if (r > mod && values != null) {
374+
assertEquals(table.getValue(c, r), DATA[r - 1][c], 0);
373375
}
374-
else if ( r >= mod && values == null ) {
375-
assertEquals(table.getValue(c, r), DATA[r+1][c], 0);
376+
else if (r >= mod && values == null) {
377+
assertEquals(table.getValue(c, r), DATA[r + 1][c], 0);
376378
}
377379
else {
378380
assertEquals(table.getValue(c, r), DATA[r][c], 0);
@@ -386,14 +388,15 @@ private void checkTableModifiedColumns(final ResultsTable table,
386388
{
387389
for (int r = 0; r < table.getRowCount(); r++) {
388390
for (int c = 0; c < table.getColumnCount(); c++) {
389-
if ( c >= startMod && c <= endMod && values != null ) {
391+
if (c >= startMod && c <= endMod && values != null) {
390392
assertEquals(table.getValue(c, r), values[c - startMod][r], 0);
391393
}
392-
else if ( c > endMod && values != null ) {
394+
else if (c > endMod && values != null) {
393395
assertEquals(table.getValue(c, r), DATA[r][c - values.length], 0);
394396
}
395-
else if ( c >= startMod && values == null ) {
396-
assertEquals(table.getValue(c, r), DATA[r][c + (endMod-startMod)], 0);
397+
else if (c >= startMod && values == null) {
398+
assertEquals(table.getValue(c, r), DATA[r][c + (endMod - startMod)],
399+
0);
397400
}
398401
else {
399402
assertEquals(table.getValue(c, r), DATA[r][c], 0);
@@ -407,14 +410,15 @@ private void checkTableModifiedRows(final ResultsTable table,
407410
{
408411
for (int r = 0; r < table.getRowCount(); r++) {
409412
for (int c = 0; c < table.getColumnCount(); c++) {
410-
if ( r >= startMod && r <= endMod && values != null ) {
413+
if (r >= startMod && r <= endMod && values != null) {
411414
assertEquals(table.getValue(c, r), values[r - startMod][c], 0);
412415
}
413-
else if ( r > endMod && values != null) {
416+
else if (r > endMod && values != null) {
414417
assertEquals(table.getValue(c, r), DATA[r - values.length][c], 0);
415418
}
416-
else if ( r >= startMod && values == null ) {
417-
assertEquals(table.getValue(c, r), DATA[r + (endMod-startMod + 1)][c], 0);
419+
else if (r >= startMod && values == null) {
420+
assertEquals(table.getValue(c, r),
421+
DATA[r + (endMod - startMod + 1)][c], 0);
418422
}
419423
else {
420424
assertEquals(table.getValue(c, r), DATA[r][c], 0);
@@ -423,4 +427,4 @@ else if ( r >= startMod && values == null ) {
423427
}
424428
}
425429

426-
}
430+
}

0 commit comments

Comments
 (0)