/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2020 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import java.util.Map;
import java.util.TreeMap;
import org.junit.Test;
+import org.onap.policy.common.parameters.BeanValidationResult;
import org.onap.policy.models.base.PfConceptKey;
-import org.onap.policy.models.base.PfValidationResult;
+import org.onap.policy.models.base.Validated;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType;
public class JpaToscaPolicyTypesTest {
private static final String KEY_IS_NULL = "key is marked .*on.*ull but is null";
@Test
- public void testPolicyTypes() {
+ public void testPolicyTypesNull() {
assertNotNull(new JpaToscaPolicyTypes());
assertNotNull(new JpaToscaPolicyTypes(new PfConceptKey()));
assertNotNull(new JpaToscaPolicyTypes(new PfConceptKey(), new TreeMap<PfConceptKey, JpaToscaPolicyType>()));
assertThatThrownBy(() -> new JpaToscaPolicyTypes(null, new TreeMap<PfConceptKey, JpaToscaPolicyType>()))
.hasMessageMatching(KEY_IS_NULL);
+ }
+ @Test
+ public void testPolicyTypes() {
List<Map<String, ToscaPolicyType>> ptMapList = new ArrayList<>();
ptMapList.add(new LinkedHashMap<>());
ptMapList.get(0).put("pt0", pt0);
assertNotNull(new JpaToscaPolicyTypes(ptMapList));
- assertTrue(new JpaToscaPolicyTypes(ptMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
assertThatThrownBy(() -> new JpaToscaPolicyTypes(ptMapList).validate(null))
- .hasMessageMatching("resultIn is marked .*on.*ull but is null");
+ .hasMessageMatching("fieldName is marked .*on.*ull but is null");
pt0.setDerivedFrom(null);
- assertTrue(new JpaToscaPolicyTypes(ptMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
pt0.setDerivedFrom("tosca.PolicyTypes.Root");
- assertTrue(new JpaToscaPolicyTypes(ptMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
pt0.setDerivedFrom("some.other.Thing");
- PfValidationResult result = new JpaToscaPolicyTypes(ptMapList).validate(new PfValidationResult());
+ BeanValidationResult result = new JpaToscaPolicyTypes(ptMapList).validate("");
assertFalse(result.isValid());
- assertThat(result.toString()).contains("parent some.other.Thing:0.0.0 of entity not found");
+ assertThat(result.getResult()).contains("parent").contains("some.other.Thing:0.0.0")
+ .contains(Validated.NOT_FOUND);
pt0.setDerivedFrom(null);
- assertTrue(new JpaToscaPolicyTypes(ptMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
ToscaPolicyType pt1 = new ToscaPolicyType();
pt1.setName("pt1");
pt1.setDescription("pt1 description");
ptMapList.get(0).put("pt1", pt1);
- assertTrue(new JpaToscaPolicyTypes(ptMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
pt1.setDerivedFrom("pt0");
- assertTrue(new JpaToscaPolicyTypes(ptMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
pt1.setDerivedFrom("pt2");
- result = new JpaToscaPolicyTypes(ptMapList).validate(new PfValidationResult());
+ result = new JpaToscaPolicyTypes(ptMapList).validate("");
assertFalse(result.isValid());
- assertThat(result.toString()).contains("parent pt2:0.0.0 of entity not found");
+ assertThat(result.getResult()).contains("parent").contains("pt2:0.0.0").contains(Validated.NOT_FOUND);
pt1.setDerivedFrom("pt0");
- assertTrue(new JpaToscaPolicyTypes(ptMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaPolicyTypes(ptMapList).validate("").isValid());
}
}