commit 9c02f3af023be5a2cb1458773db61d0220ea84d3
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri Jan 29 15:11:59 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Feb 10 02:59:33 2016 +0000
tree d39c8b0f3bfbb73362f2e1a217905208fe1b6d7a
parent c4f320af8a6a66a4642f8381ede0b583a3556aa2

Hide underlying components from public use

- Remove components() method from Resource
- Add isTypeOf() method to Resource

Change-Id: I390eb6057fc7e2c3e93eb2a18d161f661ad6c180

core/api/src/test/java/org/onosproject/net/newresource/ResourceTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ResourceTest.java b/core/api/src/test/java/org/onosproject/net/newresource/ResourceTest.java
index 59f327f..838c898 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ResourceTest.java
+++ b/core/api/src/test/java/org/onosproject/net/newresource/ResourceTest.java
@@ -24,7 +24,6 @@
 
 import java.util.Optional;
 
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
@@ -53,13 +52,6 @@
     }
 
     @Test
-    public void testComponents() {
-        Resource port = Resources.discrete(D1, P1).resource();
-
-        assertThat(port.components(), contains(D1, P1));
-    }
-
-    @Test
     public void testIdEquality() {
         ResourceId id1 = Resources.discrete(D1, P1, VLAN1).id();
         ResourceId sameAsId1 = Resources.discrete(D1, P1, VLAN1).id();
@@ -98,6 +90,21 @@
     }
 
     @Test
+    public void testTypeOf() {
+        DiscreteResource discrete = Resources.discrete(D1, P1, VLAN1).resource();
+        assertThat(discrete.isTypeOf(DeviceId.class), is(true));
+        assertThat(discrete.isTypeOf(PortNumber.class), is(true));
+        assertThat(discrete.isTypeOf(VlanId.class), is(true));
+        assertThat(discrete.isTypeOf(Bandwidth.class), is(false));
+
+        ContinuousResource continuous = Resources.continuous(D1, P1, Bandwidth.class).resource(BW1.bps());
+        assertThat(continuous.isTypeOf(DeviceId.class), is(true));
+        assertThat(continuous.isTypeOf(PortNumber.class), is(true));
+        assertThat(continuous.isTypeOf(Bandwidth.class), is(true));
+        assertThat(continuous.isTypeOf(VlanId.class), is(false));
+    }
+
+    @Test
     public void testBase() {
         Resource resource = Resources.discrete(D1).resource();