commit | fc932d509fe2b959c96b994a3f943ed93df1a2be | [log] [tgz] |
---|---|---|
author | Sho SHIMIZU <shimizu.sho@jp.fujitsu.com> | Fri Aug 15 11:22:37 2014 -0700 |
committer | Gerrit Code Review <gerrit2@localhost> | Fri Aug 15 12:47:07 2014 -0700 |
tree | 73c24d6591cc705df618b68945b6ab7a3972396a | |
parent | 73f4234ebecd706a4238d55d9576133a53b99287 [diff] |
Refactor IdBlcok: move to core.util package Change-Id: Ibe0b3fe82d851a6549e33af1e4dc675f47a814b8
diff --git a/src/test/java/net/onrc/onos/core/newintent/IdBlockAllocatorBasedIntentIdGeneratorTest.java b/src/test/java/net/onrc/onos/core/newintent/IdBlockAllocatorBasedIntentIdGeneratorTest.java index 97394bd..b1aa1e2 100644 --- a/src/test/java/net/onrc/onos/core/newintent/IdBlockAllocatorBasedIntentIdGeneratorTest.java +++ b/src/test/java/net/onrc/onos/core/newintent/IdBlockAllocatorBasedIntentIdGeneratorTest.java
@@ -1,7 +1,7 @@ package net.onrc.onos.core.newintent; import net.onrc.onos.api.newintent.IntentId; -import net.onrc.onos.core.registry.IdBlock; +import net.onrc.onos.core.util.IdBlock; import net.onrc.onos.core.util.IdBlockAllocator; import org.junit.Before; import org.junit.Test;
diff --git a/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java b/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java index 79cc0e8..d57c3aa 100644 --- a/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java +++ b/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java
@@ -18,6 +18,7 @@ import net.floodlightcontroller.core.module.FloodlightModuleContext; import net.onrc.onos.core.registry.IControllerRegistryService.ControlChangeCallback; +import net.onrc.onos.core.util.IdBlock; import net.onrc.onos.core.util.OnosInstanceId; import org.junit.After;
diff --git a/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java b/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java index b13993b..e6e4e72 100644 --- a/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java +++ b/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java
@@ -9,6 +9,7 @@ import net.floodlightcontroller.test.FloodlightTestCase; import net.onrc.onos.core.registry.StandaloneRegistryTest.LoggingCallback; import net.onrc.onos.core.registry.ZookeeperRegistry.SwitchLeaderListener; +import net.onrc.onos.core.util.IdBlock; import net.onrc.onos.core.util.OnosInstanceId; import org.apache.curator.RetryPolicy;
diff --git a/src/test/java/net/onrc/onos/core/registry/IdBlockTest.java b/src/test/java/net/onrc/onos/core/util/IdBlockTest.java similarity index 89% rename from src/test/java/net/onrc/onos/core/registry/IdBlockTest.java rename to src/test/java/net/onrc/onos/core/util/IdBlockTest.java index aec55fa..ce6f3ea 100644 --- a/src/test/java/net/onrc/onos/core/registry/IdBlockTest.java +++ b/src/test/java/net/onrc/onos/core/util/IdBlockTest.java
@@ -1,6 +1,5 @@ -package net.onrc.onos.core.registry; +package net.onrc.onos.core.util; -import net.onrc.onos.core.util.UnavailableIdException; import org.junit.Test; import static org.hamcrest.Matchers.is;