diff --git a/src/rougail/output_doc/annotator.py b/src/rougail/output_doc/annotator.py
index dc22d32a3..0b5321a43 100644
--- a/src/rougail/output_doc/annotator.py
+++ b/src/rougail/output_doc/annotator.py
@@ -88,7 +88,7 @@ class Annotator(Walk):
"""For dynamic we must have values to document it"""
if not isinstance(value, Calculation):
return
- default_values = ["example"]
+ value_added = False
if isinstance(value, (VariableCalculation, VariablePropertyCalculation)):
variable = self.objectspace.paths.get_with_dynamic(
value.variable,
@@ -97,21 +97,29 @@ class Annotator(Walk):
value.namespace,
value.xmlfiles,
)[0]
- if variable:
- values = self.get_examples_values(variable)
- if values:
- default_values = values
- if not return_a_list:
- default_values = default_values[0]
- value.default_values = default_values
+ if variable and not variable.default:
+ values = self.add_examples_values(variable)
+ value_added = True
+ if not value_added:
+ default_values = ["example"]
+ if not return_a_list:
+ default_values = default_values[0]
+ value.default_values = default_values
- def get_examples_values(self, variable) -> list:
- """Check examples or test information to define examples values"""
+ def add_examples_values(self, variable) -> list:
+ """Check examples or test information to define examples values in a variable"""
values = self.objectspace.informations.get(variable.path).get("examples", None)
if not values:
values = self.objectspace.informations.get(variable.path).get("test", None)
if isinstance(values, tuple):
values = list(values)
+ if values:
+ variable.default = list(values)
+ else:
+ variable.default = [CONVERT_OPTION[variable.type]["example"]]
+ self.objectspace.informations.add(
+ variable.path, "default_value_makes_sense", False
+ )
return values
def populate_variable(self) -> None:
@@ -139,14 +147,7 @@ class Annotator(Walk):
variable.version,
)
if variable.path in self.objectspace.leaders and not variable.default:
- values = self.get_examples_values(variable)
- if values:
- variable.default = list(values)
- else:
- variable.default = [CONVERT_OPTION[variable.type]["example"]]
- self.objectspace.informations.add(
- variable.path, "default_value_makes_sense", False
- )
+ self.add_examples_values(variable)
self.objectspace.informations.add(
variable.path, "dictionaries", variable.xmlfiles
)
diff --git a/src/rougail/output_doc/doc.py b/src/rougail/output_doc/doc.py
index bff0a4e2a..1d2f9c3c1 100644
--- a/src/rougail/output_doc/doc.py
+++ b/src/rougail/output_doc/doc.py
@@ -375,7 +375,7 @@ class RougailOutputDoc(Examples):
informations["example"] = [example]
informations["mandatory_without_value"] = "mandatory" in variable.property.get(
uncalculated=True
- ) and variable.value.get(uncalculated=True) in [None, []]
+ ) and (not variable.information.get("default_value_makes_sense", True) or variable.value.get(uncalculated=True) in [None, []])
def _get_example(self, variable, informations: dict, leader):
example = informations.get("examples")
@@ -510,14 +510,13 @@ class RougailOutputDoc(Examples):
self,
variable,
):
- if not variable.information.get("default_value_makes_sense", True):
- return None
default = self._to_string(variable, "default", do_not_raise=True)
if default is not None:
if default == []:
default = None
return default
- default = variable.value.get(uncalculated=True)
+ if variable.information.get("default_value_makes_sense", True):
+ default = variable.value.get(uncalculated=True)
if default == []:
default = None
return default
@@ -526,11 +525,8 @@ class RougailOutputDoc(Examples):
self,
variable,
prop,
- identifier="",
do_not_raise=False,
):
- if identifier:
- raise Exception("pfff")
calculation = variable.information.get(f"{prop}_calculation", None)
if not calculation:
if do_not_raise:
diff --git a/tests/results/test_examples/40_0leadership.md b/tests/results/test_examples/40_0leadership.md
index 43c303476..19d03c91b 100644
--- a/tests/results/test_examples/40_0leadership.md
+++ b/tests/results/test_examples/40_0leadership.md
@@ -1,3 +1,12 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+leader:
+ - leader: example
+ follower1: example
+ follower2: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_examples/40_0leadership_diff_name.md b/tests/results/test_examples/40_0leadership_diff_name.md
index 73d86e145..904d8d9ea 100644
--- a/tests/results/test_examples/40_0leadership_diff_name.md
+++ b/tests/results/test_examples/40_0leadership_diff_name.md
@@ -1,3 +1,12 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+leadership:
+ - leader: example
+ follower1: example
+ follower2: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_examples/40_0leadership_follower_default_calculation.md b/tests/results/test_examples/40_0leadership_follower_default_calculation.md
index b534d8ec0..884acce0c 100644
--- a/tests/results/test_examples/40_0leadership_follower_default_calculation.md
+++ b/tests/results/test_examples/40_0leadership_follower_default_calculation.md
@@ -1,3 +1,10 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+leader:
+ - leader: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_examples/40_0leadership_leader_not_multi.md b/tests/results/test_examples/40_0leadership_leader_not_multi.md
index 0ebf7c457..9bdd69a60 100644
--- a/tests/results/test_examples/40_0leadership_leader_not_multi.md
+++ b/tests/results/test_examples/40_0leadership_leader_not_multi.md
@@ -1,3 +1,13 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+general1:
+ leader:
+ - leader: example
+ follower1: example
+ follower2: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_examples/40_1leadership_append_follower.md b/tests/results/test_examples/40_1leadership_append_follower.md
index dd5cdf50f..f2ba24336 100644
--- a/tests/results/test_examples/40_1leadership_append_follower.md
+++ b/tests/results/test_examples/40_1leadership_append_follower.md
@@ -1,3 +1,13 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+leader:
+ - leader: example
+ follower1: example
+ follower2: example
+ follower3: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_examples/40_6leadership_follower_multi.md b/tests/results/test_examples/40_6leadership_follower_multi.md
index 3b7720845..d64da0a2d 100644
--- a/tests/results/test_examples/40_6leadership_follower_multi.md
+++ b/tests/results/test_examples/40_6leadership_follower_multi.md
@@ -1,3 +1,12 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+leadership:
+ - leader: example
+ follower1:
+ - example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_examples/44_4leadership_mandatory.md b/tests/results/test_examples/44_4leadership_mandatory.md
index bfc6c8f69..d4e8bb799 100644
--- a/tests/results/test_examples/44_4leadership_mandatory.md
+++ b/tests/results/test_examples/44_4leadership_mandatory.md
@@ -1,3 +1,10 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+leader:
+ - leader: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.md b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.md
index 9995b06b3..5aea301c3 100644
--- a/tests/results/test_examples/44_6leadership_follower_disabled_calculation.md
+++ b/tests/results/test_examples/44_6leadership_follower_disabled_calculation.md
@@ -1,3 +1,11 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+leader:
+ - leader: example
+ follower: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_examples/60_6family_dynamic_leadership.md b/tests/results/test_examples/60_6family_dynamic_leadership.md
index 33183efbc..a5a6fb38e 100644
--- a/tests/results/test_examples/60_6family_dynamic_leadership.md
+++ b/tests/results/test_examples/60_6family_dynamic_leadership.md
@@ -1,3 +1,14 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+dynval1:
+ leadership:
+ - leader: example
+dynval2:
+ leadership:
+ - leader: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_examples/60_6family_dynamic_leadership_empty.md b/tests/results/test_examples/60_6family_dynamic_leadership_empty.md
index 33183efbc..a5a6fb38e 100644
--- a/tests/results/test_examples/60_6family_dynamic_leadership_empty.md
+++ b/tests/results/test_examples/60_6family_dynamic_leadership_empty.md
@@ -1,3 +1,14 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+dynval1:
+ leadership:
+ - leader: example
+dynval2:
+ leadership:
+ - leader: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.adoc b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.adoc
index 8e45eabe4..e731b7509 100644
--- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.adoc
+++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.adoc
@@ -47,22 +47,28 @@ This family builds families dynamically.
| Variable | Description
|
-**rougail.dyn__val1__.dyn___example__.var** +
-**rougail.dyn__val2__.dyn___example__.var** +
+**rougail.dyn__val1__.dyn___tval1__.var** +
+**rougail.dyn__val1__.dyn___tval2__.var** +
+**rougail.dyn__val2__.dyn___tval1__.var** +
+**rougail.dyn__val2__.dyn___tval2__.var** +
`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` |
A variable dynamic. +
**Default**: the value of the identifier.
|
-**rougail.dyn__val1__.dyn___example__.var_identifier** +
-**rougail.dyn__val2__.dyn___example__.var_identifier** +
+**rougail.dyn__val1__.dyn___tval1__.var_identifier** +
+**rougail.dyn__val1__.dyn___tval2__.var_identifier** +
+**rougail.dyn__val2__.dyn___tval1__.var_identifier** +
+**rougail.dyn__val2__.dyn___tval2__.var_identifier** +
`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` |
Identifier from first family. +
**Default**: the value of the identifier.
|
-**rougail.dyn__val1__.dyn___example__.var_identifiers** +
-**rougail.dyn__val2__.dyn___example__.var_identifiers** +
+**rougail.dyn__val1__.dyn___tval1__.var_identifiers** +
+**rougail.dyn__val1__.dyn___tval2__.var_identifiers** +
+**rougail.dyn__val2__.dyn___tval1__.var_identifiers** +
+**rougail.dyn__val2__.dyn___tval2__.var_identifiers** +
`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory` |
Merge identifiers. +
**Default**: join identifier 1 et identifier 2.
diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json
index 7afa06b29..e85ed761a 100644
--- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json
+++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json
@@ -116,12 +116,16 @@
"type": "dynamic",
"informations": {
"paths": [
- "rougail.dynval1.dyn_example",
- "rougail.dynval2.dyn_example"
+ "rougail.dynval1.dyn_tval1",
+ "rougail.dynval1.dyn_tval2",
+ "rougail.dynval2.dyn_tval1",
+ "rougail.dynval2.dyn_tval2"
],
"names": [
- "dyn_example",
- "dyn_example"
+ "dyn_tval1",
+ "dyn_tval2",
+ "dyn_tval1",
+ "dyn_tval2"
],
"description": "a Second dynamic variable",
"properties": [
@@ -138,10 +142,14 @@
"children": {
"rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var": {
"paths": [
- "rougail.dynval1.dyn_example.var",
- "rougail.dynval2.dyn_example.var"
+ "rougail.dynval1.dyn_tval1.var",
+ "rougail.dynval1.dyn_tval2.var",
+ "rougail.dynval2.dyn_tval1.var",
+ "rougail.dynval2.dyn_tval2.var"
],
"names": [
+ "var",
+ "var",
"var",
"var"
],
@@ -167,10 +175,14 @@
},
"rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifier": {
"paths": [
- "rougail.dynval1.dyn_example.var_identifier",
- "rougail.dynval2.dyn_example.var_identifier"
+ "rougail.dynval1.dyn_tval1.var_identifier",
+ "rougail.dynval1.dyn_tval2.var_identifier",
+ "rougail.dynval2.dyn_tval1.var_identifier",
+ "rougail.dynval2.dyn_tval2.var_identifier"
],
"names": [
+ "var_identifier",
+ "var_identifier",
"var_identifier",
"var_identifier"
],
@@ -196,10 +208,14 @@
},
"rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers": {
"paths": [
- "rougail.dynval1.dyn_example.var_identifiers",
- "rougail.dynval2.dyn_example.var_identifiers"
+ "rougail.dynval1.dyn_tval1.var_identifiers",
+ "rougail.dynval1.dyn_tval2.var_identifiers",
+ "rougail.dynval2.dyn_tval1.var_identifiers",
+ "rougail.dynval2.dyn_tval2.var_identifiers"
],
"names": [
+ "var_identifiers",
+ "var_identifiers",
"var_identifiers",
"var_identifiers"
],
diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.md b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.md
index fdd8e13b8..a318a1a4e 100644
--- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.md
+++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.md
@@ -26,7 +26,7 @@ This family builds families dynamically.
| Variable | Description |
|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **rougail.dyn*val1*.dyn_*example*.var**
**rougail.dyn*val2*.dyn_*example*.var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable dynamic.
**Default**: the value of the identifier. |
-| **rougail.dyn*val1*.dyn_*example*.var_identifier**
**rougail.dyn*val2*.dyn_*example*.var_identifier**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Identifier from first family.
**Default**: the value of the identifier. |
-| **rougail.dyn*val1*.dyn_*example*.var_identifiers**
**rougail.dyn*val2*.dyn_*example*.var_identifiers**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Merge identifiers.
**Default**: join identifier 1 et identifier 2. |
+| **rougail.dyn*val1*.dyn_*tval1*.var**
**rougail.dyn*val1*.dyn_*tval2*.var**
**rougail.dyn*val2*.dyn_*tval1*.var**
**rougail.dyn*val2*.dyn_*tval2*.var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | A variable dynamic.
**Default**: the value of the identifier. |
+| **rougail.dyn*val1*.dyn_*tval1*.var_identifier**
**rougail.dyn*val1*.dyn_*tval2*.var_identifier**
**rougail.dyn*val2*.dyn_*tval1*.var_identifier**
**rougail.dyn*val2*.dyn_*tval2*.var_identifier**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Identifier from first family.
**Default**: the value of the identifier. |
+| **rougail.dyn*val1*.dyn_*tval1*.var_identifiers**
**rougail.dyn*val1*.dyn_*tval2*.var_identifiers**
**rougail.dyn*val2*.dyn_*tval1*.var_identifiers**
**rougail.dyn*val2*.dyn_*tval2*.var_identifiers**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory` | Merge identifiers.
**Default**: join identifier 1 et identifier 2. |
diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.sh b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.sh
index de0bb44a4..b84a4ce5d 100644
--- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.sh
+++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.sh
@@ -50,15 +50,21 @@ This family builds families dynamically.
┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃
┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
-│ [1mrougail.dyn[0m[1;3mval1[0m[1m.dyn_[0m[1;3mexample[0m[1m.var[0m │ A variable dynamic. │
-│ [1mrougail.dyn[0m[1;3mval2[0m[1m.dyn_[0m[1;3mexample[0m[1m.var[0m │ [1mDefault[0m: the value of the │
-│ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m │ identifier. │
+│ [1mrougail.dyn[0m[1;3mval1[0m[1m.dyn_[0m[1;3mtval1[0m[1m.var[0m │ A variable dynamic. │
+│ [1mrougail.dyn[0m[1;3mval1[0m[1m.dyn_[0m[1;3mtval2[0m[1m.var[0m │ [1mDefault[0m: the value of the │
+│ [1mrougail.dyn[0m[1;3mval2[0m[1m.dyn_[0m[1;3mtval1[0m[1m.var[0m │ identifier. │
+│ [1mrougail.dyn[0m[1;3mval2[0m[1m.dyn_[0m[1;3mtval2[0m[1m.var[0m │ │
+│ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m │ │
├───────────────────────────────────────┼──────────────────────────────────────┤
-│ [1mrougail.dyn[0m[1;3mval1[0m[1m.dyn_[0m[1;3mexample[0m[1m.var_iden…[0m │ Identifier from first family. │
-│ [1mrougail.dyn[0m[1;3mval2[0m[1m.dyn_[0m[1;3mexample[0m[1m.var_iden…[0m │ [1mDefault[0m: the value of the │
-│ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m │ identifier. │
+│ [1mrougail.dyn[0m[1;3mval1[0m[1m.dyn_[0m[1;3mtval1[0m[1m.var_identi…[0m │ Identifier from first family. │
+│ [1mrougail.dyn[0m[1;3mval1[0m[1m.dyn_[0m[1;3mtval2[0m[1m.var_identi…[0m │ [1mDefault[0m: the value of the │
+│ [1mrougail.dyn[0m[1;3mval2[0m[1m.dyn_[0m[1;3mtval1[0m[1m.var_identi…[0m │ identifier. │
+│ [1mrougail.dyn[0m[1;3mval2[0m[1m.dyn_[0m[1;3mtval2[0m[1m.var_identi…[0m │ │
+│ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m │ │
├───────────────────────────────────────┼──────────────────────────────────────┤
-│ [1mrougail.dyn[0m[1;3mval1[0m[1m.dyn_[0m[1;3mexample[0m[1m.var_iden…[0m │ Merge identifiers. │
-│ [1mrougail.dyn[0m[1;3mval2[0m[1m.dyn_[0m[1;3mexample[0m[1m.var_iden…[0m │ [1mDefault[0m: join identifier 1 et │
-│ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m │ identifier 2. │
+│ [1mrougail.dyn[0m[1;3mval1[0m[1m.dyn_[0m[1;3mtval1[0m[1m.var_identi…[0m │ Merge identifiers. │
+│ [1mrougail.dyn[0m[1;3mval1[0m[1m.dyn_[0m[1;3mtval2[0m[1m.var_identi…[0m │ [1mDefault[0m: join identifier 1 et │
+│ [1mrougail.dyn[0m[1;3mval2[0m[1m.dyn_[0m[1;3mtval1[0m[1m.var_identi…[0m │ identifier 2. │
+│ [1mrougail.dyn[0m[1;3mval2[0m[1m.dyn_[0m[1;3mtval2[0m[1m.var_identi…[0m │ │
+│ [1;7m string [0m [1;7m standard [0m [1;7m mandatory [0m │ │
└───────────────────────────────────────┴──────────────────────────────────────┘
diff --git a/tests/results/test_namespace_examples/40_0leadership.md b/tests/results/test_namespace_examples/40_0leadership.md
index 071178973..cadcc45ef 100644
--- a/tests/results/test_namespace_examples/40_0leadership.md
+++ b/tests/results/test_namespace_examples/40_0leadership.md
@@ -1,3 +1,13 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+ leader:
+ - leader: example
+ follower1: example
+ follower2: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace_examples/40_0leadership_diff_name.md b/tests/results/test_namespace_examples/40_0leadership_diff_name.md
index 4e956b6bb..cb3a07b6c 100644
--- a/tests/results/test_namespace_examples/40_0leadership_diff_name.md
+++ b/tests/results/test_namespace_examples/40_0leadership_diff_name.md
@@ -1,3 +1,13 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+ leadership:
+ - leader: example
+ follower1: example
+ follower2: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace_examples/40_0leadership_follower_default_calculation.md b/tests/results/test_namespace_examples/40_0leadership_follower_default_calculation.md
index 3307369f3..71533764d 100644
--- a/tests/results/test_namespace_examples/40_0leadership_follower_default_calculation.md
+++ b/tests/results/test_namespace_examples/40_0leadership_follower_default_calculation.md
@@ -1,3 +1,11 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+ leader:
+ - leader: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace_examples/40_0leadership_leader_not_multi.md b/tests/results/test_namespace_examples/40_0leadership_leader_not_multi.md
index 98d1014ef..69cbc6999 100644
--- a/tests/results/test_namespace_examples/40_0leadership_leader_not_multi.md
+++ b/tests/results/test_namespace_examples/40_0leadership_leader_not_multi.md
@@ -1,3 +1,14 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+ general1:
+ leader:
+ - leader: example
+ follower1: example
+ follower2: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace_examples/40_1leadership_append_follower.md b/tests/results/test_namespace_examples/40_1leadership_append_follower.md
index ba93f42b8..40fbbcbc9 100644
--- a/tests/results/test_namespace_examples/40_1leadership_append_follower.md
+++ b/tests/results/test_namespace_examples/40_1leadership_append_follower.md
@@ -1,3 +1,14 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+ leader:
+ - leader: example
+ follower1: example
+ follower2: example
+ follower3: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace_examples/40_6leadership_follower_multi.md b/tests/results/test_namespace_examples/40_6leadership_follower_multi.md
index 039280c41..789e042a6 100644
--- a/tests/results/test_namespace_examples/40_6leadership_follower_multi.md
+++ b/tests/results/test_namespace_examples/40_6leadership_follower_multi.md
@@ -1,3 +1,13 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+ leadership:
+ - leader: example
+ follower1:
+ - example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace_examples/44_4leadership_mandatory.md b/tests/results/test_namespace_examples/44_4leadership_mandatory.md
index d7883b203..c06d39f40 100644
--- a/tests/results/test_namespace_examples/44_4leadership_mandatory.md
+++ b/tests/results/test_namespace_examples/44_4leadership_mandatory.md
@@ -1,3 +1,11 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+ leader:
+ - leader: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.md b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.md
index 5ce006378..1faed1f1c 100644
--- a/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.md
+++ b/tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.md
@@ -1,3 +1,12 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+ leader:
+ - leader: example
+ follower: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_leadership.md b/tests/results/test_namespace_examples/60_6family_dynamic_leadership.md
index 85edcd997..45c02aa29 100644
--- a/tests/results/test_namespace_examples/60_6family_dynamic_leadership.md
+++ b/tests/results/test_namespace_examples/60_6family_dynamic_leadership.md
@@ -1,3 +1,15 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+ dynval1:
+ leadership:
+ - leader: example
+ dynval2:
+ leadership:
+ - leader: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_leadership_empty.md b/tests/results/test_namespace_examples/60_6family_dynamic_leadership_empty.md
index 85edcd997..45c02aa29 100644
--- a/tests/results/test_namespace_examples/60_6family_dynamic_leadership_empty.md
+++ b/tests/results/test_namespace_examples/60_6family_dynamic_leadership_empty.md
@@ -1,3 +1,15 @@
+# Example with mandatory variables not filled in
+
+```yaml
+---
+rougail:
+ dynval1:
+ leadership:
+ - leader: example
+ dynval2:
+ leadership:
+ - leader: example
+```
# Example with all variables modifiable
```yaml
diff --git a/tests/results/test_namespace_examples/60_6family_dynamic_sub_dynamic_empty.md b/tests/results/test_namespace_examples/60_6family_dynamic_sub_dynamic_empty.md
index da8bcd899..226a61f17 100644
--- a/tests/results/test_namespace_examples/60_6family_dynamic_sub_dynamic_empty.md
+++ b/tests/results/test_namespace_examples/60_6family_dynamic_sub_dynamic_empty.md
@@ -8,16 +8,26 @@ rougail:
- val2
dynval1:
var:
- - example
- dyn_example:
- var: example
+ - tval1
+ - tval2
+ dyn_tval1:
+ var: tval1
var_identifier: val1
- var_identifiers: val1-example
+ var_identifiers: val1-tval1
+ dyn_tval2:
+ var: tval2
+ var_identifier: val1
+ var_identifiers: val1-tval2
dynval2:
var:
- - example
- dyn_example:
- var: example
+ - tval1
+ - tval2
+ dyn_tval1:
+ var: tval1
var_identifier: val2
- var_identifiers: val2-example
+ var_identifiers: val2-tval1
+ dyn_tval2:
+ var: tval2
+ var_identifier: val2
+ var_identifiers: val2-tval2
```
diff --git a/tests/test_load.py b/tests/test_load.py
index 6ad648fda..4cbbc4c00 100644
--- a/tests/test_load.py
+++ b/tests/test_load.py
@@ -14,7 +14,7 @@ excludes = [
]
test_ok = get_structures_list(excludes)
-# test_ok = [Path('../rougail-tests/structures/60_5family_dynamic_calc_suffix_disabled2')]
+# test_ok = [Path('../rougail-tests/structures/60_0family_dynamic_test')]
os.environ['COLUMNS'] = '80'