fix tests

OpenTOSCA · Dec 25, 2024 · 39bc0c1 · 39bc0c1
1 parent fa42769
commit 39bc0c1
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 8 deletions.
diff --git a/docs/docs/variability4tosca/specification/index.md b/docs/docs/variability4tosca/specification/index.md
@@ -282,6 +282,7 @@ The following options are used to configure constraints.
 | constraints                           | false     | Boolean  | false   | Enable all constraints.                                          |
 | relation_source_constraint            | false     | Boolean  | false   | Enable the constraint regarding present relation sources.        |
 | relation_target_constraint            | false     | Boolean  | false   | Enable the constraint regarding present relation targets.        |
+| relation_enhanced_implication_mode    | false     | Boolean  | true    | Enable enhanced implied relations.                               |
 | artifact_container_constraint         | false     | Boolean  | false   | Enable the constraint regarding present container of artifacts.  |
 | property_container_constraint         | false     | Boolean  | false   | Enable the constraint regarding present container of properties. |
 | type_container_constraint             | false     | Boolean  | false   | Enable the constraint regarding present containers of types.     |

diff --git a/src/specification/variability.ts b/src/specification/variability.ts
@@ -68,9 +68,6 @@ export type ConstraintsOptions = {
     constraints?: boolean
     relation_source_constraint?: boolean
     relation_target_constraint?: boolean
-    // TODO: doc
-    // TODO: implement
-    // TODO: tests
     relation_enhanced_implication_mode?: boolean
     artifact_container_constraint?: boolean
     property_container_constraint?: boolean

diff --git a/...implications-naive/requires/template.yaml → ...s-naive/requires---disabled/template.yaml b/...implications-naive/requires/template.yaml → ...s-naive/requires---disabled/template.yaml
diff --git a/tests/conformance/implications-naive/requires---disabled/test.yaml b/tests/conformance/implications-naive/requires---disabled/test.yaml
@@ -0,0 +1,3 @@
+presets: left
+error: Could not solve
+description: disabled since we support now enhanced implied relations
diff --git a/tests/conformance/implications-naive/requires/test.yaml b/tests/conformance/implications-naive/requires/test.yaml
diff --git a/...mance/implications/requires/template.yaml → ...cations/requires---disabled/template.yaml b/...mance/implications/requires/template.yaml → ...cations/requires---disabled/template.yaml
diff --git a/tests/conformance/implications/requires---disabled/test.yaml b/tests/conformance/implications/requires---disabled/test.yaml
@@ -0,0 +1,3 @@
+presets: left
+error: Could not solve
+description: disabled since we support now enhanced implied relations
diff --git a/tests/conformance/implications/requires/test.yaml b/tests/conformance/implications/requires/test.yaml
diff --git a/...nformance/implied-host/broken/inputs.yaml → ...mplied-host/broken---disabled/inputs.yaml b/...nformance/implied-host/broken/inputs.yaml → ...mplied-host/broken---disabled/inputs.yaml
diff --git a/...ormance/implied-host/broken/template.yaml → ...lied-host/broken---disabled/template.yaml b/...ormance/implied-host/broken/template.yaml → ...lied-host/broken---disabled/template.yaml
diff --git a/...conformance/implied-host/broken/test.yaml → .../implied-host/broken---disabled/test.yaml b/...conformance/implied-host/broken/test.yaml → .../implied-host/broken---disabled/test.yaml
@@ -1,2 +1,2 @@
 error: Could not solve
-description: Only one hosting relation must be present. Hence, there is a conflict between implied relations and hosting constraints.
+description: Only one hosting relation must be present. Hence, there is a conflict between implied relations and hosting constraints. Disabled since we support now enhanced implied relations.
diff --git a/tests/enricher/implied/expected.yaml b/tests/enricher/implied/expected.yaml
@@ -45,11 +45,13 @@ topology_template:
                   - and:
                         - node.worker
                         - [email protected]
+                        - manual.node.left
                   - [email protected]
             - implies:
                   - and:
                         - node.worker
                         - [email protected]
+                        - manual.node.right
                   - [email protected]
     node_templates:
         - worker: