summaryrefslogtreecommitdiffstats
path: root/models-interactions/model-actors/actorServiceProvider/src/test
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-03-06 14:00:58 -0500
committerJim Hahn <jrh3@att.com>2020-03-06 15:13:52 -0500
commit3c1fb89886d7ebf2efe1183e92b4ed8191f506b4 (patch)
tree6515fccb8b937630aaf8fff6490c483177a414ed /models-interactions/model-actors/actorServiceProvider/src/test
parent8021fe6aa24b4a4c586cda78255c143eca3e3520 (diff)
Log full URL for REST calls
Actors only log the URI, without the host and port info. Modified to log the full URL. Also adjusted URLs for trailing "/". Issue-ID: POLICY-1625 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I0c9a2d139258ef23bc363a873b56f5cb4680247d
Diffstat (limited to 'models-interactions/model-actors/actorServiceProvider/src/test')
-rw-r--r--models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java22
1 files changed, 11 insertions, 11 deletions
diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java
index 2e9f58cbc..81238defa 100644
--- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java
@@ -216,8 +216,8 @@ public class HttpOperationTest {
}
@Test
- public void testMakePath() {
- assertEquals(PATH, oper.makePath());
+ public void testGetPath() {
+ assertEquals(PATH, oper.getPath());
}
@Test
@@ -227,7 +227,7 @@ public class HttpOperationTest {
oper = new MyGetOperation<>(String.class);
- assertThat(oper.makeUrl()).endsWith("/" + BASE_URI + PATH);
+ assertThat(oper.getUrl()).endsWith("/" + BASE_URI + PATH);
}
@Test
@@ -503,13 +503,13 @@ public class HttpOperationTest {
Map<String, Object> headers = makeHeaders();
headers.put("Accept", MediaType.APPLICATION_JSON);
- String url = makeUrl();
+ String url = getUrl();
logMessage(EventType.OUT, CommInfrastructure.REST, url, null);
// @formatter:off
return handleResponse(outcome, url,
- callback -> getClient().get(callback, makePath(), headers));
+ callback -> getClient().get(callback, getPath(), headers));
// @formatter:on
}
}
@@ -529,13 +529,13 @@ public class HttpOperationTest {
Map<String, Object> headers = makeHeaders();
headers.put("Accept", MediaType.APPLICATION_JSON);
- String url = makeUrl();
+ String url = getUrl();
logMessage(EventType.OUT, CommInfrastructure.REST, url, request);
// @formatter:off
return handleResponse(outcome, url,
- callback -> getClient().post(callback, makePath(), entity, headers));
+ callback -> getClient().post(callback, getPath(), entity, headers));
// @formatter:on
}
}
@@ -555,13 +555,13 @@ public class HttpOperationTest {
Map<String, Object> headers = makeHeaders();
headers.put("Accept", MediaType.APPLICATION_JSON);
- String url = makeUrl();
+ String url = getUrl();
logMessage(EventType.OUT, CommInfrastructure.REST, url, request);
// @formatter:off
return handleResponse(outcome, url,
- callback -> getClient().put(callback, makePath(), entity, headers));
+ callback -> getClient().put(callback, getPath(), entity, headers));
// @formatter:on
}
}
@@ -576,13 +576,13 @@ public class HttpOperationTest {
Map<String, Object> headers = makeHeaders();
headers.put("Accept", MediaType.APPLICATION_JSON);
- String url = makeUrl();
+ String url = getUrl();
logMessage(EventType.OUT, CommInfrastructure.REST, url, null);
// @formatter:off
return handleResponse(outcome, url,
- callback -> getClient().delete(callback, makePath(), headers));
+ callback -> getClient().delete(callback, getPath(), headers));
// @formatter:on
}
}