/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2021-2022 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
import org.junit.AfterClass;
import org.junit.Before;
fsm.deployedPolicyAction(opPolicy);
fsm.deployedPolicyAction(controllerPolicy);
- assertEquals(List.of(opPolicy, controllerPolicy), fsm.getActivePolicies());
- assertEquals(List.of(opPolicy, controllerPolicy), fsm.mergePolicies(List.of(), List.of()));
- assertEquals(List.of(opPolicy), fsm.mergePolicies(List.of(), List.of(controllerPolicy.getIdentifier())));
-
- assertEquals(List.of(controllerPolicy, op2Policy, valPolicy, opPolicy, unvalPolicy),
- fsm.mergePolicies(List.of(op2Policy, valPolicy, unvalPolicy), List.of()));
- assertEquals(List.of(controllerPolicy, op2Policy, valPolicy, opPolicy, unvalPolicy),
- fsm.mergePolicies(List.of(controllerPolicy, opPolicy, op2Policy, valPolicy, unvalPolicy), List.of()));
- assertEquals(List.of(op2Policy, valPolicy, unvalPolicy),
- fsm.mergePolicies(List.of(op2Policy, valPolicy, unvalPolicy),
- List.of(controllerPolicy.getIdentifier(), opPolicy.getIdentifier())));
+ assertEquals(Set.of(opPolicy, controllerPolicy), toSet(fsm.getActivePolicies()));
+ assertEquals(Set.of(opPolicy, controllerPolicy), toSet(fsm.mergePolicies(List.of(), List.of())));
+ assertEquals(Set.of(opPolicy), toSet(fsm.mergePolicies(List.of(), List.of(controllerPolicy.getIdentifier()))));
+
+ assertEquals(Set.of(controllerPolicy, op2Policy, valPolicy, opPolicy, unvalPolicy),
+ toSet(fsm.mergePolicies(List.of(op2Policy, valPolicy, unvalPolicy), List.of())));
+ assertEquals(Set.of(controllerPolicy, op2Policy, valPolicy, opPolicy, unvalPolicy),
+ toSet(fsm.mergePolicies(List.of(controllerPolicy, opPolicy, op2Policy, valPolicy, unvalPolicy),
+ List.of())));
+ assertEquals(Set.of(op2Policy, valPolicy, unvalPolicy),
+ toSet(fsm.mergePolicies(List.of(op2Policy, valPolicy, unvalPolicy),
+ List.of(controllerPolicy.getIdentifier(), opPolicy.getIdentifier()))));
+ }
+
+ private Set<ToscaPolicy> toSet(List<ToscaPolicy> policies) {
+ return Set.copyOf(policies);
+
}
@Test
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2020,2022 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
assertEquals("lifecycle", domainDroolsPolicy.getProperties().getRulesArtifact().getArtifactId());
assertEquals("1.0.0", domainDroolsPolicy.getProperties().getRulesArtifact().getVersion());
- String policyId = toscaPolicy.getMetadata().remove("policy-id");
+ String policyId = "" + toscaPolicy.getMetadata().remove("policy-id");
assertThatThrownBy(() -> domainMaker.convertTo(toscaPolicy, NativeArtifactPolicy.class))
.isInstanceOf(CoderException.class).hasCauseInstanceOf(ValidationFailedException.class);