From dce8fd88a7925a77cda35fbb960810a03a379861 Mon Sep 17 00:00:00 2001 From: ewuerger Date: Mon, 16 Jan 2023 11:13:55 +0100 Subject: [PATCH] test(svg): Add guards to `[MSM] Weather Modes` and add it to tested diagrams - Changed TestModel 5.0 and 5.2 --- .../melodymodel/5_0/Melody Model Test.aird | 34 ++++---- .../melodymodel/5_0/Melody Model Test.capella | 85 ++++++++++++++++++- .../melodymodel/5_2/Melody Model Test.aird | 80 +++++++++++++---- .../melodymodel/5_2/Melody Model Test.capella | 74 +++++++++++++++- tests/test_svg.py | 1 + 5 files changed, 233 insertions(+), 41 deletions(-) diff --git a/tests/data/melodymodel/5_0/Melody Model Test.aird b/tests/data/melodymodel/5_0/Melody Model Test.aird index 482f9c81f..ddb695cd6 100644 --- a/tests/data/melodymodel/5_0/Melody Model Test.aird +++ b/tests/data/melodymodel/5_0/Melody Model Test.aird @@ -12,7 +12,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -1691,7 +1691,7 @@ - + @@ -1716,39 +1716,39 @@ - + - + - + - + - + - + - + - + - + - - + + @@ -1858,7 +1858,7 @@ - + @@ -1867,7 +1867,7 @@ - + @@ -13624,7 +13624,7 @@ - + diff --git a/tests/data/melodymodel/5_0/Melody Model Test.capella b/tests/data/melodymodel/5_0/Melody Model Test.capella index 4e3f8c5ec..f908aa230 100644 --- a/tests/data/melodymodel/5_0/Melody Model Test.capella +++ b/tests/data/melodymodel/5_0/Melody Model Test.capella @@ -802,6 +802,61 @@ The predator is far away id="37419abe-6c8e-42b2-a721-2b9cad51c689" name="float"/> + + + + Early in the morning + capella:linkedText + + + + + + + Night + capella:linkedText + + + + + + + Sun goes down + capella:linkedText + + + + + + + Night + capella:linkedText + + + + + + + Sleeping + capella:linkedText + + + @@ -883,11 +938,33 @@ The predator is far away id="30f0aca9-150e-478e-8f27-5a2985b25f61" name="region"/> + id="88d7f9a7-1fae-4884-8233-7582153cc5a7" name="Sunrise event" + triggerDescription="" guard="#9a5d43a1-dad2-4687-b78e-f275015e7ac2" + source="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0" target="#91dc2eec-c878-4fdb-91d8-8f4a4527424e" + triggers="#1b6f7817-569d-48b9-9ff3-b29bdca070ba"> + + + SUN=1 + capella:linkedText + + + + id="d0ea4afa-4231-4a3d-b1db-03655738dab8" name="Sunfall event" + triggerDescription="" guard="#21e2b3fb-43cf-4826-99b9-b0a9f5d38a38" + source="#91dc2eec-c878-4fdb-91d8-8f4a4527424e" target="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0" + triggers="#545a46d7-5786-4c4a-bcc9-b79e634903e0 #bacb091d-2b72-4826-8c1f-165141f226c1"> + + + SUN=0 + capella:linkedText + + + diff --git a/tests/data/melodymodel/5_2/Melody Model Test.aird b/tests/data/melodymodel/5_2/Melody Model Test.aird index 4f8029b44..b1549ab89 100644 --- a/tests/data/melodymodel/5_2/Melody Model Test.aird +++ b/tests/data/melodymodel/5_2/Melody Model Test.aird @@ -8,11 +8,11 @@ - + - + @@ -700,6 +700,22 @@ + + + + + + + + + + + + + + + + @@ -1356,6 +1372,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1681,7 +1729,7 @@ - + @@ -1706,40 +1754,40 @@ - + - + - + - + - - + + - + - + - + - + - + @@ -1848,7 +1896,7 @@ - + @@ -1857,7 +1905,7 @@ - + diff --git a/tests/data/melodymodel/5_2/Melody Model Test.capella b/tests/data/melodymodel/5_2/Melody Model Test.capella index f0c8eaf66..f8113e57e 100644 --- a/tests/data/melodymodel/5_2/Melody Model Test.capella +++ b/tests/data/melodymodel/5_2/Melody Model Test.capella @@ -741,6 +741,50 @@ The predator is far away id="fed1cc38-6dcd-45f3-bcd9-66177f33afee" name="not so good advise" exchangeMechanism="FLOW"/> + + + + juanvaccarezza c + capella:linkedText + + + + + + + Early in the morning + capella:linkedText + + + + + + + Night + capella:linkedText + + + + + + + Sleeping + capella:linkedText + + + @@ -822,11 +866,33 @@ The predator is far away id="30f0aca9-150e-478e-8f27-5a2985b25f61" name="region"/> + id="88d7f9a7-1fae-4884-8233-7582153cc5a7" name="Sunrise event" + triggerDescription="Does what it does" guard="#07787761-cc85-4947-8c27-746548fb8d78" + source="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0" target="#91dc2eec-c878-4fdb-91d8-8f4a4527424e" + triggers="#52723f9d-0f6d-48a4-933d-af416ba9d387"> + + + SUN=1 + capella:linkedText + + + + id="d0ea4afa-4231-4a3d-b1db-03655738dab8" name="Sunfall event" + summary="" description="" triggerDescription="" guard="#b5821811-fabf-4f2a-ae43-7a36e634e067" + source="#91dc2eec-c878-4fdb-91d8-8f4a4527424e" target="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0" + triggers="#680f13b6-c446-4510-974f-0de9da6bd2be #6e5d7b39-08a5-4146-bcb8-4091f127ae80"> + + + SUN = 0 + capella:linkedText + + + diff --git a/tests/test_svg.py b/tests/test_svg.py index d9540e89a..fde07a721 100644 --- a/tests/test_svg.py +++ b/tests/test_svg.py @@ -30,6 +30,7 @@ "[OCB] Operational Capabilities", "[OPD] Obtain food via hunting", "[MSM] States of Functional Human Being", + "[MSM] Weather Modes", "[SAB] System", "[OEBD] Operational Context", "[PAB] Physical System",