2 new revisions:

Revision: 15a77a287616
Branch:   default
Author:   Robot Framework Developers (robotframew...@gmail.com)
Date:     Mon Jan 27 11:59:32 2014 UTC
Log:      tidy
http://code.google.com/p/robotframework/source/detail?r=15a77a287616

Revision: 875974ef9c79
Branch:   default
Author:   Robot Framework Developers (robotframew...@gmail.com)
Date:     Mon Jan 27 12:23:02 2014 UTC
Log:      Test combined patterns with --critical and --noncritical....
http://code.google.com/p/robotframework/source/detail?r=875974ef9c79

==============================================================================
Revision: 15a77a287616
Branch:   default
Author:   Robot Framework Developers (robotframew...@gmail.com)
Date:     Mon Jan 27 11:59:32 2014 UTC
Log:      tidy
http://code.google.com/p/robotframework/source/detail?r=15a77a287616

Modified:
 /atest/robot/tags/critical_tags.txt
 /atest/robot/tags/critical_tags_with_rebot.txt

=======================================
--- /atest/robot/tags/critical_tags.txt Mon Jun 18 07:57:01 2012 UTC
+++ /atest/robot/tags/critical_tags.txt Mon Jan 27 11:59:32 2014 UTC
@@ -1,54 +1,53 @@
 *** Settings ***
-Documentation   Setting critical and non-critical tags
-Force Tags     regression  pybot  jybot
-Resource        atest_resource.txt
-Test Template   Test Criticality
+Documentation     Setting critical and non-critical tags
+Force Tags        regression    pybot    jybot
+Test Template     Test Criticality
+Resource          atest_resource.txt

 *** Variables ***
-${MSG 000 211} 0 critical tests, 0 passed, 0 failed\n 2 tests total, 1 passed, 1 failed -${MSG 211 211} 2 critical tests, 1 passed, 1 failed\n 2 tests total, 1 passed, 1 failed -${MSG 110 211} 1 critical test, 1 passed, 0 failed\n 2 tests total, 1 passed, 1 failed -${MSG 101 211} 1 critical test, 0 passed, 1 failed\n 2 tests total, 1 passed, 1 failed +${MSG 000 211} 0 critical tests, 0 passed, 0 failed\n 2 tests total, 1 passed, 1 failed +${MSG 211 211} 2 critical tests, 1 passed, 1 failed\n 2 tests total, 1 passed, 1 failed +${MSG 110 211} 1 critical test, 1 passed, 0 failed\n 2 tests total, 1 passed, 1 failed +${MSG 101 211} 1 critical test, 0 passed, 1 failed\n 2 tests total, 1 passed, 1 failed

 *** Test Cases ***
 Neither Critical Nor Non-Critical
-    ${EMPTY}  FAIL  ${MSG 211 211}
+    ${EMPTY}    FAIL    ${MSG 211 211}

 Critical
-    --critical p_a_s_s  PASS  ${MSG 110 211}
+    --critical p_a_s_s    PASS    ${MSG 110 211}

 Critical Not Matching
-    -c nomatch  PASS  ${MSG 000 211}
+    -c nomatch    PASS    ${MSG 000 211}

 Critical With Pattern
-    --critical fSTAR -c QUESTaSS  FAIL  ${MSG 211 211}
+    --critical fSTAR -c QUESTaSS    FAIL    ${MSG 211 211}

 Non-Critical
-    --noncritical pass  FAIL  ${MSG 101 211}
+    --noncritical pass    FAIL    ${MSG 101 211}

 Non-Critical Not Matching
-    -n these -n dont -n match  FAIL  ${MSG 211 211}
+    -n these -n dont -n match    FAIL    ${MSG 211 211}

 Non-Critical With Pattern
-    --NonCritical f__STAR -n QUESTass  PASS  ${MSG 000 211}
+    --NonCritical f__STAR -n QUESTass    PASS    ${MSG 000 211}

 Critical And Non-Critical Matching Different Test
- --critical paSTARss --noncritical faiQUEST -c nomatch PASS ${MSG 110 211} + --critical paSTARss --noncritical faiQUEST -c nomatch PASS ${MSG 110 211}

 Critical And Non-Critical Matching Same Test
- --critical force --noncritical fail -c a -c b -c c -n x -n y -n z PASS ${MSG 110 211} + --critical force --noncritical fail -c a -c b -c c -n x -n y -n z PASS ${MSG 110 211}

 Critical And Non-Critical Matching Same Tag
-    --critical force --noncritical fSTAR  PASS  ${MSG 000 211}
+    --critical force --noncritical fSTAR    PASS    ${MSG 000 211}

 *** Keywords ***
 Test Criticality
-    [Arguments]  ${options}  ${exp status}  ${exp msg}
- Run Tests ${options} --escape star:STAR --escape quest:QUEST misc/pass_and_fail.txt
-    Suite Status And Message Should Be  ${exp status}  ${exp msg}
+    [Arguments]    ${options}    ${exp status}    ${exp msg}
+ Run Tests ${options} --escape star:STAR --escape quest:QUEST misc/pass_and_fail.txt
+    Suite Status And Message Should Be    ${exp status}    ${exp msg}

 Suite Status And Message Should Be
-    [Arguments]  ${status}  ${message}
- [Documentation] Must check status and message from stdout because re-processed suite would not have same criticality as during executiong - Check Stdout Contains Pass And Fail :: Some tests here ${SPACE * 36} | ${status} |\n${message}
-
+    [Arguments]    ${status}    ${message}
+ [Documentation] Must check status and message from stdout because re-processed suite would not have same criticality as during executiong + Check Stdout Contains Pass And Fail :: Some tests here ${SPACE * 36} | ${status} |\n${message}
=======================================
--- /atest/robot/tags/critical_tags_with_rebot.txt Wed Sep 12 22:17:39 2012 UTC +++ /atest/robot/tags/critical_tags_with_rebot.txt Mon Jan 27 11:59:32 2014 UTC
@@ -1,12 +1,13 @@
 *** Settings ***
-Suite Setup     Run Test To Create Output
-Suite Teardown  Remove File  ${INPUT FILE}
-Force Tags      regression  pybot  jybot
-Resource        atest_resource.txt
-Test Template   Test Criticality
+Documentation     Setting critical and non-critical tags with Rebot.
+Suite Setup       Run Test To Create Output
+Suite Teardown    Remove File    ${INPUT FILE}
+Force Tags        regression    pybot    jybot
+Resource          atest_resource.txt
+Test Template     Test Criticality

 *** Variables ***
-${INPUT FILE}  %{TEMPDIR}/rebot-test-input.xml
+${INPUT FILE}     %{TEMPDIR}/rebot-test-input.xml

 *** Test Cases ***
 Neither Critical Nor Non-Critical
@@ -41,18 +42,18 @@

 *** Keywords ***
 Run Test To Create Output
-    Run Tests  --critical pass --noncritical fail  misc/pass_and_fail.txt
-    Move File  ${OUT FILE}  ${INPUT FILE}
+ Run Tests --critical pass --noncritical fail misc/pass_and_fail.txt
+    Move File    ${OUT FILE}    ${INPUT FILE}

 Test Criticality
-    [Arguments]  ${options}  ${crit 1}  ${crit 2}
- Run Rebot ${options} --escape star:STAR --escape quest:QUEST --report rebot-report.html ${INPUT FILE}
-    ${tests} =  Get Elements  ${OUT FILE}  suite/test
-    Test Status And Criticality Should Be  ${tests[0]}  PASS  ${crit 1}
-    Test Status And Criticality Should Be  ${tests[1]}  FAIL  ${crit 2}
+    [Arguments]    ${options}    ${crit 1}    ${crit 2}
+ Run Rebot ${options} --escape star:STAR --escape quest:QUEST --report rebot-report.html ${INPUT FILE}
+    ${tests} =    Get Elements    ${OUT FILE}    suite/test
+ Test Status And Criticality Should Be ${tests[0]} PASS ${crit 1} + Test Status And Criticality Should Be ${tests[1]} FAIL ${crit 2}

 Test Status And Criticality Should Be
-    [Arguments]  ${test}  ${status}  ${criticality}
- [Documentation] Must check status and criticality directly from XML because re-processed model would not have same criticality
-    Should Be Equal  ${test.getchildren()[-1].attrib['status']}  ${status}
- Should Be Equal ${test.getchildren()[-1].attrib['critical']} ${criticality}
+    [Arguments]    ${test}    ${status}    ${criticality}
+ [Documentation] Must check status and criticality directly from XML because re-processed model would not have same criticality + Should Be Equal ${test.getchildren()[-1].attrib['status']} ${status} + Should Be Equal ${test.getchildren()[-1].attrib['critical']} ${criticality}

==============================================================================
Revision: 875974ef9c79
Branch:   default
Author:   Robot Framework Developers (robotframew...@gmail.com)
Date:     Mon Jan 27 12:23:02 2014 UTC
Log:      Test combined patterns with --critical and --noncritical.

Update issue 1558
Added tests for using combined patterns, including OR, with --critical and
--noncritical.y
http://code.google.com/p/robotframework/source/detail?r=875974ef9c79

Modified:
 /atest/robot/tags/critical_tags.txt
 /atest/robot/tags/critical_tags_with_rebot.txt

=======================================
--- /atest/robot/tags/critical_tags.txt Mon Jan 27 11:59:32 2014 UTC
+++ /atest/robot/tags/critical_tags.txt Mon Jan 27 12:23:02 2014 UTC
@@ -20,8 +20,11 @@
 Critical Not Matching
     -c nomatch    PASS    ${MSG 000 211}

-Critical With Pattern
-    --critical fSTAR -c QUESTaSS    FAIL    ${MSG 211 211}
+Critical As Simple Pattern
+    --critical faSTAR -c QUESTaSS    FAIL    ${MSG 211 211}
+
+Critical As Combined Pattern
+    --critical nonexORfaSTAR -c QUESTassANDforce    FAIL    ${MSG 211 211}

 Non-Critical
     --noncritical pass    FAIL    ${MSG 101 211}
@@ -29,8 +32,11 @@
 Non-Critical Not Matching
     -n these -n dont -n match    FAIL    ${MSG 211 211}

-Non-Critical With Pattern
-    --NonCritical f__STAR -n QUESTass    PASS    ${MSG 000 211}
+Non-Critical As Simple Pattern
+    --NonCritical fa__STAR -n QUESTass    PASS    ${MSG 000 211}
+
+Non-Critical As Combined Pattern
+ --NonCritical nonexORfa__STAR -n QUESTassANDforce PASS ${MSG 000 211}

 Critical And Non-Critical Matching Different Test
--critical paSTARss --noncritical faiQUEST -c nomatch PASS ${MSG 110 211}
=======================================
--- /atest/robot/tags/critical_tags_with_rebot.txt Mon Jan 27 11:59:32 2014 UTC +++ /atest/robot/tags/critical_tags_with_rebot.txt Mon Jan 27 12:23:02 2014 UTC
@@ -19,8 +19,11 @@
 Critical Not Matching
     -c nomatch                                        no     no

-Critical With Pattern
-    --CritiCal fSTAR -c QUESTaSS                      yes    yes
+Critical As Pattern
+    --CritiCal faSTAR -c QUESTaSS                     yes    yes
+
+Critical As Combined Pattern
+    --CritiCal nonexORfaSTAR -c QUESTassANDforce      yes    yes

 Non-Critical
     --noncritical pass                                no     yes
@@ -28,8 +31,11 @@
 Non-Critical Not Matching
     -n these -n dont -n match                         yes    yes

-Non-Critical With Pattern
-    --NonCritiCal f__STAR -n QUEST__ass               no     no
+Non-Critical As Pattern
+    --NonCritiCal fa__STAR -n QUEST__ass              no     no
+
+Non-Critical As Combined Pattern
+    --NonCri nonex_OR_faSTAR -n QUESTassANDforce      no     no

 Critical And Non-Critical Matching Different Test
     -c paSTARss -n faiQUEST -c nomatch                yes    no
@@ -47,7 +53,7 @@

 Test Criticality
     [Arguments]    ${options}    ${crit 1}    ${crit 2}
- Run Rebot ${options} --escape star:STAR --escape quest:QUEST --report rebot-report.html ${INPUT FILE} + Run Rebot ${options} --escape star:STAR --escape quest:QUEST ${INPUT FILE}
     ${tests} =    Get Elements    ${OUT FILE}    suite/test
Test Status And Criticality Should Be ${tests[0]} PASS ${crit 1} Test Status And Criticality Should Be ${tests[1]} FAIL ${crit 2}

--

--- You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to