From: Jim Hahn <jrh3@att.com>
Date: Thu, 5 Dec 2019 16:42:48 +0000 (+0000)
Subject: Merge "change HealthCheckReport URL from self to hostName"
X-Git-Tag: 2.2.0~33
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=36112574c3f506fe769ba2eed18a77f62c838467;hp=-c;p=policy%2Fapi.git

Merge "change HealthCheckReport URL from self to hostName"
---

36112574c3f506fe769ba2eed18a77f62c838467
diff --combined main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
index 89dba391,4dd88c07..434185a6
--- a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
+++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
@@@ -85,7 -85,7 +85,7 @@@ public class TestApiRestServer 
      private static final Logger LOGGER = LoggerFactory.getLogger(TestApiRestServer.class);
      private static final String NOT_ALIVE = "not alive";
      private static final String ALIVE = "alive";
-     private static final String SELF = "self";
+     private static final String SELF = NetworkUtil.getHostname();
      private static final String NAME = "Policy API";
      private static final String APP_JSON = "application/json";
      private static final String APP_YAML = "application/yaml";
@@@ -704,7 -704,7 +704,7 @@@
          Response rawResponse = readResource(POLICYTYPES, true, APP_JSON);
          assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
          ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
 -        assertEquals(21, response.getPolicyTypes().size());
 +        assertEquals(25, response.getPolicyTypes().size());
      }
  
      @Test
@@@ -714,7 -714,7 +714,7 @@@
          Response rawResponse = readResource(POLICYTYPES, true, APP_YAML);
          assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
          ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
 -        assertEquals(21, response.getPolicyTypes().size());
 +        assertEquals(25, response.getPolicyTypes().size());
      }
  
      @Test