summaryrefslogtreecommitdiffstats
path: root/applications/common/src/test/java/org
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2020-11-30 14:12:32 +0000
committerliamfallon <liam.fallon@est.tech>2020-11-30 14:31:59 +0000
commitc20a3f5ffbc0aadeef85505bdb4c5e5263e8e69d (patch)
treee7d1e9a76049eeabbbb3fde531579ec8ea37f8a7 /applications/common/src/test/java/org
parent0cb4533da05a301e294e943b46f46692d53f9dcd (diff)
ToscaEntityType renamed ToscaSchemaDefinition
The TOSCA class ToscaEntityType is renamed to ToscaSchemaDefinition becasue keys as well as entities can have schemas, so the class has more usages than just for entity schemas. Issue-ID: POLICY-2900 Change-Id: I7a1a3a1262078c47eeea1820538ecb6153f5e652 Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'applications/common/src/test/java/org')
-rw-r--r--applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyTypeTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyTypeTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyTypeTest.java
index 508b96ea..e157f174 100644
--- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyTypeTest.java
+++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyTypeTest.java
@@ -48,10 +48,10 @@ import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.coder.StandardYamlCoder;
import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.models.tosca.authorative.concepts.ToscaDataType;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaEntrySchema;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType;
import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaSchemaDefinition;
import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate;
import org.onap.policy.pdp.xacml.application.common.ToscaDictionary;
@@ -128,7 +128,7 @@ public class MatchablePolicyTypeTest implements MatchableCallback {
//
// Unlikely these would be called - just get code coverage on them
//
- ToscaEntrySchema schema = new ToscaEntrySchema();
+ ToscaSchemaDefinition schema = new ToscaSchemaDefinition();
schema.setType("integer");
assertThat(MatchablePolicyType.handlePrimitive("foo", schema)).isNotNull();
schema.setType("float");
@@ -183,7 +183,7 @@ public class MatchablePolicyTypeTest implements MatchableCallback {
assertThatExceptionOfType(ToscaPolicyConversionException.class).isThrownBy(() ->
timestampValue.validate("foo"));
- ToscaEntrySchema schema = new ToscaEntrySchema();
+ ToscaSchemaDefinition schema = new ToscaSchemaDefinition();
schema.setType("string");
property.setEntrySchema(schema);
MatchablePropertyTypeMap mapValue = new MatchablePropertyTypeMap(property);