ONOS-6730: Topo View i18n:
- Deprecate non-localized PropertyPanel.addProp() methods.
- Add modify*LinkDetails() methods to UiTopoOverlay class.
- Augment TVMH.RequestDetails to handle link details requests.
- Refactor deviceDetails() to allow piecemeal construction of the Properties Panel.
This allows us to include (or not) the location properties (geo/grid).
- Refactor hostDetails() for piecemeal construction of Properties Panel.
- Add edgeLinkDetails() and infraLinkDetails() methods.
- No lat/long suppression now done server-side. Check for trailing separator.
- Augment requestDetails() to format link details requests.
- Added lion.getSafe(Enum<?>) method.
- Added DeviceEnums and LinkEnums resource bundles.
Change-Id: Ibbd113a7d5ef73765cd10aed0fb7ea8efbaa16c5
diff --git a/core/api/src/test/java/org/onosproject/ui/topo/PropertyPanelTest.java b/core/api/src/test/java/org/onosproject/ui/topo/PropertyPanelTest.java
index 6ae6849..aeaa0ae 100644
--- a/core/api/src/test/java/org/onosproject/ui/topo/PropertyPanelTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/topo/PropertyPanelTest.java
@@ -42,8 +42,8 @@
private static final NumberFormat ENGLISH_FORMATTER =
NumberFormat.getInstance(Locale.ENGLISH);
- public EnglishPropertyPanel(String title, String typeId) {
- super(title, typeId);
+ public EnglishPropertyPanel(String title, String glyphId) {
+ super(title, glyphId);
}
@Override
@@ -53,9 +53,9 @@
}
private static final String TITLE_ORIG = "Original Title";
- private static final String TYPE_ORIG = "Original type ID";
+ private static final String GLYPH_ORIG = "Original glyph ID";
private static final String TITLE_NEW = "New Title";
- private static final String TYPE_NEW = "New type";
+ private static final String GLYPH_NEW = "New glyph ID";
private static final String SOME_IDENTIFICATION = "It's Me!";
private static final String KEY_A = "A";
@@ -103,9 +103,9 @@
@Test
public void basic() {
- pp = new EnglishPropertyPanel(TITLE_ORIG, TYPE_ORIG);
+ pp = new EnglishPropertyPanel(TITLE_ORIG, GLYPH_ORIG);
assertEquals("wrong title", TITLE_ORIG, pp.title());
- assertEquals("wrong type", TYPE_ORIG, pp.typeId());
+ assertEquals("wrong glyph", GLYPH_ORIG, pp.glyphId());
assertNull("id?", pp.id());
assertEquals("unexpected props", 0, pp.properties().size());
assertEquals("unexpected buttons", 0, pp.buttons().size());
@@ -119,10 +119,10 @@
}
@Test
- public void changeType() {
+ public void changeGlyph() {
basic();
- pp.typeId(TYPE_NEW);
- assertEquals("wrong type", TYPE_NEW, pp.typeId());
+ pp.glyphId(GLYPH_NEW);
+ assertEquals("wrong glyph", GLYPH_NEW, pp.glyphId());
}
@Test