/*-
* ============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.List;
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.ToscaDataType;
public class JpaToscaDataTypesTest {
assertThatThrownBy(() -> new JpaToscaDataTypes(null, new TreeMap<PfConceptKey, JpaToscaDataType>()))
.hasMessageMatching(KEY_IS_NULL);
+ }
+ @Test
+ public void testDerivedDataTypes() {
List<Map<String, ToscaDataType>> dtMapList = new ArrayList<>();
dtMapList.add(new LinkedHashMap<>());
dtMapList.get(0).put("dt0", dt0);
assertNotNull(new JpaToscaDataTypes(dtMapList));
- assertTrue(new JpaToscaDataTypes(dtMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaDataTypes(dtMapList).validate("").isValid());
assertThatThrownBy(() -> new JpaToscaDataTypes(dtMapList).validate(null))
- .hasMessageMatching("resultIn is marked .*on.*ull but is null");
+ .hasMessageMatching("fieldName is marked .*on.*ull but is null");
dt0.setDerivedFrom(null);
- assertTrue(new JpaToscaDataTypes(dtMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaDataTypes(dtMapList).validate("").isValid());
dt0.setDerivedFrom("tosca.datatypes.Root");
- assertTrue(new JpaToscaDataTypes(dtMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaDataTypes(dtMapList).validate("").isValid());
dt0.setDerivedFrom("some.other.Thing");
- PfValidationResult result = new JpaToscaDataTypes(dtMapList).validate(new PfValidationResult());
+ BeanValidationResult result = new JpaToscaDataTypes(dtMapList).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);
dt0.setDerivedFrom(null);
- assertTrue(new JpaToscaDataTypes(dtMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaDataTypes(dtMapList).validate("").isValid());
ToscaDataType dt1 = new ToscaDataType();
dt1.setName("dt1");
dt1.setDescription("dt1 description");
dtMapList.get(0).put("dt1", dt1);
- assertTrue(new JpaToscaDataTypes(dtMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaDataTypes(dtMapList).validate("").isValid());
dt1.setDerivedFrom("dt0");
- assertTrue(new JpaToscaDataTypes(dtMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaDataTypes(dtMapList).validate("").isValid());
dt1.setDerivedFrom("dt2");
- result = new JpaToscaDataTypes(dtMapList).validate(new PfValidationResult());
+ result = new JpaToscaDataTypes(dtMapList).validate("");
assertFalse(result.isValid());
- assertThat(result.toString()).contains("parent dt2:0.0.0 of entity not found");
+ assertThat(result.getResult()).contains("parent").contains("dt2:0.0.0").contains(Validated.NOT_FOUND);
dt1.setDerivedFrom("dt0");
- assertTrue(new JpaToscaDataTypes(dtMapList).validate(new PfValidationResult()).isValid());
+ assertTrue(new JpaToscaDataTypes(dtMapList).validate("").isValid());
}
}