Merge "Sonar Fix: NotifyApprovals.java"

[aaf/authz.git] / cadi / core / src / test / java / org / onap / aaf / cadi / config / test / JU_RegistrationPropHolder.java

diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_RegistrationPropHolder.java b/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_RegistrationPropHolder.java
index f3e05d9..18e26f5 100644 (file)
--- a/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_RegistrationPropHolder.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_RegistrationPropHolder.java
@@ -85,12 +85,6 @@ public class JU_RegistrationPropHolder {
                        String ns2 = "onap";
                        pa.setProperty(Config.AAF_LOCATOR_NS+".helm", ns2);
                        for(String dot_le : new String[] {"",".helm"}) {
-                               String pns;
-                               if(dot_le.isEmpty()) {
-                                       pns = ns;
-                               } else {
-                                       pns = ns2;
-                               }
                                assertEquals(rph.hostname,rph.default_fqdn);
                                assertEquals("",rph.lcontainer);
                                assertEquals(rph.hostname,rph.public_hostname);
@@ -136,8 +130,8 @@ public class JU_RegistrationPropHolder {
                        target = "mycontns.org.osaaf.aaf.theName";
                        assertEquals(target,rph.replacements(fqdn, name, ".hello"));
                        
-                       pa.setProperty(Config.AAF_LOCATOR_CONTAINER+".hello","hello");
-                       target = "hello.mycontns.org.osaaf.aaf.theName";
+                       pa.setProperty(Config.AAF_LOCATOR_CONTAINER+".hello","helloC");
+                       target = "helloC.mycontns.org.osaaf.aaf.theName";
                        assertEquals(target,rph.replacements(fqdn, name, ".hello"));
                        
                        pa.setProperty(Config.AAF_LOCATOR_CONTAINER_NS,"c_ns");