summaryrefslogtreecommitdiffstats
path: root/models-interactions/model-actors/actorServiceProvider/src/test
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-02-29 13:20:06 -0500
committerJim Hahn <jrh3@att.com>2020-02-29 13:22:48 -0500
commitf583aa9031e4f73ae0004bf972ac7a6c3afa4b71 (patch)
treefd4a02ba054118ef79c589a263376b13fe441a0c /models-interactions/model-actors/actorServiceProvider/src/test
parentda47a120294d931bde38d821df8979813564e05c (diff)
Add sequence number to Actors
When actors with duplicate names are loaded, a way is needed to determine which should take precedence. Added a sequence number to Actor to facilitate this. Unfortunately, couldn't use OrderedServiceImpl, because it only creates the Actors once, which would break a number of junit tests. Issue-ID: POLICY-1625 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I1ade92f4fe516cfc54bb92d0a3624c67e8981075
Diffstat (limited to 'models-interactions/model-actors/actorServiceProvider/src/test')
-rw-r--r--models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceTest.java16
-rw-r--r--models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/ActorImplTest.java1
2 files changed, 15 insertions, 2 deletions
diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceTest.java
index 401e0ca58..0f282f662 100644
--- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceTest.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceTest.java
@@ -91,15 +91,27 @@ public class ActorServiceTest {
}
@Test
- public void testActorService() {
+ public void testActorService_testBuildList() {
/*
* make a service where actors two and four have names that are duplicates of the
* others
*/
+
+ /*
+ * actor0 has a higher sequence number than actor1, so it should be discarded,
+ * even though it will be examined first
+ */
+ Actor actor0 = spy(new ActorImpl(ACTOR1) {
+ @Override
+ public int getSequenceNumber() {
+ return 10000;
+ }
+ });
+
actor2 = spy(new ActorImpl(ACTOR1));
actor4 = spy(new ActorImpl(ACTOR3));
- service = makeService(actor1, actor2, actor3, actor4);
+ service = makeService(actor0, actor1, actor2, actor3, actor4);
assertEquals(2, service.getActorNames().size());
diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/ActorImplTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/ActorImplTest.java
index 92cbbe774..681378de4 100644
--- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/ActorImplTest.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/ActorImplTest.java
@@ -93,6 +93,7 @@ public class ActorImplTest {
public void testActorImpl_testGetName() {
assertEquals(ACTOR_NAME, actor.getName());
assertEquals(4, actor.getOperationNames().size());
+ assertEquals(0, actor.getSequenceNumber());
}
@Test