Revision: 86cba81d065f
Author: Pekka Klärck
Date: Thu Aug 30 06:46:36 2012
Log: Continuing atest/variables cleanup
http://code.google.com/p/robotframework/source/detail?r=86cba81d065f
Added:
/atest/testdata/variables/automatic_variables/auto1.txt
/atest/testdata/variables/automatic_variables/auto2.txt
Modified:
/atest/robot/variables/automatic_variables.txt
/atest/robot/variables/builtin_variables.txt
/atest/testdata/variables/builtin_variables.txt
=======================================
--- /dev/null
+++ /atest/testdata/variables/automatic_variables/auto1.txt Thu Aug 30
06:46:36 2012
@@ -0,0 +1,69 @@
+*** Setting ***
+Documentation This is suite documentation.
+Suite Setup Check All Variables In Suite Setup ${EXP_SUITE_NAME}
+Suite Teardown Check All Variables In Suite Teardown
${EXP_SUITE_NAME}
+... FAIL ${EXP_SUITE_STATS} Previous Test Variables Should Have
Correct Values When That Test Fails PASS
+Force Tags Force 1
+Resource resource.txt
+
+*** Variable ***
+${EXP_SUITE_NAME} Automatic Variables.Auto1
+${EXP_SUITE_STATS} 12 critical tests, 10 passed, 2 failed\n 12 tests
total, 10 passed, 2 failed
+
+*** Test Case ***
+Previous Test Variables Should Have Default Values
+ Check Previous Test Variables
+
+Test Name
+ [Setup] Should Be Equal ${TEST_NAME} Test Name
+ Should Be Equal ${TEST_NAME} Test Name
+ [Teardown] Should Be Equal ${TEST_NAME} Test Name
+
+Test Documentation
+ [Documentation] My doc.
+ ... In 2 lines!
+ [Setup] Should Be Equal ${TEST DOCUMENTATION} My doc.\nIn 2
lines!
+ Should Be Equal ${TEST DOCUMENTATION} My doc.\nIn 2 lines!
+ [Teardown] Should Be Equal ${TEST DOCUMENTATION} My doc.\nIn
2 lines!
+
+Test Tags
+ [Tags] id-8899 Hello, world!
+ [Setup] Check Test Tags Force 1 Hello, world! id-8899
+ Check Test Tags Force 1 Hello, world! id-8899
+ [Teardown] Check Test Tags Force 1 Hello, world! id-8899
+
+Suite Name
+ Should Be Equal ${SUITE_NAME} ${EXP_SUITE_NAME}
+
+Suite Documentation
+ Should Be Equal ${SUITE_DOCUMENTATION} This is suite
documentation.
+
+Suite Status And Suite Message Are Not Visible In Tests
+ Variable Should Not Exist $SUITE_STATUS
+ Variable Should Not Exist $SUITE_MESSAGE
+
+Test Status Should Not Exist Outside Teardown
+ [Setup] Variable Should Not Exist $TEST_STATUS
+ Variable Should Not Exist $TEST_STATUS
+
+Test Message Should Not Exist Outside Teardown
+ [Setup] Variable Should Not Exist $TEST_MESSAGE
+ Variable Should Not Exist $TEST_MESSAGE
+ Check Previous Test variables Test Status Should Not Exist Outside
Teardown PASS
+
+Test Status When Test Fails
+ [Documentation] FAIL Expected failure in test
+ Check Previous Test variables Test Message Should Not Exist Outside
Teardown PASS
+ Fail Expected failure in test
+ [Teardown] Check Test Variables Test Status When Test Fails
FAIL Expected failure in test
+
+Test Status When Setup Fails
+ [Documentation] FAIL Setup failed:\nExpected failure in setup
+ [Setup] Fail Expected failure in setup
+ Fail Should not be executed
+ [Teardown] Check Test Variables Test Status When Setup Fails
FAIL Setup failed:\nExpected failure in setup
+
+Previous Test Variables Should Have Correct Values When That Test Fails
+ [Setup] Check Previous Test variables Test Status When Setup
Fails FAIL Setup failed:\nExpected failure in setup
+ Check Previous Test variables Test Status When Setup Fails
FAIL Setup failed:\nExpected failure in setup
+ [Teardown] Check Previous Test variables Test Status When Setup
Fails FAIL Setup failed:\nExpected failure in setup
=======================================
--- /dev/null
+++ /atest/testdata/variables/automatic_variables/auto2.txt Thu Aug 30
06:46:36 2012
@@ -0,0 +1,14 @@
+*** Setting ***
+Suite Setup Check All Variables In Suite Setup Automatic
Variables.Auto2 @{PREV_TEST}
+Suite Teardown Check All Variables In Suite Teardown Automatic
Variables.Auto2 FAIL 1 critical test, 0 passed, 1 failed\n 1 test
total, 0 passed, 1 failed Previous Test Variables Should Have Default
Values From Previous Suite FAIL Expected failure
+Resource resource.txt
+
+*** Variable ***
+@{PREV_TEST} Previous Test Variables Should Have Correct Values When
That Test Fails PASS
+
+*** Test Case ***
+Previous Test Variables Should Have Default Values From Previous Suite
+ [Documentation] FAIL Expected failure
+ Check Previous Test Variables @{PREV_TEST}
+ Fail Expected failure
+
=======================================
--- /atest/robot/variables/automatic_variables.txt Thu Aug 30 06:33:25 2012
+++ /atest/robot/variables/automatic_variables.txt Thu Aug 30 06:46:36 2012
@@ -9,9 +9,21 @@
Test Name
Check Test Case ${TEST NAME}
+
+Test Documentation
+ Check Test Case ${TEST NAME}
Test Tags
Check Test Case ${TEST NAME}
+
+Suite Name
+ Check Test Case ${TEST NAME}
+
+Suite Documentation
+ Check Test Case ${TEST NAME}
+
+Suite Status And Suite Message Are Not Visible In Tests
+ Check Test Case ${TEST NAME}
Test Status Should Not Exist Outside Teardown
Check test case ${TEST NAME}
@@ -38,7 +50,3 @@
Suite And Prev Test Variables Work Correctly In Teardown
Should Be Equal ${SUITE.suites[0].teardown.status} PASS
Should Be Equal ${SUITE.suites[1].teardown.status} PASS
-
-Suite Variables In Test
- Check test case ${TEST NAME}
-
=======================================
--- /atest/robot/variables/builtin_variables.txt Thu Aug 23 06:44:34 2012
+++ /atest/robot/variables/builtin_variables.txt Thu Aug 30 06:46:36 2012
@@ -42,12 +42,6 @@
$CURDIR
Check Test Case ${TESTNAME}
-
-${TEST DOCUMENTATION}
- Check Test Case ${TESTNAME}
-
-${SUITE DOCUMENTATION}
- Check Test Case ${TESTNAME}
Built-In Variables Cannot Be Overridden In Variable Table Or From CLI
[Documentation] Except for number variabels
=======================================
--- /atest/testdata/variables/builtin_variables.txt Thu Aug 23 06:44:34 2012
+++ /atest/testdata/variables/builtin_variables.txt Thu Aug 30 06:46:36 2012
@@ -1,6 +1,5 @@
*** Settings ***
Library OperatingSystem
-Documentation This is suite documentation.
*** Variables ***
${TEMPDIR} Cannot be overridden
@@ -100,13 +99,6 @@
Should Not End With ${EXECDIR} /
Should Not End With ${EXECDIR} \\
Should Start With \${EXECDIR} $
-
-${TEST DOCUMENTATION}
- [Documentation] This documentation can be read.
- Should be Equal This documentation can be read. ${TEST
DOCUMENTATION}
-
-${SUITE DOCUMENTATION}
- Should be Equal This is suite documentation. ${SUITE
DOCUMENTATION}
$CURDIR
Directory Should Exist ${CURDIR}
