Add a method to get resource type name: simpleTypeName()
last() is removed as the new method takes over its role
Change-Id: Id3737529787da5d5bb513355cdbc443f2b7b17e2
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceIdTest.java b/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceIdTest.java
index cf6e0e8..1e79f81 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceIdTest.java
@@ -21,6 +21,9 @@
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
/**
* Unit test for ContinuousResourceId.
*/
@@ -42,4 +45,11 @@
new EqualsTester()
.addEqualityGroup(id1, sameAsId1);
}
+
+ @Test
+ public void testSimpleTypeName() {
+ ContinuousResourceId id1 = Resources.continuous(D1, P1, Bandwidth.class).resource(BW1.bps()).id();
+
+ assertThat(id1.simpleTypeName(), is("Bandwidth"));
+ }
}
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceIdTest.java b/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceIdTest.java
index 6178150..aeb950d 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceIdTest.java
@@ -21,6 +21,9 @@
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
/**
* Unit test for DiscreteResourceId.
*/
@@ -41,4 +44,15 @@
.addEqualityGroup(id1, sameAsId1)
.addEqualityGroup(id2);
}
+
+ @Test
+ public void testSimpleTypeName() {
+ DiscreteResourceId id = Resources.discrete(D1, P1, VLAN1).id();
+ assertThat(id.simpleTypeName(), is("VlanId"));
+ }
+
+ @Test
+ public void testSimpleTypeNameOfRoot() {
+ assertThat(ResourceId.ROOT.simpleTypeName(), is("Root"));
+ }
}
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceTest.java b/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceTest.java
index 7333ef7..0001c70 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceTest.java
+++ b/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceTest.java
@@ -91,14 +91,6 @@
}
@Test
- public void testBase() {
- DiscreteResource resource = Resources.discrete(D1).resource();
-
- DeviceId child = (DeviceId) resource.last();
- assertThat(child, is(D1));
- }
-
- @Test
public void testValueAs() {
DiscreteResource resource = Resources.discrete(D1).resource();