GUI -- refactored all the table views (server side) to use the new TableModel method of data generation.
Change-Id: Ib8a188ad432ff335db6cff1e49e08dbaf039436b
diff --git a/core/api/src/test/java/org/onosproject/ui/table/TableModelTest.java b/core/api/src/test/java/org/onosproject/ui/table/TableModelTest.java
index 40a9672..53725f2 100644
--- a/core/api/src/test/java/org/onosproject/ui/table/TableModelTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/table/TableModelTest.java
@@ -45,7 +45,6 @@
private TableModel tm;
private TableModel.Row[] rows;
private TableModel.Row row;
- private TableRow[] tableRows;
private CellFormatter fmt;
@Test(expected = NullPointerException.class)
@@ -68,9 +67,6 @@
tm = new TableModel(FOO, BAR);
assertEquals("column count", 2, tm.columnCount());
assertEquals("row count", 0, tm.rowCount());
-
- tableRows = tm.getTableRows();
- assertEquals("row count alt", 0, tableRows.length);
}
@Test
@@ -225,7 +221,7 @@
initUnsortedTable();
// first, tell the table to use an integer-based comparator
- tm.setComparator(BAR, new IntComparator());
+ tm.setComparator(BAR, IntComparator.INSTANCE);
// sort by number
tm.sort(BAR, SortDir.ASC);
@@ -256,8 +252,8 @@
initUnsortedTable();
// set integer-based comparator and hex formatter
- tm.setComparator(BAR, new IntComparator());
- tm.setFormatter(BAR, new HexFormatter());
+ tm.setComparator(BAR, IntComparator.INSTANCE);
+ tm.setFormatter(BAR, HexFormatter.INSTANCE);
// sort by number
tm.sort(BAR, SortDir.ASC);
diff --git a/core/api/src/test/java/org/onosproject/ui/table/cell/DefaultCellComparatorTest.java b/core/api/src/test/java/org/onosproject/ui/table/cell/DefaultCellComparatorTest.java
index d4cd8ed..38c6bed 100644
--- a/core/api/src/test/java/org/onosproject/ui/table/cell/DefaultCellComparatorTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/table/cell/DefaultCellComparatorTest.java
@@ -39,7 +39,7 @@
private static final int NUMBER = 42;
private static final TestClass OBJECT = new TestClass();
- private CellComparator cmp = new DefaultCellComparator();
+ private CellComparator cmp = DefaultCellComparator.INSTANCE;
@Test
public void sameString() {
diff --git a/core/api/src/test/java/org/onosproject/ui/table/cell/DefaultCellFormatterTest.java b/core/api/src/test/java/org/onosproject/ui/table/cell/DefaultCellFormatterTest.java
index 8934f48..6351a1f 100644
--- a/core/api/src/test/java/org/onosproject/ui/table/cell/DefaultCellFormatterTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/table/cell/DefaultCellFormatterTest.java
@@ -37,7 +37,7 @@
}
}
- private CellFormatter fmt = new DefaultCellFormatter();
+ private CellFormatter fmt = DefaultCellFormatter.INSTANCE;
@Test
public void formatNull() {
diff --git a/core/api/src/test/java/org/onosproject/ui/table/cell/HexFormatterTest.java b/core/api/src/test/java/org/onosproject/ui/table/cell/HexFormatterTest.java
index 738fbdd..ad23b02 100644
--- a/core/api/src/test/java/org/onosproject/ui/table/cell/HexFormatterTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/table/cell/HexFormatterTest.java
@@ -18,6 +18,7 @@
package org.onosproject.ui.table.cell;
import org.junit.Test;
+import org.onosproject.ui.table.CellFormatter;
import static org.junit.Assert.assertEquals;
@@ -26,7 +27,7 @@
*/
public class HexFormatterTest {
- private HexFormatter fmt = new HexFormatter();
+ private CellFormatter fmt = HexFormatter.INSTANCE;
@Test
public void nullValue() {
diff --git a/core/api/src/test/java/org/onosproject/ui/table/cell/IntComparatorTest.java b/core/api/src/test/java/org/onosproject/ui/table/cell/IntComparatorTest.java
index 2b45b3f..9455329 100644
--- a/core/api/src/test/java/org/onosproject/ui/table/cell/IntComparatorTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/table/cell/IntComparatorTest.java
@@ -27,7 +27,7 @@
*/
public class IntComparatorTest {
- private CellComparator cmp = new IntComparator();
+ private CellComparator cmp = IntComparator.INSTANCE;
@Test
public void twoNulls() {