diff options
Diffstat (limited to 'plugins/forwarding-plugins/src')
6 files changed, 13 insertions, 16 deletions
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java index 04bcbeaf..6d4ab363 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,11 +39,11 @@ public class LifecycleApiForwarderParametersTest { private static final String POLICY_API_HOST_NAME = "0.0.0.0"; private static final int POLICY_API_PORT = 6969; - private static final String POLICY_API_USER = "healthcheck"; + private static final String POLICY_API_USER = "policyadmin"; private static final String POLICY_API_PASSWORD = "zb!XztG34"; private static final String POLICY_PAP_HOST_NAME = "0.0.0.0"; private static final int POLICY_PAP_PORT = 6969; - private static final String POLICY_PAP_USER = "healthcheck"; + private static final String POLICY_PAP_USER = "policyadmin"; private static final String POLICY_PAP_PASSWORD = "zb!XztG34"; diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java index d9b64ce2..759ec1d3 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2020 AT&T Inc. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -51,8 +51,8 @@ public class LifecycleApiPolicyForwarderTest { private static final String POLICY = "src/test/resources/parameters/sample_policy.json"; private static final String POLICY_ERROR = "src/test/resources/parameters/sample_policy_failure.json"; private static final String POLICY_TYPE = "src/test/resources/parameters/sample_policy_type.json"; - private StandardCoder standardCoder = new StandardCoder(); - private static LifecycleApiSimulatorMain simulator = new LifecycleApiSimulatorMain(); + private final StandardCoder standardCoder = new StandardCoder(); + private static final LifecycleApiSimulatorMain simulator = new LifecycleApiSimulatorMain(); /** * Set up. @@ -126,7 +126,7 @@ public class LifecycleApiPolicyForwarderTest { .hasMessageContaining("Failed forwarding the following entities:"); } - class UnsupportedPolicy extends ToscaEntity { + static class UnsupportedPolicy extends ToscaEntity { @Override public String getName() { diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/CommonTestData.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/CommonTestData.java index 72edc123..2273cec5 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/CommonTestData.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/CommonTestData.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,6 @@ package org.onap.policy.distribution.forwarding.testclasses; import java.io.File; -import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; @@ -32,8 +31,6 @@ import org.onap.policy.common.utils.coder.StandardCoder; */ public class CommonTestData { - public static final Coder coder = new StandardCoder(); - /** * Returns PolicyForwarderParameters for test cases. * diff --git a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json index ba6058b2..13e4d881 100644 --- a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json +++ b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json @@ -4,7 +4,7 @@ "hostname": "0.0.0.0", "port": 6969, "useHttps": false, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "papParameters": { @@ -12,7 +12,7 @@ "hostname": "0.0.0.0", "port": 6969, "useHttps": false, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "deployPolicies": true diff --git a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json index 88dd74ba..8ac97323 100644 --- a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json +++ b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json @@ -4,7 +4,7 @@ "hostname": "", "port": -1, "useHttps": false, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "papParameters": { @@ -12,7 +12,7 @@ "hostname": "", "port": -2, "useHttps": false, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" }, "deployPolicies": true diff --git a/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json b/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json index 86aee276..8d3bc580 100644 --- a/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json +++ b/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json @@ -1,6 +1,6 @@ { "host": "0.0.0.0", "port": 6969, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34" } |