diff options
author | Ashlee Young <ashlee@onosfw.com> | 2015-10-09 18:32:44 -0700 |
---|---|---|
committer | Ashlee Young <ashlee@onosfw.com> | 2015-10-09 18:32:44 -0700 |
commit | 6a07d2d622eaa06953f3353e39c080984076e8de (patch) | |
tree | bfb50a2090fce186c2cc545a400c969bf2ea702b /framework/src/onos/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java | |
parent | e6d71622143ff9b2421a1abbe8434b954b5b1099 (diff) |
Updated master to commit id 6ee8aa3e67ce89908a8c93aa9445c6f71a18f986
Change-Id: I94b055ee2f298daf71e2ec794fd0f2495bd8081f
Diffstat (limited to 'framework/src/onos/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java')
-rw-r--r-- | framework/src/onos/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/framework/src/onos/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java b/framework/src/onos/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java index e0c0c868..76caebcb 100644 --- a/framework/src/onos/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java +++ b/framework/src/onos/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java @@ -130,7 +130,7 @@ public class MeterManagerTest { m2 = DefaultMeter.builder() .forDevice(did("2")) .fromApp(APP_ID) - .withId(MeterId.meterId(2)) + .withId(MeterId.meterId(1)) .withUnit(Meter.Unit.KB_PER_SEC) .withBands(Collections.singletonList(band)) .build(); @@ -167,7 +167,7 @@ public class MeterManagerTest { assertTrue("The meter was not added", manager.getAllMeters().size() == 1); - assertThat(manager.getMeter(MeterId.meterId(1)), is(m1)); + assertThat(manager.getMeter(did("1"), MeterId.meterId(1)), is(m1)); } @Test @@ -175,7 +175,7 @@ public class MeterManagerTest { manager.submit(m1Request.add()); manager.withdraw(m1Request.remove(), m1.id()); - assertThat(manager.getMeter(MeterId.meterId(1)).state(), + assertThat(manager.getMeter(did("1"), MeterId.meterId(1)).state(), is(MeterState.PENDING_REMOVE)); providerService.pushMeterMetrics(m1.deviceId(), Collections.emptyList()); @@ -184,7 +184,16 @@ public class MeterManagerTest { } + @Test + public void testMultipleDevice() { + manager.submit(m1Request.add()); + manager.submit(m2Request.add()); + assertTrue("The meters were not added", manager.getAllMeters().size() == 2); + + assertThat(manager.getMeter(did("1"), MeterId.meterId(1)), is(m1)); + assertThat(manager.getMeter(did("2"), MeterId.meterId(1)), is(m2)); + } public class TestApplicationId extends DefaultApplicationId { public TestApplicationId(int id, String name) { |