From ec6f96943dff4d0da1f777ed1682a6bc57637b3e Mon Sep 17 00:00:00 2001 From: Octavian Patrascoiu Date: Fri, 7 Feb 2025 10:30:32 +0000 Subject: [PATCH] [#655] DMN 1.5: Import with empty prefix. Change model names to match file names and the resolution of the root model for TCK tests (DMN15-139) --- .../java/com/gs/dmn/DMNModelRepository.java | 30 ++++++--- .../src/main/java/com/gs/dmn/tck/TCKUtil.java | 65 +++++++++++-------- ...issingNamespaceInTestCasesTransformer.java | 11 ++-- .../DMNToManifestTransformer.java | 2 +- .../validation/DefaultDMNValidatorTest.java | 10 +-- .../SweepMissingIntervalValidatorTest.java | 16 ++--- .../SweepMissingRuleValidatorTest.java | 64 +++++++++--------- ...weepMissingRuleValidatorWithMergeTest.java | 58 ++++++++--------- .../SweepRuleOverlapValidatorTest.java | 24 +++---- .../dmn/validation/TypeRefValidatorTest.java | 2 +- .../validation/UniqueNameValidatorTest.java | 6 +- .../UniqueRequirementValidatorTest.java | 4 +- .../dmn/expected/1.1/latest/0004-lending.dmn | 2 +- .../dmn/expected/1.1/latest/0004-lending.json | 2 +- .../1.1/latest/0014-loan-comparison.dmn | 2 +- .../dmn/expected/1.1/latest/test20161014.dmn | 2 +- .../dmn/expected/1.1/latest/test20161014.json | 2 +- .../dmn/expected/1.2/latest/0004-lending.dmn | 2 +- .../1.2/latest/0014-loan-comparison.dmn | 2 +- .../1.2/latest/0087-chapter-11-example.dmn | 2 +- .../dmn/expected/1.3/latest/0004-lending.dmn | 2 +- .../1.3/latest/0014-loan-comparison.dmn | 2 +- .../1.3/latest/0087-chapter-11-example.dmn | 2 +- .../dmn/expected/1.4/latest/0004-lending.dmn | 2 +- .../1.4/latest/0014-loan-comparison.dmn | 2 +- .../1.4/latest/0087-chapter-11-example.dmn | 2 +- .../0004-lending-test-01.xml | 2 +- .../missing-namespace/0004-lending.dmn | 2 +- .../dmn/expected/quoted/0004-lending.dmn | 2 +- .../dmn/expected/quoted/0007-date-time.dmn | 2 +- .../quoted/0087-chapter-11-example.dmn | 2 +- .../dmn/expected/quoted/0089-model-a.dmn | 2 +- .../dmn/expected/quoted/0089-model-b.dmn | 2 +- .../dmn/expected/quoted/0089-model-b2.dmn | 2 +- .../quoted/0089-nested-inputdata-imports.dmn | 2 +- .../resources/dmn/input/1.1/0004-lending.dmn | 2 +- .../dmn/input/1.1/0007-date-time.dmn | 2 +- .../dmn/input/1.1/0014-loan-comparison.dmn | 2 +- ...th-duplicated-information-requirements.dmn | 2 +- .../input/1.1/test-dmn-with-duplicates.dmn | 2 +- .../1.1/test-dmn-with-missing-type-ref.dmn | 2 +- .../resources/dmn/input/1.2/0004-lending.dmn | 2 +- .../dmn/input/1.2/0014-loan-comparison.dmn | 2 +- .../dmn/input/1.2/0087-chapter-11-example.dmn | 2 +- .../resources/dmn/input/1.2/0089-model-a.dmn | 2 +- .../resources/dmn/input/1.2/0089-model-b.dmn | 2 +- .../resources/dmn/input/1.2/0089-model-b2.dmn | 2 +- .../1.2/0089-nested-inputdata-imports.dmn | 2 +- .../resources/dmn/input/1.3/0004-lending.dmn | 2 +- .../dmn/input/1.3/0014-loan-comparison.dmn | 2 +- .../dmn/input/1.3/0087-chapter-11-example.dmn | 2 +- .../dmn/input/1.3/loan-grade-with-any.dmn | 2 +- .../dmn/input/1.3/loan-grade-with-boolean.dmn | 2 +- .../loan-grade-with-enumeration-missing.dmn | 2 +- .../input/1.3/loan-grade-with-enumeration.dmn | 2 +- .../input/1.3/loan-grade-with-intervals-1.dmn | 2 +- .../input/1.3/loan-grade-with-intervals-2.dmn | 2 +- .../input/1.3/loan-grade-with-intervals-3.dmn | 2 +- .../loan-grade-with-relational-operators.dmn | 2 +- .../resources/dmn/input/1.4/0004-lending.dmn | 2 +- .../dmn/input/1.4/0014-loan-comparison.dmn | 2 +- .../dmn/input/1.4/0087-chapter-11-example.dmn | 2 +- .../resources/jackson/v1_3/0004-lending.json | 2 +- .../jackson/v1_3/0014-loan-comparison.json | 2 +- .../jackson/v1_3/0087-chapter-11-example.json | 2 +- .../resources/jackson/v1_4/test20161014.json | 2 +- .../xstream/v1_1/0004-decision-services.dmn | 2 +- ...-decision-services_multiple_extensions.dmn | 2 +- ...04-decision-services_ns_other_location.dmn | 2 +- .../v1_1/Hello_World_semantic_namespace.dmn | 2 +- ...rld_semantic_namespace_with_extensions.dmn | 2 +- ...pace_with_extensions_other_ns_location.dmn | 2 +- .../resources/xstream/v1_1/ch11example.dmn | 2 +- .../resources/xstream/v1_1/dish-decision.dmn | 2 +- .../xstream/v1_1/dummy-definitions.dmn | 2 +- .../resources/xstream/v1_1/dummy-relation.dmn | 2 +- .../xstream/v1_1/hardcoded-java-max-call.dmn | 2 +- .../xstream/v1_1/semantic-namespace.dmn | 2 +- .../resources/xstream/v1_1/test20161014.dmn | 2 +- .../resources/dmn/example-credit-decision.dmn | 2 +- .../src/test/resources/input/0004-lending.dmn | 2 +- .../decision-table-with-annotations.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../0004-lending/translator/0004-lending.dmn | 2 +- .../proto3/java/dmn/ModelElementRegistry.java | 2 +- .../proto3/kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/date-time-proto.dmn | 2 +- .../proto3/java/dmn/ModelElementRegistry.java | 2 +- .../proto3/kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0004-simpletable-U.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0005-simpletable-A.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0006-simpletable-P1.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0007-simpletable-P2.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0008-LX-arithmetic.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0009-invocation-arithmetic.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0010-multi-output-U.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0100-feel-constants.dmn | 2 +- .../translator/0101-feel-constants.dmn | 2 +- .../translator/0102-feel-constants.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../translator/0105-feel-math.dmn | 2 +- .../translator/0106-feel-ternary-logic.dmn | 2 +- .../0107-feel-ternary-logic-not.dmn | 2 +- .../translator/0108-first-hitpolicy.dmn | 2 +- .../translator/0109-ruleOrder-hitpolicy.dmn | 2 +- .../translator/0110-outputOrder-hitpolicy.dmn | 2 +- .../0111-first-hitpolicy-singleoutputcol.dmn | 2 +- ...112-ruleOrder-hitpolicy-singleinoutcol.dmn | 2 +- ...3-outputOrder-hitpolicy-singleinoutcol.dmn | 2 +- .../translator/0114-min-collect-hitpolicy.dmn | 2 +- .../translator/0115-sum-collect-hitpolicy.dmn | 2 +- .../0116-count-collect-hitpolicy.dmn | 2 +- .../translator/0117-multi-any-hitpolicy.dmn | 2 +- .../0118-multi-priority-hitpolicy.dmn | 2 +- .../0119-multi-collect-hitpolicy.dmn | 2 +- .../0001-filter/translator/0001-filter.dmn | 2 +- .../translator/0002-string-functions.dmn | 2 +- .../translator/0003-iteration.dmn | 2 +- .../0004-lending/translator/0004-lending.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../python/dmn/ModelElementRegistry.py | 2 +- .../translator/0005-literal-invocation.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../cl3/0006-join/translator/0006-join.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0007-date-time.dmn | 2 +- .../0008-listGen/translator/0008-listGen.dmn | 2 +- .../translator/0009-append-flatten.dmn | 2 +- .../translator/0010-concatenate.dmn | 2 +- .../translator/0011-insert-remove.dmn | 2 +- .../translator/0012-list-functions.dmn | 2 +- .../cl3/0013-sort/translator/0013-sort.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0014-loan-comparison.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0016-some-every.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0017-tableTests.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../translator/0021-singleton-list.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../0030-static-user-defined-functions.dmn | 2 +- .../0031-static-user-defined-functions.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../kotlin/dmn/ModelElementRegistry.kt | 2 +- .../0031-user-defined-functions.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../translator/0032-conditionals.dmn | 2 +- .../translator/0033-for-loops.dmn | 2 +- .../translator/0035-test-structure-output.dmn | 2 +- .../translator/0036-dt-variable-input.dmn | 2 +- .../0037-dt-on-bkm-implicit-params.dmn | 2 +- .../0038-dt-on-bkm-explicit-params.dmn | 2 +- .../translator/0039-dt-list-semantics.dmn | 2 +- .../translator/0040-singlenestedcontext.dmn | 2 +- .../0041-multiple-nestedcontext.dmn | 2 +- .../translator/0012-list-functions.dmn | 2 +- .../translator/0034-drg-scopes-2.dmn | 2 +- .../translator/0087-chapter-11-example.dmn | 2 +- .../translator/0089-model-a.dmn | 2 +- .../translator/0089-model-b.dmn | 2 +- .../translator/0089-model-b2.dmn | 2 +- .../0089-nested-inputdata-imports.dmn | 2 +- .../0004-lending/translator/0004-lending.dmn | 2 +- .../java/dmn/ModelElementRegistry.java | 2 +- .../translator/0016-some-every.dmn | 2 +- .../0031-user-defined-functions.dmn | 2 +- .../0086-import/translator/0086-import.dmn | 2 +- .../0086-import/translator/Imported_Model.dmn | 2 +- .../translator/0087-chapter-11-example.dmn | 2 +- .../translator/0088-no-decision-logic.dmn | 2 +- .../translator/1130-feel-interval.dmn | 2 +- .../0086-import/translator/0086-import.dmn | 2 +- .../0086-import/translator/Imported_Model.dmn | 2 +- 196 files changed, 341 insertions(+), 319 deletions(-) diff --git a/dmn-core/src/main/java/com/gs/dmn/DMNModelRepository.java b/dmn-core/src/main/java/com/gs/dmn/DMNModelRepository.java index 250b880e2..cd41bb7d1 100644 --- a/dmn-core/src/main/java/com/gs/dmn/DMNModelRepository.java +++ b/dmn-core/src/main/java/com/gs/dmn/DMNModelRepository.java @@ -44,6 +44,7 @@ public class DMNModelRepository { // Derived properties to optimise search protected final List allDefinitions = new ArrayList<>(); protected final Map namespaceToDefinitions = new LinkedHashMap<>(); + // Cache for DRGElements and top ItemDefinitions protected final Map elementToDefinitions = new LinkedHashMap<>(); protected List invocables; protected List itemDefinitions; @@ -71,6 +72,7 @@ public DMNModelRepository(List definitionsList) { if (definitionsList != null) { for (TDefinitions definitions: definitionsList) { this.allDefinitions.add(definitions); + // Update caches if (!this.namespaceToDefinitions.containsKey(definitions.getNamespace())) { this.namespaceToDefinitions.put(definitions.getNamespace(), definitions); } else { @@ -182,14 +184,20 @@ public List getAllDefinitions() { } // Model name might not be unique - public List findDefinitionByName(String modelName) { + public TDefinitions findModelByName(String modelName) { List result = new ArrayList<>(); for (TDefinitions definitions : this.allDefinitions) { if (modelName.equals(definitions.getName())) { result.add(definitions); } } - return result; + if (result.isEmpty()) { + throw new DMNRuntimeException(String.format("Cannot find model '%s'", modelName)); + } else if (result.size() == 1) { + return result.get(0); + } else { + throw new DMNRuntimeException(String.format("Model name '%s' is not unique", modelName)); + } } public void addElementMap(TDRGElement element, TDefinitions definitions) { @@ -206,14 +214,20 @@ public List getImportedNames() { return names; } - public TDefinitions getModel(String namespace) { - return this.namespaceToDefinitions.get(namespace); - } - public TDefinitions getModel(TNamedElement element) { return this.elementToDefinitions.get(element); } + public TDefinitions findModelByNamespace(String namespace) { + TDefinitions definitions = this.namespaceToDefinitions.get(namespace); + if (definitions == null) { + throw new DMNRuntimeException(String.format("Cannot find DM for namespace '%s'", namespace)); + } else { + return definitions; + } + } + + // Error location public String makeLocation(TDefinitions definitions, TDMNElement element) { if (definitions == null && element == null) { return null; @@ -612,7 +626,7 @@ public TDRGElement findDRGElementByName(String name) { result = value.get(0); this.drgElementByName.put(name, result); } else if (value.size() > 1) { - throw new DMNRuntimeException(String.format("Found %s business knowledge models for name='%s'", value.size(), name)); + throw new DMNRuntimeException(String.format("Found %s DRG elements for name='%s'", value.size(), name)); } } if (result == null) { @@ -838,7 +852,7 @@ public TItemDefinition lookupItemDefinition(TDefinitions model, QualifiedName ty for (TImport import_: model.getImport()) { if (import_.getName().equals(importName)) { String modelNamespace = import_.getNamespace(); - model = this.getModel(modelNamespace); + model = this.findModelByNamespace(modelNamespace); if (model == null) { throw new DMNRuntimeException(String.format("Cannot find DM for '%s'", modelNamespace)); } diff --git a/dmn-core/src/main/java/com/gs/dmn/tck/TCKUtil.java b/dmn-core/src/main/java/com/gs/dmn/tck/TCKUtil.java index 7410236df..681f4fafa 100644 --- a/dmn-core/src/main/java/com/gs/dmn/tck/TCKUtil.java +++ b/dmn-core/src/main/java/com/gs/dmn/tck/TCKUtil.java @@ -104,7 +104,7 @@ private DRGElementReference extractInfoFromModel(TDefinit // Lookup in imports for (TImport imp: definitions.getImport()) { String namespace = imp.getNamespace(); - TDefinitions child = this.dmnModelRepository.getModel(namespace); + TDefinitions child = this.dmnModelRepository.findModelByNamespace(namespace); DRGElementReference result = extractInfoFromModel(child, elementNamespace, elementName, new ImportPath(importPath, imp.getName())); if (result != null) { return result; @@ -124,7 +124,7 @@ private DRGElementReference extractInfoFromModel(TDefinit // Lookup in imports for (TImport imp: definitions.getImport()) { String namespace = imp.getNamespace(); - TDefinitions child = this.dmnModelRepository.getModel(namespace); + TDefinitions child = this.dmnModelRepository.findModelByNamespace(namespace); DRGElementReference result = extractInfoFromModel(child, elementName, new ImportPath(importPath, imp.getName())); if (result != null) { return result; @@ -141,7 +141,7 @@ public Pair, ValueType> extractInfoFr ValueType value = node; while (import_ != null) { path.addPathElement(name); - definitions = this.dmnModelRepository.getModel(import_.getNamespace()); + definitions = this.dmnModelRepository.findModelByNamespace(import_.getNamespace()); name = null; if (value.getComponent() != null && value.getComponent().size() == 1) { Component component = value.getComponent().get(0); @@ -508,37 +508,32 @@ private List makeArgs(TDRGElement drgElement, TestCase testCase) { // Model - lookup methods // private TDefinitions getRootModel(TestCases testCases) { - TDefinitions definitions; - if (this.dmnModelRepository.getAllDefinitions().size() == 1) { - // One single DM - definitions = this.dmnModelRepository.getRootDefinitions(); + // Find DM by namespace or name + String namespace = getNamespace(testCases); + TDefinitions definitions = null; + if (StringUtils.isBlank(namespace)) { + // Lookup by name + String modelName = getModelName(testCases); + definitions = this.dmnModelRepository.findModelByName(modelName); } else { - // Find DM by namespace - String namespace = getNamespace(testCases); - if (!StringUtils.isEmpty(namespace)) { - definitions = this.dmnModelRepository.getModel(namespace); - } else { - throw new DMNRuntimeException(String.format("Missing namespace for TestCases '%s'", testCases.getModelName())); - } + // Lookup by namespace + definitions = this.dmnModelRepository.findModelByNamespace(namespace); } if (definitions == null) { - throw new DMNRuntimeException(String.format("Cannot find root DM for TestCases '%s'", testCases.getModelName())); + throw new DMNRuntimeException(String.format("Cannot find DM '%s' for TestCases", testCases.getModelName())); } else { return definitions; } } private TDRGElement findDRGElement(TestCases testCases, TestCase testCase, ResultNode node) { - try { - String namespace = getNamespace(testCases, testCase, node); - String name = drgElementName(testCases, testCase, node); - if (namespace != null) { - return this.dmnModelRepository.findDRGElementByName(namespace, name); - } else { - return this.dmnModelRepository.findDRGElementByName(name); - } - } catch (Exception e) { - return null; + String namespace = getNamespace(testCases, testCase, node); + String name = drgElementName(testCases, testCase, node); + if (!StringUtils.isBlank(namespace)) { + return this.dmnModelRepository.findDRGElementByName(namespace, name); + } else { + TDefinitions rootModel = getRootModel(testCases); + return this.dmnModelRepository.findDRGElementByName(rootModel, name); } } @@ -556,6 +551,17 @@ private String drgElementName(TestCases testCases, TestCase testCase, ResultNode return elementToEvaluate; } + private String getModelName(TestCases testCases) { + String fileName = testCases.getModelName(); + return getModelName(fileName); + } + + public static String getModelName(String fileName) { + // Remove extension + int index = fileName.indexOf("."); + return index == -1 ? fileName : fileName.substring(0, index); + } + private String getNamespace(TestCases testCases) { return testCases.getNamespace(); } @@ -566,7 +572,10 @@ private String getNamespace(TestCase testCase) { private String getNamespace(TestCases testCases, TestCase testCase, InputNode node) { String namespace = getNamespace(node); - if (StringUtils.isEmpty(namespace)) { + if (StringUtils.isBlank(namespace)) { + namespace = getNamespace(testCase); + } + if (StringUtils.isBlank(namespace)) { namespace = getNamespace(testCases); } return namespace; @@ -574,10 +583,10 @@ private String getNamespace(TestCases testCases, TestCase testCase, InputNode no private String getNamespace(TestCases testCases, TestCase testCase, ResultNode node) { String namespace = getNamespace(node); - if (StringUtils.isEmpty(namespace)) { + if (StringUtils.isBlank(namespace)) { namespace = getNamespace(testCase); } - if (StringUtils.isEmpty(namespace)) { + if (StringUtils.isBlank(namespace)) { namespace = getNamespace(testCases); } return namespace; diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/AddMissingNamespaceInTestCasesTransformer.java b/dmn-core/src/main/java/com/gs/dmn/transformation/AddMissingNamespaceInTestCasesTransformer.java index ca294f9bf..3d1db33a1 100644 --- a/dmn-core/src/main/java/com/gs/dmn/transformation/AddMissingNamespaceInTestCasesTransformer.java +++ b/dmn-core/src/main/java/com/gs/dmn/transformation/AddMissingNamespaceInTestCasesTransformer.java @@ -19,6 +19,7 @@ import com.gs.dmn.log.BuildLogger; import com.gs.dmn.log.Slf4jBuildLogger; import com.gs.dmn.runtime.Pair; +import com.gs.dmn.tck.TCKUtil; import com.gs.dmn.tck.ast.*; import com.gs.dmn.tck.ast.visitor.TraversalVisitor; import org.apache.commons.lang3.StringUtils; @@ -76,13 +77,11 @@ public AddMissingImportPrefixInDTVisitor(ErrorHandler errorHandler) { public TCKBaseElement visit(TestCases element, TransformationContext context) { DMNModelRepository repository = context.getRepository(); if (element != null) { - // Search model by name + // Set TestCase namespace from model under test if (StringUtils.isBlank(element.getNamespace())) { - String modelName = element.getModelName(); - List definitionsList = repository.findDefinitionByName(modelName); - if (definitionsList.size() == 1) { - element.setNamespace(definitionsList.get(0).getNamespace()); - } + String modelName = TCKUtil.getModelName(element.getModelName()); + TDefinitions definitions = repository.findModelByName(modelName); + element.setNamespace(definitions.getNamespace()); } // Set namespace for nodes diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/DMNToManifestTransformer.java b/dmn-core/src/main/java/com/gs/dmn/transformation/DMNToManifestTransformer.java index e8649b4e5..b65e00186 100644 --- a/dmn-core/src/main/java/com/gs/dmn/transformation/DMNToManifestTransformer.java +++ b/dmn-core/src/main/java/com/gs/dmn/transformation/DMNToManifestTransformer.java @@ -133,7 +133,7 @@ private String findNamespace(TDefinitions model, String importName) { } for (TImport import_: model.getImport()) { if (import_.getName().equals(importName)) { - model = this.dmnModelRepository.getModel(import_.getNamespace()); + model = this.dmnModelRepository.findModelByNamespace(import_.getNamespace()); if (model == null) { throw new DMNRuntimeException(String.format("Cannot find model for import name '%s'", importName)); } diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/DefaultDMNValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/DefaultDMNValidatorTest.java index 9d673e5c8..43b66e11c 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/DefaultDMNValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/DefaultDMNValidatorTest.java @@ -32,11 +32,11 @@ public void testValidateWhenCorrect() { @Test public void testValidateDefinitionsWhenNotUniqueNames() { List expectedErrors = Arrays.asList( - "(model='definitions'): error: The 'name' of a 'DRGElement' must be unique. Found duplicates for 'CIP Assessments, Input'.", - "(model='definitions'): error: The 'name' of a 'ItemDefinition' must be unique. Found duplicates for 'itemDefinition'.", - "(model='definitions', name='CIP Assessments', id='cip-assessments'): error: Missing variable", - "(model='definitions', name='CIP Assessments', id='cip-assessments1'): error: Missing variable", - "(model='definitions', label='String', name='CIP Assessments', id='id-input-1'): error: DRGElement name and variable name should be the same. Found 'CIP Assessments' and 'string'" + "(model='test-dmn-with-duplicates'): error: The 'name' of a 'DRGElement' must be unique. Found duplicates for 'CIP Assessments, Input'.", + "(model='test-dmn-with-duplicates'): error: The 'name' of a 'ItemDefinition' must be unique. Found duplicates for 'itemDefinition'.", + "(model='test-dmn-with-duplicates', name='CIP Assessments', id='cip-assessments'): error: Missing variable", + "(model='test-dmn-with-duplicates', name='CIP Assessments', id='cip-assessments1'): error: Missing variable", + "(model='test-dmn-with-duplicates', label='String', name='CIP Assessments', id='id-input-1'): error: DRGElement name and variable name should be the same. Found 'CIP Assessments' and 'string'" ); validate(validator, resource("dmn/input/1.1/test-dmn-with-duplicates.dmn"), expectedErrors); } diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingIntervalValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingIntervalValidatorTest.java index 439665e11..971f64391 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingIntervalValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingIntervalValidatorTest.java @@ -41,8 +41,8 @@ public void testValidateWhenRepositoryIsEmpty() { @Test public void testValidateWhenIntervals1() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(1500, 2000)' is not covered for column 1 in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(3000, 4000)' is not covered for column 2 in 'Loan Grade' table" + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(1500, 2000)' is not covered for column 1 in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(3000, 4000)' is not covered for column 2 in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-intervals-1.dmn"), expectedErrors); } @@ -50,8 +50,8 @@ public void testValidateWhenIntervals1() { @Test public void testValidateWhenIntervals2() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(1500, 1600)' is not covered for column 1 in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(1000, 1200)' is not covered for column 2 in 'Loan Grade' table" + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(1500, 1600)' is not covered for column 1 in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(1000, 1200)' is not covered for column 2 in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-intervals-2.dmn"), expectedErrors); } @@ -59,7 +59,7 @@ public void testValidateWhenIntervals2() { @Test public void testValidateWhenIntervals3() { List expectedErrors = Collections.singletonList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(1500, 1600)' is not covered for column 1 in 'Loan Grade' table" + "(model='loan-grade-with-intervals-3', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(1500, 1600)' is not covered for column 1 in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-intervals-3.dmn"), expectedErrors); } @@ -67,7 +67,7 @@ public void testValidateWhenIntervals3() { @Test public void testValidateWhenRelationalOperators() { List expectedErrors = Collections.singletonList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(3000, 4000)' is not covered for column 2 in 'Loan Grade' table" + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(3000, 4000)' is not covered for column 2 in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-relational-operators.dmn"), expectedErrors); } @@ -75,7 +75,7 @@ public void testValidateWhenRelationalOperators() { @Test public void testValidateWhenAny() { List expectedErrors = Collections.singletonList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(3000, 4000)' is not covered for column 2 in 'Loan Grade' table" + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '(3000, 4000)' is not covered for column 2 in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-any.dmn"), expectedErrors); } @@ -95,7 +95,7 @@ public void testValidateWhenEnumeration() { @Test public void testValidateWhenEnumerationMissing() { List expectedErrors = Collections.singletonList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '{\"E23\"}' is not covered for column 2 in 'Loan Grade' table" + "(model='loan-grade-with-enumeration-missing', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Interval '{\"E23\"}' is not covered for column 2 in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-enumeration-missing.dmn"), expectedErrors); } diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorTest.java index dcece3a16..47b68b14d 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorTest.java @@ -41,14 +41,14 @@ public void testValidateWhenRepositoryIsEmpty() { @Test public void testValidateWhenIntervals1() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(0, 250), (1000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 500), (1000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(500, 750), (3000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 1000), (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), [0, 500)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(0, 250), (1000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 500), (1000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(500, 750), (3000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 1000), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), [0, 500)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), (3000, 5000]]' in 'Loan Grade' table", // "[(1500, 2000), (0, 5000)]", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, 2500), (2000, 5000]]' in 'Loan Grade' table" + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, 2500), (2000, 5000]]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-intervals-1.dmn"), expectedErrors); } @@ -56,14 +56,14 @@ public void testValidateWhenIntervals1() { @Test public void testValidateWhenIntervals2() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(0, 250), (750, 1500]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 500), (750, 1200)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(500, 750), (1000, 1200)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 1000), (1000, 1500]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), [0, 250)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), (1000, 1500]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(0, 250), (750, 1500]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 500), (750, 1200)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(500, 750), (1000, 1200)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 1000), (1000, 1500]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), [0, 250)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), (1000, 1500]]' in 'Loan Grade' table", // "[(1500, 1600), (0, 1500)]", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1600, 2000), (850, 1500]]' in 'Loan Grade' table" + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1600, 2000), (850, 1500]]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-intervals-2.dmn"), expectedErrors); } @@ -71,13 +71,13 @@ public void testValidateWhenIntervals2() { @Test public void testValidateWhenRelationalOperators() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(-Infinity, 200), (1000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(200, 500], (1000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[[500, 750), (3000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 1000], (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[[1000, 2000), [0, 500)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[[1000, 2000), (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, +Infinity), (3000, 5000]]' in 'Loan Grade' table" + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(-Infinity, 200), (1000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(200, 500], (1000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[[500, 750), (3000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 1000], (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[[1000, 2000), [0, 500)]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[[1000, 2000), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, +Infinity), (3000, 5000]]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-relational-operators.dmn"), expectedErrors); } @@ -85,11 +85,11 @@ public void testValidateWhenRelationalOperators() { @Test public void testValidateWhenAny() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(-Infinity, 250), (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 750), (3000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 2000), (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, 2500), (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2500, +Infinity), (3000, 5000]]' in 'Loan Grade' table" + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(-Infinity, 250), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 750), (3000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 2000), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, 2500), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2500, +Infinity), (3000, 5000]]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-any.dmn"), expectedErrors); } @@ -103,7 +103,7 @@ public void testValidateWhenBoolean() { @Test public void testValidateWhenEnumeration() { List expectedErrors = Collections.singletonList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\"}, {\"E22\", \"E23\"}, {\"E32\", \"E33\"}]' in 'Loan Grade' table" + "(model='loan-grade-with-enumeration', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\"}, {\"E22\", \"E23\"}, {\"E32\", \"E33\"}]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-enumeration.dmn"), expectedErrors); } @@ -111,11 +111,11 @@ public void testValidateWhenEnumeration() { @Test public void testValidateWhenEnumerationMissing() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\"}, {\"E21\"}, {\"E31\"}]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\"}, {\"E22\"}, {\"E32\", \"E33\"}]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E12\"}, {\"E21\"}, {\"E31\"}]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E12\"}, {\"E22\"}, {\"E31\", \"E32\"}]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E13\"}, {\"E21\"}, {\"E31\"}]' in 'Loan Grade' table" + "(model='loan-grade-with-enumeration-missing', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\"}, {\"E21\"}, {\"E31\"}]' in 'Loan Grade' table", + "(model='loan-grade-with-enumeration-missing', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\"}, {\"E22\"}, {\"E32\", \"E33\"}]' in 'Loan Grade' table", + "(model='loan-grade-with-enumeration-missing', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E12\"}, {\"E21\"}, {\"E31\"}]' in 'Loan Grade' table", + "(model='loan-grade-with-enumeration-missing', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E12\"}, {\"E22\"}, {\"E31\", \"E32\"}]' in 'Loan Grade' table", + "(model='loan-grade-with-enumeration-missing', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E13\"}, {\"E21\"}, {\"E31\"}]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-enumeration-missing.dmn"), expectedErrors); } diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorWithMergeTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorWithMergeTest.java index a84cb2a8f..ae9b39fcb 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorWithMergeTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorWithMergeTest.java @@ -41,14 +41,14 @@ public void testValidateWhenRepositoryIsEmpty() { @Test public void testValidateWhenIntervals1() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(0, 250), (1000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 500), (1000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(500, 750), (3000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 1000), (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), [0, 500)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(0, 250), (1000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 500), (1000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(500, 750), (3000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 1000), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), [0, 500)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), (3000, 5000]]' in 'Loan Grade' table", // "[(1500, 2000), (0, 5000)]", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, 2500), (2000, 5000]]' in 'Loan Grade' table" + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, 2500), (2000, 5000]]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-intervals-1.dmn"), expectedErrors); } @@ -56,14 +56,14 @@ public void testValidateWhenIntervals1() { @Test public void testValidateWhenIntervals2() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(0, 250), (750, 1500]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 500), (750, 1200)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(500, 750), (1000, 1200)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 1000), (1000, 1500]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), [0, 250)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), (1000, 1500]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(0, 250), (750, 1500]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 500), (750, 1200)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(500, 750), (1000, 1200)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 1000), (1000, 1500]]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), [0, 250)]' in 'Loan Grade' table", + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1000, 1500), (1000, 1500]]' in 'Loan Grade' table", // "[(1500, 1600), (0, 1500)]", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1600, 2000), (850, 1500]]' in 'Loan Grade' table" + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(1600, 2000), (850, 1500]]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-intervals-2.dmn"), expectedErrors); } @@ -71,12 +71,12 @@ public void testValidateWhenIntervals2() { @Test public void testValidateWhenRelationalOperators() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(-Infinity, 200), (1000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(200, 500], (1000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[[500, 750), (3000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 2000), (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[[1000, 2000), [0, 500)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, +Infinity), (3000, 5000]]' in 'Loan Grade' table" + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(-Infinity, 200), (1000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(200, 500], (1000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[[500, 750), (3000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 2000), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[[1000, 2000), [0, 500)]' in 'Loan Grade' table", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, +Infinity), (3000, 5000]]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-relational-operators.dmn"), expectedErrors); } @@ -84,11 +84,11 @@ public void testValidateWhenRelationalOperators() { @Test public void testValidateWhenAny() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(-Infinity, 250), (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 750), (3000, 4000)]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 2000), (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, 2500), (3000, 5000]]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2500, +Infinity), (3000, 5000]]' in 'Loan Grade' table" + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(-Infinity, 250), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(250, 750), (3000, 4000)]' in 'Loan Grade' table", + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(750, 2000), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2000, 2500), (3000, 5000]]' in 'Loan Grade' table", + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[(2500, +Infinity), (3000, 5000]]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-any.dmn"), expectedErrors); } @@ -102,7 +102,7 @@ public void testValidateWhenBoolean() { @Test public void testValidateWhenEnumeration() { List expectedErrors = Collections.singletonList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\"}, {\"E22\", \"E23\"}, {\"E32\", \"E33\"}]' in 'Loan Grade' table" + "(model='loan-grade-with-enumeration', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\"}, {\"E22\", \"E23\"}, {\"E32\", \"E33\"}]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-enumeration.dmn"), expectedErrors); } @@ -110,9 +110,9 @@ public void testValidateWhenEnumeration() { @Test public void testValidateWhenEnumerationMissing() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\", \"E12\", \"E13\"}, {\"E21\"}, {\"E31\"}]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\"}, {\"E22\"}, {\"E32\", \"E33\"}]' in 'Loan Grade' table", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E12\"}, {\"E22\"}, {\"E31\", \"E32\"}]' in 'Loan Grade' table" + "(model='loan-grade-with-enumeration-missing', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\", \"E12\", \"E13\"}, {\"E21\"}, {\"E31\"}]' in 'Loan Grade' table", + "(model='loan-grade-with-enumeration-missing', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E11\"}, {\"E22\"}, {\"E32\", \"E33\"}]' in 'Loan Grade' table", + "(model='loan-grade-with-enumeration-missing', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Found missing rule '[{\"E12\"}, {\"E22\"}, {\"E31\", \"E32\"}]' in 'Loan Grade' table" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-enumeration-missing.dmn"), expectedErrors); } diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/SweepRuleOverlapValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/SweepRuleOverlapValidatorTest.java index 2c7d1a85f..aa3a778b3 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/SweepRuleOverlapValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/SweepRuleOverlapValidatorTest.java @@ -40,7 +40,7 @@ public void testValidateWhenRepositoryIsEmpty() { @Test public void testValidateWhenIntervals1() { List expectedErrors = Collections.singletonList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3]' overlap in decision 'Loan Grade'" + "(model='loan-grade-with-intervals-1', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3]' overlap in decision 'Loan Grade'" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-intervals-1.dmn"), expectedErrors); } @@ -48,7 +48,7 @@ public void testValidateWhenIntervals1() { @Test public void testValidateWhenIntervals2() { List expectedErrors = Collections.singletonList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3]' overlap in decision 'Loan Grade'" + "(model='loan-grade-with-intervals-2', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3]' overlap in decision 'Loan Grade'" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-intervals-2.dmn"), expectedErrors); } @@ -56,8 +56,8 @@ public void testValidateWhenIntervals2() { @Test public void testValidateWhenIntervals3() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3, 5]' overlap in decision 'Loan Grade'", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[3, 6]' overlap in decision 'Loan Grade'" + "(model='loan-grade-with-intervals-3', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3, 5]' overlap in decision 'Loan Grade'", + "(model='loan-grade-with-intervals-3', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[3, 6]' overlap in decision 'Loan Grade'" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-intervals-3.dmn"), expectedErrors); } @@ -65,8 +65,8 @@ public void testValidateWhenIntervals3() { @Test public void testValidateWhenRelationalOperators() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3]' overlap in decision 'Loan Grade'", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[3, 4]' overlap in decision 'Loan Grade'" + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3]' overlap in decision 'Loan Grade'", + "(model='loan-grade-with-relational-operators', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[3, 4]' overlap in decision 'Loan Grade'" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-relational-operators.dmn"), expectedErrors); } @@ -74,7 +74,7 @@ public void testValidateWhenRelationalOperators() { @Test public void testValidateWhenAny() { List expectedErrors = Collections.singletonList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3, 4]' overlap in decision 'Loan Grade'" + "(model='loan-grade-with-any', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3, 4]' overlap in decision 'Loan Grade'" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-any.dmn"), expectedErrors); } @@ -82,9 +82,9 @@ public void testValidateWhenAny() { @Test public void testValidateWhenBoolean() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3]' overlap in decision 'Loan Grade'", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[2, 4]' overlap in decision 'Loan Grade'", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[3, 4]' overlap in decision 'Loan Grade'" + "(model='loan-grade-with-boolean', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3]' overlap in decision 'Loan Grade'", + "(model='loan-grade-with-boolean', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[2, 4]' overlap in decision 'Loan Grade'", + "(model='loan-grade-with-boolean', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[3, 4]' overlap in decision 'Loan Grade'" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-boolean.dmn"), expectedErrors); } @@ -92,8 +92,8 @@ public void testValidateWhenBoolean() { @Test public void testValidateWhenEnumeration() { List expectedErrors = Arrays.asList( - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3]' overlap in decision 'Loan Grade'", - "(model='loan-grade', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[2, 3, 4]' overlap in decision 'Loan Grade'" + "(model='loan-grade-with-enumeration', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[1, 3]' overlap in decision 'Loan Grade'", + "(model='loan-grade-with-enumeration', name='Loan Grade', id='_FAF682B2-D00A-469A-8B7D-932154DA95E0'): error: Decision table rules '[2, 3, 4]' overlap in decision 'Loan Grade'" ); validate(validator, resource("dmn/input/1.3/loan-grade-with-enumeration.dmn"), expectedErrors); } diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/TypeRefValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/TypeRefValidatorTest.java index ad78d424f..115fbaa53 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/TypeRefValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/TypeRefValidatorTest.java @@ -31,7 +31,7 @@ public void testValidateWhenCorrect() { @Test public void validate() { List expectedErrors = Collections.singletonList( - "(model='test-dmn', label='Applicant', name='applicant', id='id-d2376567fde3c9400ee327ecec21e36d'): error: Cannot find typeRef 'QualifiedName(null, applicant)'" + "(model='test-dmn-with-missing-type-ref', label='Applicant', name='applicant', id='id-d2376567fde3c9400ee327ecec21e36d'): error: Cannot find typeRef 'QualifiedName(null, applicant)'" ); validate(validator, resource("dmn/input/1.1/test-dmn-with-missing-type-ref.dmn"), expectedErrors); } diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/UniqueNameValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/UniqueNameValidatorTest.java index 574aac728..75e5e5576 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/UniqueNameValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/UniqueNameValidatorTest.java @@ -31,9 +31,9 @@ public void testValidateWhenCorrect() { @Test public void testValidateDefinitionsWhenNotUniqueNames() { List expectedErrors = Arrays.asList( - "(model='definitions'): error: The 'name' of a 'DRGElement' must be unique. Found 3 duplicates for 'CIP Assessments'.", - "(model='definitions'): error: The 'name' of a 'DRGElement' must be unique. Found 2 duplicates for 'Input'.", - "(model='definitions'): error: The 'name' of a 'ItemDefinition' must be unique. Found 2 duplicates for 'itemDefinition'." + "(model='test-dmn-with-duplicates'): error: The 'name' of a 'DRGElement' must be unique. Found 3 duplicates for 'CIP Assessments'.", + "(model='test-dmn-with-duplicates'): error: The 'name' of a 'DRGElement' must be unique. Found 2 duplicates for 'Input'.", + "(model='test-dmn-with-duplicates'): error: The 'name' of a 'ItemDefinition' must be unique. Found 2 duplicates for 'itemDefinition'." ); validate(validator, resource("dmn/input/1.1/test-dmn-with-duplicates.dmn"), expectedErrors); } diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/UniqueRequirementValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/UniqueRequirementValidatorTest.java index 56b7ea353..ad2ae8599 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/UniqueRequirementValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/UniqueRequirementValidatorTest.java @@ -31,8 +31,8 @@ public void testValidateWhenCorrect() { @Test public void testValidateDefinitionsWhenNotUniqueNames() { List expectedErrors = Arrays.asList( - "(model='test-dmn', name='CIP Assessments', id='cip-assessments'): error: Duplicated informationRequirement.requiredInput 'input-1'", - "(model='test-dmn', name='CIP Assessments', id='cip-assessments'): error: Duplicated informationRequirement.requiredDecision 'decision-1'" + "(model='test-dmn-with-duplicated-information-requirements', name='CIP Assessments', id='cip-assessments'): error: Duplicated informationRequirement.requiredInput 'input-1'", + "(model='test-dmn-with-duplicated-information-requirements', name='CIP Assessments', id='cip-assessments'): error: Duplicated informationRequirement.requiredDecision 'decision-1'" ); validate(validator, resource("dmn/input/1.1/test-dmn-with-duplicated-information-requirements.dmn"), expectedErrors); } diff --git a/dmn-core/src/test/resources/dmn/expected/1.1/latest/0004-lending.dmn b/dmn-core/src/test/resources/dmn/expected/1.1/latest/0004-lending.dmn index 3076a7b68..27e2b1f68 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.1/latest/0004-lending.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.1/latest/0004-lending.dmn @@ -1,5 +1,5 @@ - + feel.string diff --git a/dmn-core/src/test/resources/dmn/expected/1.1/latest/0004-lending.json b/dmn-core/src/test/resources/dmn/expected/1.1/latest/0004-lending.json index 77eb7265e..f87928e3d 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.1/latest/0004-lending.json +++ b/dmn-core/src/test/resources/dmn/expected/1.1/latest/0004-lending.json @@ -1,6 +1,6 @@ { "@kind" : "definitions", - "name" : "Lending1", + "name" : "0004-lending", "id" : "_4e0f0b70-d31c-471c-bd52-5ca709ed362b", "expressionLanguage" : "https://www.omg.org/spec/DMN/20230324/FEEL/", "typeLanguage" : "https://www.omg.org/spec/DMN/20230324/FEEL/", diff --git a/dmn-core/src/test/resources/dmn/expected/1.1/latest/0014-loan-comparison.dmn b/dmn-core/src/test/resources/dmn/expected/1.1/latest/0014-loan-comparison.dmn index 866a6dc77..1a70d0abb 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.1/latest/0014-loan-comparison.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.1/latest/0014-loan-comparison.dmn @@ -1,5 +1,5 @@ - + feel.string diff --git a/dmn-core/src/test/resources/dmn/expected/1.1/latest/test20161014.dmn b/dmn-core/src/test/resources/dmn/expected/1.1/latest/test20161014.dmn index c1fdd02c4..798476d9b 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.1/latest/test20161014.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.1/latest/test20161014.dmn @@ -1,5 +1,5 @@ - + dmn-ns:description diff --git a/dmn-core/src/test/resources/dmn/expected/1.1/latest/test20161014.json b/dmn-core/src/test/resources/dmn/expected/1.1/latest/test20161014.json index b9b8ba6a6..0a20a4d2e 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.1/latest/test20161014.json +++ b/dmn-core/src/test/resources/dmn/expected/1.1/latest/test20161014.json @@ -1,6 +1,6 @@ { "@kind" : "definitions", - "name" : "test", + "name" : "test20161014", "namespace" : "http://tempuri.org", "description" : "dmn-ns:description", "itemDefinition" : [ { diff --git a/dmn-core/src/test/resources/dmn/expected/1.2/latest/0004-lending.dmn b/dmn-core/src/test/resources/dmn/expected/1.2/latest/0004-lending.dmn index b2ef03e2d..d1bc28d66 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.2/latest/0004-lending.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.2/latest/0004-lending.dmn @@ -1,5 +1,5 @@ - + feel.string diff --git a/dmn-core/src/test/resources/dmn/expected/1.2/latest/0014-loan-comparison.dmn b/dmn-core/src/test/resources/dmn/expected/1.2/latest/0014-loan-comparison.dmn index 502002548..253883269 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.2/latest/0014-loan-comparison.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.2/latest/0014-loan-comparison.dmn @@ -1,5 +1,5 @@ - + feel.string diff --git a/dmn-core/src/test/resources/dmn/expected/1.2/latest/0087-chapter-11-example.dmn b/dmn-core/src/test/resources/dmn/expected/1.2/latest/0087-chapter-11-example.dmn index db23db968..c3f60caae 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.2/latest/0087-chapter-11-example.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.2/latest/0087-chapter-11-example.dmn @@ -1,5 +1,5 @@ - + string diff --git a/dmn-core/src/test/resources/dmn/expected/1.3/latest/0004-lending.dmn b/dmn-core/src/test/resources/dmn/expected/1.3/latest/0004-lending.dmn index 31e13c1d9..c0c597d8a 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.3/latest/0004-lending.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.3/latest/0004-lending.dmn @@ -1,5 +1,5 @@ - + string diff --git a/dmn-core/src/test/resources/dmn/expected/1.3/latest/0014-loan-comparison.dmn b/dmn-core/src/test/resources/dmn/expected/1.3/latest/0014-loan-comparison.dmn index 13789730d..866a85559 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.3/latest/0014-loan-comparison.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.3/latest/0014-loan-comparison.dmn @@ -1,5 +1,5 @@ - + string diff --git a/dmn-core/src/test/resources/dmn/expected/1.3/latest/0087-chapter-11-example.dmn b/dmn-core/src/test/resources/dmn/expected/1.3/latest/0087-chapter-11-example.dmn index aa558bd1f..28f56c6af 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.3/latest/0087-chapter-11-example.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.3/latest/0087-chapter-11-example.dmn @@ -1,5 +1,5 @@ - + string diff --git a/dmn-core/src/test/resources/dmn/expected/1.4/latest/0004-lending.dmn b/dmn-core/src/test/resources/dmn/expected/1.4/latest/0004-lending.dmn index 8e5c2787d..1047a40d4 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.4/latest/0004-lending.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.4/latest/0004-lending.dmn @@ -1,5 +1,5 @@ - + string diff --git a/dmn-core/src/test/resources/dmn/expected/1.4/latest/0014-loan-comparison.dmn b/dmn-core/src/test/resources/dmn/expected/1.4/latest/0014-loan-comparison.dmn index 13789730d..866a85559 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.4/latest/0014-loan-comparison.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.4/latest/0014-loan-comparison.dmn @@ -1,5 +1,5 @@ - + string diff --git a/dmn-core/src/test/resources/dmn/expected/1.4/latest/0087-chapter-11-example.dmn b/dmn-core/src/test/resources/dmn/expected/1.4/latest/0087-chapter-11-example.dmn index d853ea27f..fcab7c6f0 100644 --- a/dmn-core/src/test/resources/dmn/expected/1.4/latest/0087-chapter-11-example.dmn +++ b/dmn-core/src/test/resources/dmn/expected/1.4/latest/0087-chapter-11-example.dmn @@ -1,5 +1,5 @@ - + string diff --git a/dmn-core/src/test/resources/dmn/expected/missing-namespace/0004-lending-test-01.xml b/dmn-core/src/test/resources/dmn/expected/missing-namespace/0004-lending-test-01.xml index ac91e266f..a83a866b9 100644 --- a/dmn-core/src/test/resources/dmn/expected/missing-namespace/0004-lending-test-01.xml +++ b/dmn-core/src/test/resources/dmn/expected/missing-namespace/0004-lending-test-01.xml @@ -1,5 +1,5 @@ - + 0004-lending.dmn diff --git a/dmn-core/src/test/resources/dmn/expected/missing-namespace/0004-lending.dmn b/dmn-core/src/test/resources/dmn/expected/missing-namespace/0004-lending.dmn index f6b54b277..ad759bac2 100644 --- a/dmn-core/src/test/resources/dmn/expected/missing-namespace/0004-lending.dmn +++ b/dmn-core/src/test/resources/dmn/expected/missing-namespace/0004-lending.dmn @@ -1,5 +1,5 @@ - + feel.string diff --git a/dmn-core/src/test/resources/dmn/expected/quoted/0004-lending.dmn b/dmn-core/src/test/resources/dmn/expected/quoted/0004-lending.dmn index ad0d4bb87..a73b8060d 100644 --- a/dmn-core/src/test/resources/dmn/expected/quoted/0004-lending.dmn +++ b/dmn-core/src/test/resources/dmn/expected/quoted/0004-lending.dmn @@ -1,5 +1,5 @@ - + feel.string diff --git a/dmn-core/src/test/resources/dmn/expected/quoted/0007-date-time.dmn b/dmn-core/src/test/resources/dmn/expected/quoted/0007-date-time.dmn index 986c851c7..096f350de 100644 --- a/dmn-core/src/test/resources/dmn/expected/quoted/0007-date-time.dmn +++ b/dmn-core/src/test/resources/dmn/expected/quoted/0007-date-time.dmn @@ -1,5 +1,5 @@ - + feel.number diff --git a/dmn-core/src/test/resources/dmn/expected/quoted/0087-chapter-11-example.dmn b/dmn-core/src/test/resources/dmn/expected/quoted/0087-chapter-11-example.dmn index 55a36adc9..df1ad1b1c 100644 --- a/dmn-core/src/test/resources/dmn/expected/quoted/0087-chapter-11-example.dmn +++ b/dmn-core/src/test/resources/dmn/expected/quoted/0087-chapter-11-example.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-a.dmn b/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-a.dmn index f057a1bc6..1f80773e9 100644 --- a/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-a.dmn +++ b/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-a.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-b.dmn b/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-b.dmn index ed0f31819..87686a6af 100644 --- a/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-b.dmn +++ b/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-b.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-b2.dmn b/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-b2.dmn index 8bb3a95a6..993597bd9 100644 --- a/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-b2.dmn +++ b/dmn-core/src/test/resources/dmn/expected/quoted/0089-model-b2.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-core/src/test/resources/dmn/expected/quoted/0089-nested-inputdata-imports.dmn b/dmn-core/src/test/resources/dmn/expected/quoted/0089-nested-inputdata-imports.dmn index 3531ff6fa..61ed39881 100644 --- a/dmn-core/src/test/resources/dmn/expected/quoted/0089-nested-inputdata-imports.dmn +++ b/dmn-core/src/test/resources/dmn/expected/quoted/0089-nested-inputdata-imports.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-core/src/test/resources/dmn/input/1.1/0004-lending.dmn b/dmn-core/src/test/resources/dmn/input/1.1/0004-lending.dmn index 87f84071d..cface1dca 100644 --- a/dmn-core/src/test/resources/dmn/input/1.1/0004-lending.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.1/0004-lending.dmn @@ -1,5 +1,5 @@ - + feel:string diff --git a/dmn-core/src/test/resources/dmn/input/1.1/0007-date-time.dmn b/dmn-core/src/test/resources/dmn/input/1.1/0007-date-time.dmn index d1ff2ad74..013528c60 100644 --- a/dmn-core/src/test/resources/dmn/input/1.1/0007-date-time.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.1/0007-date-time.dmn @@ -1,5 +1,5 @@ - + feel:number diff --git a/dmn-core/src/test/resources/dmn/input/1.1/0014-loan-comparison.dmn b/dmn-core/src/test/resources/dmn/input/1.1/0014-loan-comparison.dmn index c23575ec5..36e852825 100644 --- a/dmn-core/src/test/resources/dmn/input/1.1/0014-loan-comparison.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.1/0014-loan-comparison.dmn @@ -1,6 +1,6 @@ - + feel:string diff --git a/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-duplicated-information-requirements.dmn b/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-duplicated-information-requirements.dmn index 79742421a..5b94becc1 100644 --- a/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-duplicated-information-requirements.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-duplicated-information-requirements.dmn @@ -1,5 +1,5 @@ - diff --git a/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-duplicates.dmn b/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-duplicates.dmn index d1b928363..26979c897 100644 --- a/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-duplicates.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-duplicates.dmn @@ -1,5 +1,5 @@ - feel:number diff --git a/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-missing-type-ref.dmn b/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-missing-type-ref.dmn index 92bd54b92..dd15e6f67 100644 --- a/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-missing-type-ref.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.1/test-dmn-with-missing-type-ref.dmn @@ -1,5 +1,5 @@ - diff --git a/dmn-core/src/test/resources/dmn/input/1.2/0004-lending.dmn b/dmn-core/src/test/resources/dmn/input/1.2/0004-lending.dmn index ffaef6889..1dc223893 100644 --- a/dmn-core/src/test/resources/dmn/input/1.2/0004-lending.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.2/0004-lending.dmn @@ -1,5 +1,5 @@ - + feel.string diff --git a/dmn-core/src/test/resources/dmn/input/1.2/0014-loan-comparison.dmn b/dmn-core/src/test/resources/dmn/input/1.2/0014-loan-comparison.dmn index 1434f19d1..959c7d3da 100644 --- a/dmn-core/src/test/resources/dmn/input/1.2/0014-loan-comparison.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.2/0014-loan-comparison.dmn @@ -1,5 +1,5 @@ - + feel.string diff --git a/dmn-core/src/test/resources/dmn/input/1.2/0087-chapter-11-example.dmn b/dmn-core/src/test/resources/dmn/input/1.2/0087-chapter-11-example.dmn index 589309edf..a08c8244a 100644 --- a/dmn-core/src/test/resources/dmn/input/1.2/0087-chapter-11-example.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.2/0087-chapter-11-example.dmn @@ -7,7 +7,7 @@ xmlns="http://www.trisotech.com/definitions/_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4" id="_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4" namespace="http://www.trisotech.com/definitions/_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4" - exporter="DMN Modeler" exporterVersion="6.0.7" name="Chapter 11 Example"> + exporter="DMN Modeler" exporterVersion="6.0.7" name="0087-chapter-11-example"> string diff --git a/dmn-core/src/test/resources/dmn/input/1.2/0089-model-a.dmn b/dmn-core/src/test/resources/dmn/input/1.2/0089-model-a.dmn index 920f29112..928dea5f2 100644 --- a/dmn-core/src/test/resources/dmn/input/1.2/0089-model-a.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.2/0089-model-a.dmn @@ -2,7 +2,7 @@ diff --git a/dmn-core/src/test/resources/dmn/input/1.2/0089-model-b.dmn b/dmn-core/src/test/resources/dmn/input/1.2/0089-model-b.dmn index 60f24cba7..e81bec027 100644 --- a/dmn-core/src/test/resources/dmn/input/1.2/0089-model-b.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.2/0089-model-b.dmn @@ -2,7 +2,7 @@ + exporter="DMN Modeler" exporterVersion="6.0.7" name="0087-chapter-11-example"> string diff --git a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-any.dmn b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-any.dmn index 3ba1045ac..0a5e44529 100644 --- a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-any.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-any.dmn @@ -1,4 +1,4 @@ - + Any diff --git a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-boolean.dmn b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-boolean.dmn index c6c8459c3..803bbf4d6 100644 --- a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-boolean.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-boolean.dmn @@ -1,4 +1,4 @@ - + Any diff --git a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-enumeration-missing.dmn b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-enumeration-missing.dmn index 536f5df74..580042d60 100644 --- a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-enumeration-missing.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-enumeration-missing.dmn @@ -1,4 +1,4 @@ - + Any diff --git a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-enumeration.dmn b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-enumeration.dmn index 5f99d4e72..f6204fc7b 100644 --- a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-enumeration.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-enumeration.dmn @@ -2,7 +2,7 @@ xmlns="https://kiegroup.org/dmn/_DCAF9EC7-124D-4025-8AA2-22A64C80DD9B" xmlns:kie="http://www.drools.org/kie/dmn/1.2" xmlns:dmndi="http://www.omg.org/spec/DMN/20180521/DMNDI/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" - id="_4B769E4A-A615-4556-BEB2-E79C7770A1D7" name="loan-grade" + id="_4B769E4A-A615-4556-BEB2-E79C7770A1D7" name="loan-grade-with-enumeration" typeLanguage="http://www.omg.org/spec/DMN/20180521/FEEL/" namespace="https://kiegroup.org/dmn/_DCAF9EC7-124D-4025-8AA2-22A64C80DD9B"> diff --git a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-1.dmn b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-1.dmn index bfa865ebf..37729caef 100644 --- a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-1.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-1.dmn @@ -1,4 +1,4 @@ - + Any diff --git a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-2.dmn b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-2.dmn index be7020b6b..f2755a8fd 100644 --- a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-2.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-2.dmn @@ -1,4 +1,4 @@ - + Any diff --git a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-3.dmn b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-3.dmn index 13d3ea40e..da1183131 100644 --- a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-3.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-intervals-3.dmn @@ -1,4 +1,4 @@ - + Any diff --git a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-relational-operators.dmn b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-relational-operators.dmn index d0ca4c706..16ca806a1 100644 --- a/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-relational-operators.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.3/loan-grade-with-relational-operators.dmn @@ -1,4 +1,4 @@ - + Any diff --git a/dmn-core/src/test/resources/dmn/input/1.4/0004-lending.dmn b/dmn-core/src/test/resources/dmn/input/1.4/0004-lending.dmn index 27ffbe8d7..041a266f1 100644 --- a/dmn-core/src/test/resources/dmn/input/1.4/0004-lending.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.4/0004-lending.dmn @@ -2,7 +2,7 @@ - + string diff --git a/dmn-core/src/test/resources/dmn/input/1.4/0087-chapter-11-example.dmn b/dmn-core/src/test/resources/dmn/input/1.4/0087-chapter-11-example.dmn index df5fcd932..08e7d6eba 100644 --- a/dmn-core/src/test/resources/dmn/input/1.4/0087-chapter-11-example.dmn +++ b/dmn-core/src/test/resources/dmn/input/1.4/0087-chapter-11-example.dmn @@ -1,5 +1,5 @@ - + string diff --git a/dmn-core/src/test/resources/jackson/v1_3/0004-lending.json b/dmn-core/src/test/resources/jackson/v1_3/0004-lending.json index 8e7809679..8aa0a61ef 100644 --- a/dmn-core/src/test/resources/jackson/v1_3/0004-lending.json +++ b/dmn-core/src/test/resources/jackson/v1_3/0004-lending.json @@ -1,6 +1,6 @@ { "@kind" : "definitions", - "name" : "Lending1", + "name" : "0004-lending", "id" : "_4e0f0b70-d31c-471c-bd52-5ca709ed362b", "expressionLanguage" : "https://www.omg.org/spec/DMN/20191111/FEEL/", "typeLanguage" : "https://www.omg.org/spec/DMN/20191111/FEEL/", diff --git a/dmn-core/src/test/resources/jackson/v1_3/0014-loan-comparison.json b/dmn-core/src/test/resources/jackson/v1_3/0014-loan-comparison.json index 7a51f7bd7..22c9e9d67 100644 --- a/dmn-core/src/test/resources/jackson/v1_3/0014-loan-comparison.json +++ b/dmn-core/src/test/resources/jackson/v1_3/0014-loan-comparison.json @@ -1,6 +1,6 @@ { "@kind" : "definitions", - "name" : "loanComparison", + "name" : "0014-loan-comparison", "id" : "_56c7d4a5-e6db-4bba-ac5f-dc082a16f719", "namespace" : "http://www.trisotech.com/definitions/_56c7d4a5-e6db-4bba-ac5f-dc082a16f719", "exporter" : "DMN Modeler; Method and Style trisofix.xslt", diff --git a/dmn-core/src/test/resources/jackson/v1_3/0087-chapter-11-example.json b/dmn-core/src/test/resources/jackson/v1_3/0087-chapter-11-example.json index f9fc123d6..4b125bf3f 100644 --- a/dmn-core/src/test/resources/jackson/v1_3/0087-chapter-11-example.json +++ b/dmn-core/src/test/resources/jackson/v1_3/0087-chapter-11-example.json @@ -1,6 +1,6 @@ { "@kind" : "definitions", - "name" : "Chapter 11 Example", + "name" : "0087-chapter-11-example", "id" : "_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4", "namespace" : "http://www.trisotech.com/definitions/_9d01a0c4-f529-4ad8-ad8e-ec5fb5d96ad4", "exporter" : "DMN Modeler", diff --git a/dmn-core/src/test/resources/jackson/v1_4/test20161014.json b/dmn-core/src/test/resources/jackson/v1_4/test20161014.json index ec8e10f13..e728999a1 100644 --- a/dmn-core/src/test/resources/jackson/v1_4/test20161014.json +++ b/dmn-core/src/test/resources/jackson/v1_4/test20161014.json @@ -1,6 +1,6 @@ { "@kind" : "definitions", - "name" : "test", + "name" : "test20161014", "namespace" : "http://tempuri.org", "description" : "dmn-ns:description", "itemDefinition" : [ { diff --git a/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services.dmn b/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services.dmn index 34aeb8f4e..13f7c4624 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services.dmn @@ -5,7 +5,7 @@ xmlns="http://www.trisotech.com/definitions/_686f58d4-4ec3-4c65-8c06-0e4fd8983def" exporter="DMN Modeler" exporterVersion="6.0.2.201802201132" id="_686f58d4-4ec3-4c65-8c06-0e4fd8983def" - name="Decision Services" + name="0004-decision-services" namespace="http://www.trisotech.com/definitions/_686f58d4-4ec3-4c65-8c06-0e4fd8983def" triso:logoChoice="Default"> diff --git a/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services_multiple_extensions.dmn b/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services_multiple_extensions.dmn index a07c15923..5697b74a4 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services_multiple_extensions.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services_multiple_extensions.dmn @@ -6,7 +6,7 @@ xmlns="http://www.trisotech.com/definitions/_686f58d4-4ec3-4c65-8c06-0e4fd8983def" exporter="DMN Modeler" exporterVersion="6.0.2.201802201132" id="_686f58d4-4ec3-4c65-8c06-0e4fd8983def" - name="Decision Services" + name="0004-decision-services_multiple_extensions" namespace="http://www.trisotech.com/definitions/_686f58d4-4ec3-4c65-8c06-0e4fd8983def" triso:logoChoice="Default"> diff --git a/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services_ns_other_location.dmn b/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services_ns_other_location.dmn index 16ed19e88..1ea85517f 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services_ns_other_location.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/0004-decision-services_ns_other_location.dmn @@ -6,7 +6,7 @@ xmlns="http://www.trisotech.com/definitions/_686f58d4-4ec3-4c65-8c06-0e4fd8983def" exporter="DMN Modeler" exporterVersion="6.0.2.201802201132" id="_686f58d4-4ec3-4c65-8c06-0e4fd8983def" - name="Decision Services" + name="0004-decision-services_ns_other_location" namespace="http://www.trisotech.com/definitions/_686f58d4-4ec3-4c65-8c06-0e4fd8983def" triso:logoChoice="Default"> diff --git a/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace.dmn b/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace.dmn index 168be0a73..8ee795ff9 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace.dmn @@ -5,7 +5,7 @@ xmlns="http://www.trisotech.com/definitions/_f2695525-ffe9-4c96-a9ec-15c18e555f68" exporter="DMN Modeler" exporterVersion="5.2.2" id="_f2695525-ffe9-4c96-a9ec-15c18e555f68" - name="Hello World semantic namespace" + name="Hello_World_semantic_namespace" namespace="http://www.trisotech.com/definitions/_f2695525-ffe9-4c96-a9ec-15c18e555f68" triso:logoChoice="Default"> diff --git a/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace_with_extensions.dmn b/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace_with_extensions.dmn index 44d1eefe9..77a01afbc 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace_with_extensions.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace_with_extensions.dmn @@ -7,7 +7,7 @@ xmlns="http://www.trisotech.com/definitions/_f2695525-ffe9-4c96-a9ec-15c18e555f68" exporter="DMN Modeler" exporterVersion="5.2.2" id="_f2695525-ffe9-4c96-a9ec-15c18e555f68" - name="Hello World semantic namespace" + name="Hello_World_semantic_namespace_with_extensions" namespace="http://www.trisotech.com/definitions/_f2695525-ffe9-4c96-a9ec-15c18e555f68" triso:logoChoice="Default"> diff --git a/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace_with_extensions_other_ns_location.dmn b/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace_with_extensions_other_ns_location.dmn index a0841a52a..14f4786d2 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace_with_extensions_other_ns_location.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/Hello_World_semantic_namespace_with_extensions_other_ns_location.dmn @@ -7,7 +7,7 @@ exporter="DMN Modeler" exporterVersion="5.2.2" id="_f2695525-ffe9-4c96-a9ec-15c18e555f68" - name="Hello World semantic namespace" + name="Hello_World_semantic_namespace_with_extensions_other_ns_location" namespace="http://www.trisotech.com/definitions/_f2695525-ffe9-4c96-a9ec-15c18e555f68" triso:logoChoice="Default"> diff --git a/dmn-core/src/test/resources/xstream/v1_1/ch11example.dmn b/dmn-core/src/test/resources/xstream/v1_1/ch11example.dmn index 23cbea192..fd556d0b5 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/ch11example.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/ch11example.dmn @@ -1,7 +1,7 @@ Implements model from chapter 11 of DMN 1.1 spec diff --git a/dmn-core/src/test/resources/xstream/v1_1/dish-decision.dmn b/dmn-core/src/test/resources/xstream/v1_1/dish-decision.dmn index 24e782486..c4343fd33 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/dish-decision.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/dish-decision.dmn @@ -1,7 +1,7 @@ diff --git a/dmn-core/src/test/resources/xstream/v1_1/dummy-definitions.dmn b/dmn-core/src/test/resources/xstream/v1_1/dummy-definitions.dmn index 25ee2721c..e2fd5bdbf 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/dummy-definitions.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/dummy-definitions.dmn @@ -1,7 +1,7 @@ description diff --git a/dmn-core/src/test/resources/xstream/v1_1/dummy-relation.dmn b/dmn-core/src/test/resources/xstream/v1_1/dummy-relation.dmn index c2d524039..4b05770f0 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/dummy-relation.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/dummy-relation.dmn @@ -1,7 +1,7 @@ description diff --git a/dmn-core/src/test/resources/xstream/v1_1/hardcoded-java-max-call.dmn b/dmn-core/src/test/resources/xstream/v1_1/hardcoded-java-max-call.dmn index a64b6c635..7bdfba69d 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/hardcoded-java-max-call.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/hardcoded-java-max-call.dmn @@ -4,7 +4,7 @@ xmlns:dmn11="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns="http://www.trisotech.com/dmn/definitions/_6ea3f4ee-7c6b-4cf8-8ba1-a86e538244b5" exporter="DMN Modeler" exporterVersion="6.1.12.1" id="_6ea3f4ee-7c6b-4cf8-8ba1-a86e538244b5" - name="Drawing 1" + name="hardcoded-java-max-call" namespace="http://www.trisotech.com/dmn/definitions/_6ea3f4ee-7c6b-4cf8-8ba1-a86e538244b5" triso:logoChoice="Default"> diff --git a/dmn-core/src/test/resources/xstream/v1_1/semantic-namespace.dmn b/dmn-core/src/test/resources/xstream/v1_1/semantic-namespace.dmn index 27c056566..41bd67b03 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/semantic-namespace.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/semantic-namespace.dmn @@ -6,7 +6,7 @@ xmlns="http://www.trisotech.com/definitions/_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" id="_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" namespace="http://www.trisotech.com/definitions/_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11" - exporter="DMN Modeler" exporterVersion="5.0.32.2" name="literal invocation1" + exporter="DMN Modeler" exporterVersion="5.0.32.2" name="semantic-namespace" triso:logoChoice="Default" xsi:schemaLocation="http://www.omg.org/spec/DMN/20151101/dmn.xsd ../../dmn.xsd"> diff --git a/dmn-core/src/test/resources/xstream/v1_1/test20161014.dmn b/dmn-core/src/test/resources/xstream/v1_1/test20161014.dmn index a41917406..e2d826e28 100644 --- a/dmn-core/src/test/resources/xstream/v1_1/test20161014.dmn +++ b/dmn-core/src/test/resources/xstream/v1_1/test20161014.dmn @@ -1,7 +1,7 @@ dmn-ns:description diff --git a/dmn-jpa-it/src/main/resources/dmn/example-credit-decision.dmn b/dmn-jpa-it/src/main/resources/dmn/example-credit-decision.dmn index 7bbc0917d..e0bb33d8d 100644 --- a/dmn-jpa-it/src/main/resources/dmn/example-credit-decision.dmn +++ b/dmn-jpa-it/src/main/resources/dmn/example-credit-decision.dmn @@ -1,5 +1,5 @@ - + feel:string diff --git a/dmn-maven-plugin/src/test/resources/input/0004-lending.dmn b/dmn-maven-plugin/src/test/resources/input/0004-lending.dmn index 87f84071d..cface1dca 100644 --- a/dmn-maven-plugin/src/test/resources/input/0004-lending.dmn +++ b/dmn-maven-plugin/src/test/resources/input/0004-lending.dmn @@ -1,5 +1,5 @@ - + feel:string diff --git a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/decision-table-with-annotations.dmn b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/decision-table-with-annotations.dmn index c42b1d265..25b728283 100644 --- a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/decision-table-with-annotations.dmn +++ b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/decision-table-with-annotations.dmn @@ -1,6 +1,6 @@ diff --git a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/ModelElementRegistry.java index ce6feaf56..97ef38147 100644 --- a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'tableTest' + // Register elements from model 'decision-table-with-annotations' register("priceGt10", "PriceGt10"); } } diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/0004-lending.dmn b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/0004-lending.dmn index 48918ccff..67418e4c0 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/0004-lending.dmn +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/0004-lending.dmn @@ -1,5 +1,5 @@ - + feel:string diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ModelElementRegistry.java index cee0814fd..5ab680f46 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'Lending1' + // Register elements from model '0004-lending' register("Adjudication", "Adjudication"); register("AffordabilityCalculation", "AffordabilityCalculation"); register("ApplicationRiskScore", "ApplicationRiskScore"); diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ModelElementRegistry.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ModelElementRegistry.kt index 2804a811e..1c44255b0 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ModelElementRegistry.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ModelElementRegistry.kt @@ -1,7 +1,7 @@ class ModelElementRegistry : com.gs.dmn.runtime.discovery.ModelElementRegistry { constructor() { - // Register elements from model 'Lending1' + // Register elements from model '0004-lending' register("Adjudication", "Adjudication") register("AffordabilityCalculation", "AffordabilityCalculation") register("ApplicantData", "ApplicantData") diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/date-time-proto.dmn b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/date-time-proto.dmn index 8cd874e0a..d3d1734ef 100644 --- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/date-time-proto.dmn +++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/date-time-proto.dmn @@ -1,5 +1,5 @@ - + feel:date diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/ModelElementRegistry.java index 97966deb5..3754c4fc6 100644 --- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'proto-date-time-function' + // Register elements from model 'date-time-proto' register("CompositeDateTime", "CompositeDateTime"); register("Date", "Date"); register("DateTime", "DateTime"); diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/ModelElementRegistry.kt b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/ModelElementRegistry.kt index 165ea5152..b49498b94 100644 --- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/ModelElementRegistry.kt +++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/ModelElementRegistry.kt @@ -1,7 +1,7 @@ class ModelElementRegistry : com.gs.dmn.runtime.discovery.ModelElementRegistry { constructor() { - // Register elements from model 'proto-date-time-function' + // Register elements from model 'date-time-proto' register("CompositeDateTime", "CompositeDateTime") register("CompositeInputDateTime", "CompositeInputDateTime") register("Date", "Date") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/0004-simpletable-U.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/0004-simpletable-U.dmn index b392aa4e3..a74e3f383 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/0004-simpletable-U.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/0004-simpletable-U.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ModelElementRegistry.java index 4be12ce0e..dc41b57a4 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'simple U table' + // Register elements from model '0004-simpletable-U' register("Approval Status", "ApprovalStatus"); } } diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ModelElementRegistry.kt b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ModelElementRegistry.kt index a475c6b4f..46bd266cf 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ModelElementRegistry.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ModelElementRegistry.kt @@ -1,7 +1,7 @@ class ModelElementRegistry : com.gs.dmn.runtime.discovery.ModelElementRegistry { constructor() { - // Register elements from model 'simple U table' + // Register elements from model '0004-simpletable-U' register("Age", "Age") register("Approval Status", "ApprovalStatus") register("RiskCategory", "RiskCategory") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/0005-simpletable-A.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/0005-simpletable-A.dmn index a04de8707..fb2e2a442 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/0005-simpletable-A.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/0005-simpletable-A.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ModelElementRegistry.java index 6d8b17687..ec8e63237 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'simple A table' + // Register elements from model '0005-simpletable-A' register("Approval Status", "ApprovalStatus"); } } diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ModelElementRegistry.kt b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ModelElementRegistry.kt index f2cff1503..0168e3d09 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ModelElementRegistry.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ModelElementRegistry.kt @@ -1,7 +1,7 @@ class ModelElementRegistry : com.gs.dmn.runtime.discovery.ModelElementRegistry { constructor() { - // Register elements from model 'simple A table' + // Register elements from model '0005-simpletable-A' register("Age", "Age") register("Approval Status", "ApprovalStatus") register("RiskCategory", "RiskCategory") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/0006-simpletable-P1.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/0006-simpletable-P1.dmn index d712792a3..be016d7b6 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/0006-simpletable-P1.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/0006-simpletable-P1.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ModelElementRegistry.java index a5769d7f5..80932b166 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'simple P table 1' + // Register elements from model '0006-simpletable-P1' register("Approval Status", "ApprovalStatus"); } } diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ModelElementRegistry.kt b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ModelElementRegistry.kt index 253695a2f..bbee04691 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ModelElementRegistry.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ModelElementRegistry.kt @@ -1,7 +1,7 @@ class ModelElementRegistry : com.gs.dmn.runtime.discovery.ModelElementRegistry { constructor() { - // Register elements from model 'simple P table 1' + // Register elements from model '0006-simpletable-P1' register("Age", "Age") register("Approval Status", "ApprovalStatus") register("RiskCategory", "RiskCategory") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/0007-simpletable-P2.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/0007-simpletable-P2.dmn index 3cea85384..7189f0f51 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/0007-simpletable-P2.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/0007-simpletable-P2.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ModelElementRegistry.java index db580c917..c1969a148 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'simple P table 2' + // Register elements from model '0007-simpletable-P2' register("Approval Status", "ApprovalStatus"); } } diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ModelElementRegistry.kt b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ModelElementRegistry.kt index 5e574956a..e3fc3a815 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ModelElementRegistry.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ModelElementRegistry.kt @@ -1,7 +1,7 @@ class ModelElementRegistry : com.gs.dmn.runtime.discovery.ModelElementRegistry { constructor() { - // Register elements from model 'simple P table 2' + // Register elements from model '0007-simpletable-P2' register("Age", "Age") register("Approval Status", "ApprovalStatus") register("RiskCategory", "RiskCategory") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/0008-LX-arithmetic.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/0008-LX-arithmetic.dmn index 076d99a83..18d04730d 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/0008-LX-arithmetic.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/0008-LX-arithmetic.dmn @@ -1,5 +1,5 @@ - + feel:number diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/ModelElementRegistry.java index ab0f2a21f..d66a9efa4 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'literal - arithmetic' + // Register elements from model '0008-LX-arithmetic' register("payment", "Payment"); } } diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/ModelElementRegistry.kt b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/ModelElementRegistry.kt index 01f636a55..13e64d1cd 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/ModelElementRegistry.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/ModelElementRegistry.kt @@ -1,7 +1,7 @@ class ModelElementRegistry : com.gs.dmn.runtime.discovery.ModelElementRegistry { constructor() { - // Register elements from model 'literal - arithmetic' + // Register elements from model '0008-LX-arithmetic' register("loan", "Loan") register("payment", "Payment") } diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/0009-invocation-arithmetic.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/0009-invocation-arithmetic.dmn index 48af63693..8506bb663 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/0009-invocation-arithmetic.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/0009-invocation-arithmetic.dmn @@ -1,5 +1,5 @@ - + feel:number diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/ModelElementRegistry.java index ec6709e26..750c3d19a 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'literal invocation1' + // Register elements from model '0009-invocation-arithmetic' register("MonthlyPayment", "MonthlyPayment"); register("PMT", "PMT"); } diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/ModelElementRegistry.kt b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/ModelElementRegistry.kt index fa00a80f0..58cd9ee70 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/ModelElementRegistry.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/ModelElementRegistry.kt @@ -1,7 +1,7 @@ class ModelElementRegistry : com.gs.dmn.runtime.discovery.ModelElementRegistry { constructor() { - // Register elements from model 'literal invocation1' + // Register elements from model '0009-invocation-arithmetic' register("Loan", "Loan") register("MonthlyPayment", "MonthlyPayment") register("PMT", "PMT") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/0010-multi-output-U.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/0010-multi-output-U.dmn index 7c3785da7..24d513451 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/0010-multi-output-U.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/0010-multi-output-U.dmn @@ -1,5 +1,5 @@ - + feel:string diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/ModelElementRegistry.java index 2ef7c0252..7c1d83dac 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'multi-output-table' + // Register elements from model '0010-multi-output-U' register("Approval", "Approval"); } } diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/ModelElementRegistry.kt b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/ModelElementRegistry.kt index f26f129a6..a7850f3d4 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/ModelElementRegistry.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/ModelElementRegistry.kt @@ -1,7 +1,7 @@ class ModelElementRegistry : com.gs.dmn.runtime.discovery.ModelElementRegistry { constructor() { - // Register elements from model 'multi-output-table' + // Register elements from model '0010-multi-output-U' register("Age", "Age") register("Approval", "Approval") register("RiskCategory", "RiskCategory") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0100-feel-constants/translator/0100-feel-constants.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0100-feel-constants/translator/0100-feel-constants.dmn index 33741ee35..5ff93cf27 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0100-feel-constants/translator/0100-feel-constants.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0100-feel-constants/translator/0100-feel-constants.dmn @@ -1,5 +1,5 @@ - diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0101-feel-constants/translator/0101-feel-constants.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0101-feel-constants/translator/0101-feel-constants.dmn index 617b55f21..b9b41b7c6 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0101-feel-constants/translator/0101-feel-constants.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0101-feel-constants/translator/0101-feel-constants.dmn @@ -1,5 +1,5 @@ - diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0102-feel-constants/translator/0102-feel-constants.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0102-feel-constants/translator/0102-feel-constants.dmn index d8d0a512f..f52bdc155 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0102-feel-constants/translator/0102-feel-constants.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0102-feel-constants/translator/0102-feel-constants.dmn @@ -1,5 +1,5 @@ - diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0102-feel-constants/translator/expected/java/dmn/ModelElementRegistry.java b/dmn-test-cases/standard/tck/1.1/cl2/0102-feel-constants/translator/expected/java/dmn/ModelElementRegistry.java index edd002756..33191b2b3 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0102-feel-constants/translator/expected/java/dmn/ModelElementRegistry.java +++ b/dmn-test-cases/standard/tck/1.1/cl2/0102-feel-constants/translator/expected/java/dmn/ModelElementRegistry.java @@ -1,7 +1,7 @@ public class ModelElementRegistry extends com.gs.dmn.runtime.discovery.ModelElementRegistry { public ModelElementRegistry() { - // Register elements from model 'feel-constants' + // Register elements from model '0102-feel-constants' register("Decision1", "Decision1"); register("Decision2", "Decision2"); register("Decision3", "Decision3"); diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0105-feel-math/translator/0105-feel-math.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0105-feel-math/translator/0105-feel-math.dmn index 19d88f971..c21b03f3e 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0105-feel-math/translator/0105-feel-math.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0105-feel-math/translator/0105-feel-math.dmn @@ -1,5 +1,5 @@ - diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0106-feel-ternary-logic/translator/0106-feel-ternary-logic.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0106-feel-ternary-logic/translator/0106-feel-ternary-logic.dmn index e12dae37b..21767fc4e 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0106-feel-ternary-logic/translator/0106-feel-ternary-logic.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0106-feel-ternary-logic/translator/0106-feel-ternary-logic.dmn @@ -1,5 +1,5 @@ - diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0107-feel-ternary-logic-not/translator/0107-feel-ternary-logic-not.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0107-feel-ternary-logic-not/translator/0107-feel-ternary-logic-not.dmn index db169f60e..b316b04eb 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0107-feel-ternary-logic-not/translator/0107-feel-ternary-logic-not.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0107-feel-ternary-logic-not/translator/0107-feel-ternary-logic-not.dmn @@ -1,5 +1,5 @@ - diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0108-first-hitpolicy/translator/0108-first-hitpolicy.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0108-first-hitpolicy/translator/0108-first-hitpolicy.dmn index 64d49ddc6..634826059 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0108-first-hitpolicy/translator/0108-first-hitpolicy.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0108-first-hitpolicy/translator/0108-first-hitpolicy.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0109-ruleOrder-hitpolicy/translator/0109-ruleOrder-hitpolicy.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0109-ruleOrder-hitpolicy/translator/0109-ruleOrder-hitpolicy.dmn index 101dd4058..c0a936d0a 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0109-ruleOrder-hitpolicy/translator/0109-ruleOrder-hitpolicy.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0109-ruleOrder-hitpolicy/translator/0109-ruleOrder-hitpolicy.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0110-outputOrder-hitpolicy/translator/0110-outputOrder-hitpolicy.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0110-outputOrder-hitpolicy/translator/0110-outputOrder-hitpolicy.dmn index ce9600225..1db267ade 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0110-outputOrder-hitpolicy/translator/0110-outputOrder-hitpolicy.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0110-outputOrder-hitpolicy/translator/0110-outputOrder-hitpolicy.dmn @@ -1,5 +1,5 @@ - + diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0111-first-hitpolicy-singleoutputcol/translator/0111-first-hitpolicy-singleoutputcol.dmn b/dmn-test-cases/standard/tck/1.1/cl2/0111-first-hitpolicy-singleoutputcol/translator/0111-first-hitpolicy-singleoutputcol.dmn index ae6b68684..49b172337 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0111-first-hitpolicy-singleoutputcol/translator/0111-first-hitpolicy-singleoutputcol.dmn +++ b/dmn-test-cases/standard/tck/1.1/cl2/0111-first-hitpolicy-singleoutputcol/translator/0111-first-hitpolicy-singleoutputcol.dmn @@ -1,5 +1,5 @@ - +