commit 63feca7d268441465d9125468e21dea23854e1f6
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu May 07 10:44:25 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri May 08 23:08:36 2015 +0000
tree 0fb73aa54a11f5bac1c84213ddcb2df8fd0ff9eb
parent 816977987d1236fa66a197185f766a6e3a47c71c

Rename Bandwidth to BandwidthResource

To distinguish unit of bandwidth and resource of bandwidth

Change-Id: Ice52538f0c00f6d7743ca247d0f9bab3febdc94b

core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java

diff --git a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
index 98ee193..94aa5ee 100644
--- a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
+++ b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
@@ -24,6 +24,7 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.onlab.util.Bandwidth;
 import org.onlab.util.Frequency;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.cluster.RoleInfo;
@@ -58,7 +59,7 @@
 import org.onosproject.net.flow.FlowRuleBatchEntry;
 import org.onosproject.net.intent.IntentId;
 import org.onosproject.net.provider.ProviderId;
-import org.onosproject.net.resource.Bandwidth;
+import org.onosproject.net.resource.BandwidthResource;
 import org.onosproject.net.resource.BandwidthResourceAllocation;
 import org.onosproject.net.resource.DefaultLinkResourceAllocations;
 import org.onosproject.net.resource.DefaultLinkResourceRequest;
@@ -354,7 +355,7 @@
                         .build();
         Map<Link, Set<ResourceAllocation>> allocations = new HashMap<>();
         allocations.put(new DefaultLink(PID, CP1, CP2, Type.DIRECT),
-                        ImmutableSet.of(new BandwidthResourceAllocation(Bandwidth.bps(10.0)),
+                        ImmutableSet.of(new BandwidthResourceAllocation(BandwidthResource.bps(10.0)),
                                         new LambdaResourceAllocation(LambdaResource.valueOf(1))));
         testSerializable(new DefaultLinkResourceAllocations(request, allocations));
     }
@@ -367,7 +368,7 @@
 
     @Test
     public void testBandwidth() {
-        testSerializedEquals(org.onlab.util.Bandwidth.mbps(1000.0));
+        testSerializedEquals(Bandwidth.mbps(1000.0));
     }
 
     @Test
@@ -377,7 +378,7 @@
 
     @Test
     public void testBandwidthConstraint() {
-        testSerializable(new BandwidthConstraint(Bandwidth.bps(1000.0)));
+        testSerializable(new BandwidthConstraint(BandwidthResource.bps(1000.0)));
     }
 
     @Test