3 new revisions:
Revision: 75ce9bd07f9f
Author: Pekka Klärck
Date: Thu Aug 30 05:31:04 2012
Log: BuiltIn: trivial cleanup
http://code.google.com/p/robotframework/source/detail?r=75ce9bd07f9f
Revision: 53060099dc95
Author: Pekka Klärck
Date: Thu Aug 30 06:27:14 2012
Log: small atest cleanup
http://code.google.com/p/robotframework/source/detail?r=53060099dc95
Revision: 545cac2e2823
Author: Pekka Klärck
Date: Thu Aug 30 06:33:25 2012
Log: atests: renamed test_and_suite_status_variables ->
automatic_variables
http://code.google.com/p/robotframework/source/detail?r=545cac2e2823
==============================================================================
Revision: 75ce9bd07f9f
Author: Pekka Klärck
Date: Thu Aug 30 05:31:04 2012
Log: BuiltIn: trivial cleanup
http://code.google.com/p/robotframework/source/detail?r=75ce9bd07f9f
Modified:
/src/robot/libraries/BuiltIn.py
=======================================
--- /src/robot/libraries/BuiltIn.py Tue Aug 14 06:15:52 2012
+++ /src/robot/libraries/BuiltIn.py Thu Aug 30 05:31:04 2012
@@ -1837,10 +1837,9 @@
raise RuntimeError("'Set Test Documentation' keyword cannot be
used in "
"suite setup or teardown")
test.doc = doc
- self._namespace.variables.set_test('${TEST_DOCUMENTATION}',
test.doc)
+ self._variables.set_test('${TEST_DOCUMENTATION}', test.doc)
self.log('Set test documentation to:\n%s' % doc)
-
def set_suite_documentation(self, doc):
"""Sets documentation for for the current suite.
@@ -1853,7 +1852,7 @@
doc = utils.unic(doc)
suite = self._namespace.suite
suite.doc = doc
- self._namespace.variables.set_suite('${SUITE_DOCUMENTATION}',
suite.doc)
+ self._variables.set_suite('${SUITE_DOCUMENTATION}', suite.doc)
self.log('Set suite documentation to:\n%s' % doc)
==============================================================================
Revision: 53060099dc95
Author: Pekka Klärck
Date: Thu Aug 30 06:27:14 2012
Log: small atest cleanup
http://code.google.com/p/robotframework/source/detail?r=53060099dc95
Modified:
/atest/robot/variables/test_and_suite_status_variables.txt
/atest/testdata/variables/test_and_suite_status_variables/test_and_suite_status_variables.txt
=======================================
--- /atest/robot/variables/test_and_suite_status_variables.txt Wed Feb 22
01:06:36 2012
+++ /atest/robot/variables/test_and_suite_status_variables.txt Thu Aug 30
06:27:14 2012
@@ -7,14 +7,11 @@
Previous Test Variables Should Have Default Values
Check test case ${TEST NAME}
-Test Name In Test
- Check test case ${TEST NAME}
-
-Test Name In Setup
- Check test case ${TEST NAME}
+Test Name
+ Check Test Case ${TEST NAME}
Test Tags
- Check Test Case Test Tags
+ Check Test Case ${TEST NAME}
Test Status Should Not Exist Outside Teardown
Check test case ${TEST NAME}
=======================================
---
/atest/testdata/variables/test_and_suite_status_variables/test_and_suite_status_variables.txt
Wed Feb 22 01:06:36 2012
+++
/atest/testdata/variables/test_and_suite_status_variables/test_and_suite_status_variables.txt
Thu Aug 30 06:27:14 2012
@@ -1,6 +1,6 @@
*** Setting ***
Suite Setup Check All Variables In Suite Setup ${EXP_SUITE_NAME}
-Suite Teardown Check All Variables In Suite Teardown
${EXP_SUITE_NAME} FAIL 10 critical tests, 8 passed, 2 failed\n 10
tests total, 8 passed, 2 failed Previous Test Variables Should Have
Correct Values When That Test Fails PASS
+Suite Teardown Check All Variables In Suite Teardown
${EXP_SUITE_NAME} FAIL 9 critical tests, 7 passed, 2 failed\n 9 tests
total, 7 passed, 2 failed Previous Test Variables Should Have Correct
Values When That Test Fails PASS
Force Tags Force 1
Resource resource.txt
@@ -18,26 +18,23 @@
[Teardown] Check Test Tags Force 1 Hello, world! id-8899
Suite Variables In Test
- Equals ${SUITE_NAME} ${EXP_SUITE_NAME}
- Fail If Variable Exists $SUITE_STATUS
- Fail If Variable Exists $SUITE_MESSAGE
+ Should Be Equal ${SUITE_NAME} ${EXP_SUITE_NAME}
+ Variable Should Not Exist $SUITE_STATUS
+ Variable Should Not Exist $SUITE_MESSAGE
-Test Name In Test
- Equals ${TEST_NAME} Test Name In Test
- Check Previous Test variables Suite Variables In Test PASS
-
-Test Name In Setup
- [Setup] Equals ${TEST_NAME} Test Name In Setup
- Check Previous Test variables Test Name In Test PASS
+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 Status Should Not Exist Outside Teardown
- [Setup] Fail If variable Exists $TEST_STATUS
- Fail If variable Exists $TEST_STATUS
- Check Previous Test variables Test Name In Setup PASS
+ [Setup] Variable Should Not Exist $TEST_STATUS
+ Variable Should Not Exist $TEST_STATUS
+ Check Previous Test variables Test Name PASS
Test Message Should Not Exist Outside Teardown
- [Setup] Fail If variable Exists $TEST_MESSAGE
- Fail If variable Exists $TEST_MESSAGE
+ [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
==============================================================================
Revision: 545cac2e2823
Author: Pekka Klärck
Date: Thu Aug 30 06:33:25 2012
Log: atests: renamed test_and_suite_status_variables ->
automatic_variables
http://code.google.com/p/robotframework/source/detail?r=545cac2e2823
Added:
/atest/robot/variables/automatic_variables.txt
/atest/testdata/variables/automatic_variables/resource.txt
Deleted:
/atest/robot/variables/test_and_suite_status_variables.txt
/atest/testdata/variables/test_and_suite_status_variables/resource.txt
/atest/testdata/variables/test_and_suite_status_variables/test_and_suite_status_variables.txt
/atest/testdata/variables/test_and_suite_status_variables/test_and_suite_status_variables2.txt
=======================================
--- /dev/null
+++ /atest/robot/variables/automatic_variables.txt Thu Aug 30 06:33:25 2012
@@ -0,0 +1,44 @@
+*** Setting ***
+Suite Setup Run Tests ${EMPTY} variables/automatic_variables/
+Force Tags regression jybot pybot
+Resource atest_resource.txt
+
+*** Test Case ***
+Previous Test Variables Should Have Default Values
+ Check test case ${TEST NAME}
+
+Test Name
+ Check Test Case ${TEST NAME}
+
+Test Tags
+ Check Test Case ${TEST NAME}
+
+Test Status Should Not Exist Outside Teardown
+ Check test case ${TEST NAME}
+
+Test Message Should Not Exist Outside Teardown
+ Check test case ${TEST NAME}
+
+Test Status When Test Fails
+ Check test case ${TEST NAME}
+
+Test Status When Setup Fails
+ Check test case ${TEST NAME}
+
+Previous Test Variables Should Have Correct Values When That Test Fails
+ Check test case ${TEST NAME}
+
+Previous Test Variables Should Have Default Values From Previous Suite
+ Check test case ${TEST NAME}
+
+Suite And Prev Test Variables Work Correctly In Setup
+ Should Be Equal ${SUITE.suites[0].setup.status} PASS
+ Should Be Equal ${SUITE.suites[1].setup.status} PASS
+
+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}
+
=======================================
--- /dev/null
+++ /atest/testdata/variables/automatic_variables/resource.txt Thu Aug 30
06:33:25 2012
@@ -0,0 +1,40 @@
+*** Keyword ***
+Check All Variables In Suite Setup
+ [Arguments] ${name} @{prev_test}
+ Check Test Variables Do Not Exist
+ Check Previous Test Variables @{prev_test}
+ Should Be Equal ${SUITE_NAME} ${name}
+ Variable Should Not Exist $SUITE_STATUS
+ Variable Should Not Exist $SUITE_MESSAGE
+
+Check All Variables In Suite Teardown
+ [Arguments] ${name} ${status} ${message} @{prev_test}
+ Check Test Variables Do Not Exist
+ Check Previous Test Variables @{prev_test}
+ Should Be Equal ${SUITE_NAME} ${name}
+ Should Be Equal ${SUITE_STATUS} ${status}
+ Should Be Equal ${SUITE_MESSAGE} ${message}
+
+Check Test Variables Do Not Exist
+ Variable Should Not Exist $TEST_NAME
+ Variable Should Not Exist $TEST_STATUS
+ Variable Should Not Exist $TEST_MESSAGE
+
+Check Previous Test Variables
+ [Arguments] ${name}= ${status}= ${message}=
+ Should Be Equal ${PREV_TEST_STATUS} ${status}
+ Should Be Equal ${PREV_TEST_MESSAGE} ${message}
+ Should Be Equal ${PREV_TEST_NAME} ${name}
+
+Check Test Variables
+ [Arguments] ${name} ${status} ${message}
+ Should Be Equal ${TEST_STATUS} ${status}
+ Should Be Equal ${TEST_MESSAGE} ${message}
+ Should Be Equal ${TEST_NAME} ${name}
+
+Check Test Tags
+ [Arguments] @{expected}
+ Log Many @{TEST TAGS}
+ Log Many @{expected}
+ Should Be Equal ${expected} ${TEST TAGS}
+
=======================================
--- /atest/robot/variables/test_and_suite_status_variables.txt Thu Aug 30
06:27:14 2012
+++ /dev/null
@@ -1,44 +0,0 @@
-*** Setting ***
-Suite Setup Run Tests ${EMPTY}
variables/test_and_suite_status_variables
-Force Tags regression jybot pybot
-Resource atest_resource.txt
-
-*** Test Case ***
-Previous Test Variables Should Have Default Values
- Check test case ${TEST NAME}
-
-Test Name
- Check Test Case ${TEST NAME}
-
-Test Tags
- Check Test Case ${TEST NAME}
-
-Test Status Should Not Exist Outside Teardown
- Check test case ${TEST NAME}
-
-Test Message Should Not Exist Outside Teardown
- Check test case ${TEST NAME}
-
-Test Status When Test Fails
- Check test case ${TEST NAME}
-
-Test Status When Setup Fails
- Check test case ${TEST NAME}
-
-Previous Test Variables Should Have Correct Values When That Test Fails
- Check test case ${TEST NAME}
-
-Previous Test Variables Should Have Default Values From Previous Suite
- Check test case ${TEST NAME}
-
-Suite And Prev Test Variables Work Correctly In Setup
- Should Be Equal ${SUITE.suites[0].setup.status} PASS
- Should Be Equal ${SUITE.suites[1].setup.status} PASS
-
-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/testdata/variables/test_and_suite_status_variables/resource.txt
Wed Feb 22 01:06:36 2012
+++ /dev/null
@@ -1,40 +0,0 @@
-*** Keyword ***
-Check All Variables In Suite Setup
- [Arguments] ${name} @{prev_test}
- Check Test Variables Do Not Exist
- Check Previous Test Variables @{prev_test}
- Should Be Equal ${SUITE_NAME} ${name}
- Variable Should Not Exist $SUITE_STATUS
- Variable Should Not Exist $SUITE_MESSAGE
-
-Check All Variables In Suite Teardown
- [Arguments] ${name} ${status} ${message} @{prev_test}
- Check Test Variables Do Not Exist
- Check Previous Test Variables @{prev_test}
- Should Be Equal ${SUITE_NAME} ${name}
- Should Be Equal ${SUITE_STATUS} ${status}
- Should Be Equal ${SUITE_MESSAGE} ${message}
-
-Check Test Variables Do Not Exist
- Variable Should Not Exist $TEST_NAME
- Variable Should Not Exist $TEST_STATUS
- Variable Should Not Exist $TEST_MESSAGE
-
-Check Previous Test Variables
- [Arguments] ${name}= ${status}= ${message}=
- Should Be Equal ${PREV_TEST_STATUS} ${status}
- Should Be Equal ${PREV_TEST_MESSAGE} ${message}
- Should Be Equal ${PREV_TEST_NAME} ${name}
-
-Check Test Variables
- [Arguments] ${name} ${status} ${message}
- Should Be Equal ${TEST_STATUS} ${status}
- Should Be Equal ${TEST_MESSAGE} ${message}
- Should Be Equal ${TEST_NAME} ${name}
-
-Check Test Tags
- [Arguments] @{expected}
- Log Many @{TEST TAGS}
- Log Many @{expected}
- Should Be Equal ${expected} ${TEST TAGS}
-
=======================================
---
/atest/testdata/variables/test_and_suite_status_variables/test_and_suite_status_variables.txt
Thu Aug 30 06:27:14 2012
+++ /dev/null
@@ -1,56 +0,0 @@
-*** Setting ***
-Suite Setup Check All Variables In Suite Setup ${EXP_SUITE_NAME}
-Suite Teardown Check All Variables In Suite Teardown
${EXP_SUITE_NAME} FAIL 9 critical tests, 7 passed, 2 failed\n 9 tests
total, 7 passed, 2 failed Previous Test Variables Should Have Correct
Values When That Test Fails PASS
-Force Tags Force 1
-Resource resource.txt
-
-*** Variable ***
-${EXP_SUITE_NAME} Test And Suite Status Variables.Test And Suite Status
Variables
-
-*** Test Case ***
-Previous Test Variables Should Have Default Values
- Check Previous Test Variables
-
-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 Variables In Test
- Should Be Equal ${SUITE_NAME} ${EXP_SUITE_NAME}
- Variable Should Not Exist $SUITE_STATUS
- Variable Should Not Exist $SUITE_MESSAGE
-
-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 Status Should Not Exist Outside Teardown
- [Setup] Variable Should Not Exist $TEST_STATUS
- Variable Should Not Exist $TEST_STATUS
- Check Previous Test variables Test Name PASS
-
-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
-
=======================================
---
/atest/testdata/variables/test_and_suite_status_variables/test_and_suite_status_variables2.txt
Wed Feb 22 01:06:36 2012
+++ /dev/null
@@ -1,14 +0,0 @@
-*** Setting ***
-Suite Setup Check All Variables In Suite Setup Test And Suite
Status Variables.Test And Suite Status Variables2 @{PREV_TEST}
-Suite Teardown Check All Variables In Suite Teardown Test And Suite
Status Variables.Test And Suite Status Variables2 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
-
