aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common
diff options
context:
space:
mode:
Diffstat (limited to 'controlloop/common')
-rw-r--r--controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java16
-rw-r--r--controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/DummyActor.java (renamed from controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/TestActor.java)2
-rw-r--r--controlloop/common/actors/actorServiceProvider/src/test/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor2
-rw-r--r--controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/SupportUtil.java (renamed from controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/Util.java)2
-rw-r--r--controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java8
-rw-r--r--controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java6
-rw-r--r--controlloop/common/guard/src/test/java/org/onap/policy/guard/GuardUtilTest.java4
-rw-r--r--controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java16
-rw-r--r--controlloop/common/guard/src/test/java/org/onap/policy/guard/SupportTextFileUtils.java (renamed from controlloop/common/guard/src/test/java/org/onap/policy/guard/TextFileUtils.java)2
9 files changed, 29 insertions, 29 deletions
diff --git a/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java b/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java
index a70216d1e..4e50d855f 100644
--- a/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java
+++ b/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java
@@ -38,16 +38,16 @@ public class ActorServiceProviderTest {
actorService = ActorService.getInstance();
assertNotNull(actorService);
- Actor testActor = ActorService.getInstance().actors().get(0);
- assertNotNull(testActor);
+ Actor dummyActor = ActorService.getInstance().actors().get(0);
+ assertNotNull(dummyActor);
- assertEquals("TestActor", testActor.actor());
+ assertEquals("DummyActor", dummyActor.actor());
- assertEquals(2, testActor.recipes().size());
- assertEquals("Dorothy", testActor.recipes().get(0));
- assertEquals("Wizard", testActor.recipes().get(1));
+ assertEquals(2, dummyActor.recipes().size());
+ assertEquals("Dorothy", dummyActor.recipes().get(0));
+ assertEquals("Wizard", dummyActor.recipes().get(1));
- assertEquals(2, testActor.recipeTargets("Dorothy").size());
- assertEquals(2, testActor.recipePayloads("Dorothy").size());
+ assertEquals(2, dummyActor.recipeTargets("Dorothy").size());
+ assertEquals(2, dummyActor.recipePayloads("Dorothy").size());
}
}
diff --git a/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/TestActor.java b/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/DummyActor.java
index af04cc138..2e8512411 100644
--- a/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/TestActor.java
+++ b/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/DummyActor.java
@@ -25,7 +25,7 @@ import java.util.List;
import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
-public class TestActor implements Actor {
+public class DummyActor implements Actor {
@Override
public String actor() {
return this.getClass().getSimpleName();
diff --git a/controlloop/common/actors/actorServiceProvider/src/test/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor b/controlloop/common/actors/actorServiceProvider/src/test/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
index a15871456..2a4bb5749 100644
--- a/controlloop/common/actors/actorServiceProvider/src/test/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
+++ b/controlloop/common/actors/actorServiceProvider/src/test/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
@@ -1 +1 @@
-org.onap.policy.controlloop.actorserviceprovider.TestActor \ No newline at end of file
+org.onap.policy.controlloop.actorserviceprovider.DummyActor \ No newline at end of file
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/Util.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/SupportUtil.java
index ced419a04..39077e3b3 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/Util.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/SupportUtil.java
@@ -33,7 +33,7 @@ import org.onap.policy.controlloop.policy.ControlLoopPolicy;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
-public final class Util {
+public final class SupportUtil {
public static class Pair<A, B> {
public final A key;
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
index 1673df3be..49a6258c1 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
@@ -58,7 +58,7 @@ import org.onap.policy.common.utils.io.Serializer;
import org.onap.policy.controlloop.ControlLoopEventStatus;
import org.onap.policy.controlloop.ControlLoopException;
import org.onap.policy.controlloop.ControlLoopNotificationType;
-import org.onap.policy.controlloop.Util;
+import org.onap.policy.controlloop.SupportUtil;
import org.onap.policy.controlloop.VirtualControlLoopEvent;
import org.onap.policy.controlloop.VirtualControlLoopNotification;
import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager.NEW_EVENT_STATUS;
@@ -124,7 +124,7 @@ public class ControlLoopEventManagerTest {
@Test
public void testAaiVnfInfo() {
- final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
+ final SupportUtil.Pair<ControlLoopPolicy, String> pair = SupportUtil.loadYaml("src/test/resources/test.yaml");
onset.setClosedLoopControlName(pair.key.getControlLoop().getControlLoopName());
try {
AaiGetVnfResponse response = getQueryByVnfId2(
@@ -143,7 +143,7 @@ public class ControlLoopEventManagerTest {
@Test
public void testAaiVnfInfo2() {
- final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
+ final SupportUtil.Pair<ControlLoopPolicy, String> pair = SupportUtil.loadYaml("src/test/resources/test.yaml");
onset.setClosedLoopControlName(pair.key.getControlLoop().getControlLoopName());
try {
AaiGetVnfResponse response = getQueryByVnfName2(
@@ -161,7 +161,7 @@ public class ControlLoopEventManagerTest {
@Test
public void testAaiVserver() {
- final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
+ final SupportUtil.Pair<ControlLoopPolicy, String> pair = SupportUtil.loadYaml("src/test/resources/test.yaml");
onset.setClosedLoopControlName(pair.key.getControlLoop().getControlLoopName());
try {
AaiGetVserverResponse response = getQueryByVserverName2(
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
index dae03aa6e..0afe9d2d3 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
@@ -61,7 +61,7 @@ import org.onap.policy.controlloop.ControlLoopEventStatus;
import org.onap.policy.controlloop.ControlLoopException;
import org.onap.policy.controlloop.ControlLoopNotificationType;
import org.onap.policy.controlloop.ControlLoopTargetType;
-import org.onap.policy.controlloop.Util;
+import org.onap.policy.controlloop.SupportUtil;
import org.onap.policy.controlloop.VirtualControlLoopEvent;
import org.onap.policy.controlloop.VirtualControlLoopNotification;
import org.onap.policy.controlloop.policy.ControlLoopPolicy;
@@ -161,7 +161,7 @@ public class ControlLoopOperationManagerTest {
//
// Load up the policy
//
- final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
+ final SupportUtil.Pair<ControlLoopPolicy, String> pair = SupportUtil.loadYaml("src/test/resources/test.yaml");
onset.setClosedLoopControlName(pair.key.getControlLoop().getControlLoopName());
try {
//
@@ -292,7 +292,7 @@ public class ControlLoopOperationManagerTest {
//
// Load up the policy
//
- final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
+ final SupportUtil.Pair<ControlLoopPolicy, String> pair = SupportUtil.loadYaml("src/test/resources/test.yaml");
onset.setClosedLoopControlName(pair.key.getControlLoop().getControlLoopName());
try {
//
diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/GuardUtilTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/GuardUtilTest.java
index 8fc5a83da..1f7002a7d 100644
--- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/GuardUtilTest.java
+++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/GuardUtilTest.java
@@ -45,7 +45,7 @@ public class GuardUtilTest {
Yaml clYaml = new Yaml(new Constructor(ControlLoopPolicy.class));
String clYamlString = clYaml.dump(clPolicy);
- TextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
+ SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
Pair<ControlLoopPolicy, String> result = Util.loadYaml(tempYamlFile.getCanonicalPath());
@@ -74,7 +74,7 @@ public class GuardUtilTest {
Yaml clYaml = new Yaml(new Constructor(ControlLoopPolicy.class));
String clYamlString = clYaml.dump(clGuardPolicy);
- TextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
+ SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
ControlLoopGuard result = Util.loadYamlGuard(tempYamlFile.getCanonicalPath());
diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java
index 3b517bcc1..dced2889d 100644
--- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java
+++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java
@@ -86,11 +86,11 @@ public class PolicyGuardYamlToXacmlTest {
Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class));
String clYamlString = clYaml.dump(clGuard);
- TextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
+ SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
PolicyGuardYamlToXacml.fromYamlToXacml(tempYamlFile.getCanonicalPath(),
tempXacmlTemplateFile.getCanonicalPath(), tempXacmlOutputFile.getCanonicalPath());
- String result = TextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath());
+ String result = SupportTextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath());
// Assert no mote "${}" are left
assertFalse(result.contains("${"));
@@ -124,11 +124,11 @@ public class PolicyGuardYamlToXacmlTest {
Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class));
String clYamlString = clYaml.dump(clGuard);
- TextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
+ SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
PolicyGuardYamlToXacml.fromYamlToXacml(tempYamlFile.getCanonicalPath(),
tempXacmlTemplateFile.getCanonicalPath(), tempXacmlOutputFile.getCanonicalPath());
- String result = TextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath());
+ String result = SupportTextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath());
// Assert no mote "${}" are left
assertFalse(result.contains("${"));
@@ -184,11 +184,11 @@ public class PolicyGuardYamlToXacmlTest {
Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class));
String clYamlString = clYaml.dump(clGuard);
- TextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
+ SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
PolicyGuardYamlToXacml.fromYamlToXacmlBlacklist(tempYamlFile.getCanonicalPath(),
tempXacmlTemplateFile.getCanonicalPath(), tempXacmlOutputFile.getCanonicalPath());
- String result = TextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath());
+ String result = SupportTextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath());
System.err.println(result);
// Assert no mote "${}" are left
assertFalse(result.contains("${"));
@@ -220,11 +220,11 @@ public class PolicyGuardYamlToXacmlTest {
Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class));
String clYamlString = clYaml.dump(clGuard);
- TextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
+ SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile);
PolicyGuardYamlToXacml.fromYamlToXacmlBlacklist(tempYamlFile.getCanonicalPath(),
tempXacmlTemplateFile.getCanonicalPath(), tempXacmlOutputFile.getCanonicalPath());
- String result = TextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath());
+ String result = SupportTextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath());
System.err.println(result);
// Assert no mote "${}" are left
assertFalse(result.contains("${"));
diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/TextFileUtils.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/SupportTextFileUtils.java
index 46a2762cc..03260ada9 100644
--- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/TextFileUtils.java
+++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/SupportTextFileUtils.java
@@ -31,7 +31,7 @@ import java.io.IOException;
*
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
-public abstract class TextFileUtils {
+public abstract class SupportTextFileUtils {
/**
* Method to return the contents of a text file as a string.
*