Code Review
/
policy
/
models.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove commons-io dependency from models"
[policy/models.git]
/
models-interactions
/
model-actors
/
actorServiceProvider
/
src
/
test
/
java
/
org
/
onap
/
policy
/
controlloop
/
actorserviceprovider
/
impl
/
HttpActorTest.java
diff --git
a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpActorTest.java
b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpActorTest.java
index
80b1d42
..
5407f1f
100644
(file)
--- a/
models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpActorTest.java
+++ b/
models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpActorTest.java
@@
-40,11
+40,11
@@
public class HttpActorTest {
private static final String CLIENT = "my-client";
private static final int TIMEOUT = 10;
private static final String CLIENT = "my-client";
private static final int TIMEOUT = 10;
- private HttpActor actor;
+ private HttpActor
<HttpActorParams>
actor;
@Before
public void setUp() {
@Before
public void setUp() {
- actor = new HttpActor
(ACTOR
);
+ actor = new HttpActor
<>(ACTOR, HttpActorParams.class
);
}
@Test
}
@Test
@@
-54,12
+54,12
@@
public class HttpActorTest {
params.setTimeoutSec(TIMEOUT);
// @formatter:off
params.setTimeoutSec(TIMEOUT);
// @formatter:off
- params.setOperation(Map.of(
+ params.setOperation
s
(Map.of(
"operA", Map.of("path", "urlA"),
"operB", Map.of("path", "urlB")));
// @formatter:on
"operA", Map.of("path", "urlA"),
"operB", Map.of("path", "urlB")));
// @formatter:on
- final HttpActor
prov = new HttpActor(ACTOR
);
+ final HttpActor
<HttpActorParams> prov = new HttpActor<>(ACTOR, HttpActorParams.class
);
Function<String, Map<String, Object>> maker =
prov.makeOperatorParameters(Util.translateToMap(prov.getName(), params));
Function<String, Map<String, Object>> maker =
prov.makeOperatorParameters(Util.translateToMap(prov.getName(), params));
@@
-73,8
+73,9
@@
public class HttpActorTest {
new TreeMap<>(maker.apply("operB")).toString());
// with invalid actor parameters
new TreeMap<>(maker.apply("operB")).toString());
// with invalid actor parameters
- params.setOperation(null);
- assertThatThrownBy(() -> prov.makeOperatorParameters(Util.translateToMap(prov.getName(), params)))
+ params.setOperations(null);
+ Map<String, Object> map = Util.translateToMap(prov.getName(), params);
+ assertThatThrownBy(() -> prov.makeOperatorParameters(map))
.isInstanceOf(ParameterValidationRuntimeException.class);
}
.isInstanceOf(ParameterValidationRuntimeException.class);
}