Bump policy/models to 2.3.1-SNAPSHOT

[policy/models.git] / models-interactions / model-actors / actorServiceProvider / src / test / java / org / onap / policy / controlloop / actorserviceprovider / ActorServiceProviderTest.java

diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java
index 3354a22..abf156b 100644 (file)
--- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2018 Ericsson. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,32 +24,38 @@ package org.onap.policy.controlloop.actorserviceprovider;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
 
+// TODO combine this with ActorServiceTest
+
 public class ActorServiceProviderTest {
 
+    private static final String DOROTHY = "Dorothy";
+
     @Test
     public void testActorServiceProvider() {
-        ActorService actorService = ActorService.getInstance();
-        assertNotNull(actorService);
+        ActorService actorService = new ActorService();
 
-        assertEquals(1, actorService.actors().size());
+        assertTrue(actorService.getActors().size() >= 1);
 
-        actorService = ActorService.getInstance();
-        assertNotNull(actorService);
-
-        Actor dummyActor = ActorService.getInstance().actors().get(0);
-        assertNotNull(dummyActor);
+        Actor dummyActor = actorService.getActor(DummyActor.class.getSimpleName());
 
         assertEquals("DummyActor", dummyActor.actor());
 
         assertEquals(2, dummyActor.recipes().size());
-        assertEquals("Dorothy", dummyActor.recipes().get(0));
+        assertEquals(DOROTHY, dummyActor.recipes().get(0));
         assertEquals("Wizard", dummyActor.recipes().get(1));
 
-        assertEquals(2, dummyActor.recipeTargets("Dorothy").size());
-        assertEquals(2, dummyActor.recipePayloads("Dorothy").size());
+        assertEquals(2, dummyActor.recipeTargets(DOROTHY).size());
+        assertEquals(2, dummyActor.recipePayloads(DOROTHY).size());
+
+        // verify that we get a new actor object if we create a new service
+        Actor dummyActor2 = new ActorService().getActor(DummyActor.class.getSimpleName());
+        assertNotNull(dummyActor2);
+        assertNotSame(dummyActor, dummyActor2);
     }
 }