Skip to content

Commit d60ab62

Browse files
authored
fix: update tests (#567)
Added tests in #558 and in parallel modified tests in #564. That created a conflict which only became obvious once both were merged to main.
1 parent e74b1b4 commit d60ab62

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

src/extensions/score_metamodel/tests/rst/options/test_options_options.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@
584584

585585
.. Security Analysis: feat_sec_threat
586586
587-
#EXPECT: feat_sec_threat__test__bad_1: is missing required attribute: `threat_id`.
587+
#EXPECT[+2]: feat_sec_threat__test__bad_1: is missing required attribute: `threat_id`.
588588

589589
.. feat_sec_threat:: Missing threat_id
590590
:id: feat_sec_threat__test__bad_1
@@ -593,7 +593,7 @@
593593
Some content.
594594

595595

596-
#EXPECT: feat_sec_threat__test__bad_2.status (done): does not follow pattern `^(valid|invalid)$`.
596+
#EXPECT[+2]: feat_sec_threat__test__bad_2.status (done): does not follow pattern `^(valid|invalid)$`.
597597

598598
.. feat_sec_threat:: Invalid status
599599
:id: feat_sec_threat__test__bad_2
@@ -603,7 +603,7 @@
603603
Some content.
604604

605605

606-
#EXPECT-NOT: feat_sec_threat__test__ok_3
606+
#EXPECT-NOT[+2]: feat_sec_threat__test__ok_3
607607

608608
.. feat_sec_threat:: Valid threat
609609
:id: feat_sec_threat__test__ok_3
@@ -615,7 +615,7 @@
615615

616616
.. Security Analysis: feat_sec_ana
617617
618-
#EXPECT: feat_sec_ana__test__bad_4: is missing required attribute: `threat_scenario_id`.
618+
#EXPECT[+2]: feat_sec_ana__test__bad_4: is missing required attribute: `threat_scenario_id`.
619619

620620
.. feat_sec_ana:: Missing threat_scenario_id
621621
:id: feat_sec_ana__test__bad_4
@@ -626,7 +626,7 @@
626626
Argument why mitigation is insufficient.
627627

628628

629-
#EXPECT: feat_sec_ana__test__bad_5.sufficient (maybe): does not follow pattern `^(yes|no)$`.
629+
#EXPECT[+2]: feat_sec_ana__test__bad_5.sufficient (maybe): does not follow pattern `^(yes|no)$`.
630630

631631
.. feat_sec_ana:: Invalid sufficient value
632632
:id: feat_sec_ana__test__bad_5
@@ -638,7 +638,7 @@
638638
Argument why mitigation is insufficient.
639639

640640

641-
#EXPECT: feat_sec_ana__test__bad_6.status (done): does not follow pattern `^(valid|invalid)$`.
641+
#EXPECT[+2]: feat_sec_ana__test__bad_6.status (done): does not follow pattern `^(valid|invalid)$`.
642642

643643
.. feat_sec_ana:: Invalid status value
644644
:id: feat_sec_ana__test__bad_6
@@ -650,7 +650,7 @@
650650
Argument why mitigation is insufficient.
651651

652652

653-
#EXPECT: feat_sec_ana__test__bad_7: is missing required attribute: `threat_effect`.
653+
#EXPECT[+2]: feat_sec_ana__test__bad_7: is missing required attribute: `threat_effect`.
654654

655655
.. feat_sec_ana:: Missing threat_effect
656656
:id: feat_sec_ana__test__bad_7
@@ -661,7 +661,7 @@
661661
Argument why mitigation is insufficient.
662662

663663

664-
#EXPECT-NOT: feat_sec_ana__test__ok_8
664+
#EXPECT-NOT[+2]: feat_sec_ana__test__ok_8
665665

666666
.. feat_sec_ana:: Valid threat scenario
667667
:id: feat_sec_ana__test__ok_8
@@ -673,7 +673,7 @@
673673
Mitigation is sufficient because access controls are in place.
674674

675675

676-
#EXPECT-NOT: feat_sec_ana__test__ok_9
676+
#EXPECT-NOT[+2]: feat_sec_ana__test__ok_9
677677

678678
.. feat_sec_ana:: Valid threat scenario with optional mitigation_issue
679679
:id: feat_sec_ana__test__ok_9
@@ -686,7 +686,7 @@
686686
Mitigation not yet implemented.
687687

688688

689-
#EXPECT: feat_sec_ana__test__bad_10.mitigation_issue (https://github.com/eclipse-score/docs-as-code/pull/508): does not follow pattern
689+
#EXPECT[+2]: feat_sec_ana__test__bad_10.mitigation_issue (https://github.com/eclipse-score/docs-as-code/pull/508): does not follow pattern
690690

691691
.. feat_sec_ana:: Invalid mitigation_issue (pull request, not issue)
692692
:id: feat_sec_ana__test__bad_10
@@ -699,7 +699,7 @@
699699
Mitigation not yet implemented.
700700

701701

702-
#EXPECT: feat_sec_ana__test__bad_11: is missing required attribute: `content`.
702+
#EXPECT[+2]: feat_sec_ana__test__bad_11: is missing required attribute: `content`.
703703

704704
.. feat_sec_ana:: Missing argument content
705705
:id: feat_sec_ana__test__bad_11

0 commit comments

Comments
 (0)