Revision: 2877
Author: pekka.klarck
Date: Thu Apr 8 12:56:59 2010
Log: moved wildcard tests to multisource, extended that test, and cleaned
up old multi source tests
http://code.google.com/p/robotframework/source/detail?r=2877
Deleted:
/trunk/atest/robot/cli/runner/wildcards.txt
Modified:
/trunk/atest/robot/cli/runner/multisource.txt
=======================================
--- /trunk/atest/robot/cli/runner/wildcards.txt Thu Apr 8 08:11:28 2010
+++ /dev/null
@@ -1,10 +0,0 @@
-*** Settings ***
-Default Tags regression pybot jybot
-Resource cli_resource.txt
-
-
-*** Test Cases ***
-
-Wildcards In Datasources
- Run Tests ${EMPTY} misc/suites/tsuite?.*ml
- Should Be True ${SUITE.suites} == ['Tsuite 1', 'Tsuite 2', 'Tsuite 3']
=======================================
--- /trunk/atest/robot/cli/runner/multisource.txt Thu Apr 8 12:41:48 2010
+++ /trunk/atest/robot/cli/runner/multisource.txt Thu Apr 8 12:56:59 2010
@@ -1,38 +1,56 @@
*** Settings ***
Documentation Running multiple suites together.
Force Tags regression pybot jybot
-Resource ../../../resources/resource.txt
+Resource cli_resource.txt
*** Test Cases ***
+
Default Name
- Run Tests ${EMPTY} core${/}misc${/}some_tests.html
core${/}misc${/}example_tests.html
- Check Names ${suite} Some Tests & Example Tests \
- Check Suites and Tests ${suite} ['Some Tests','Example Tests'] [ ]
+ Run Tests ${EMPTY} core/misc/some_tests.html
core/misc/example_tests.html
+ Check Names ${suite} Some Tests & Example Tests
+ Check Content ${suite} ['Some Tests','Example Tests'] []
Check Names ${suite.suites[0]} Some Tests Some Tests & Example
Tests.
- Check Suites and Tests ${suite.suites[0]} [ ] ['Some Test 1', 'Some
Test 2']
+ Check Content ${suite.suites[0]} [] ['Some Test 1', 'Some Test 2']
Check Names ${suite.suites[0].tests[0]} Some Test 1 Some Tests &
Example Tests.Some Tests.
Check Names ${suite.suites[0].tests[1]} Some Test 2 Some Tests &
Example Tests.Some Tests.
Check Names ${suite.suites[1]} Example Tests Some Tests & Example
Tests.
- Check Suites and Tests ${suite.suites[1]} [ ] ['Example Test
1', 'Example Test 2']
+ Check Content ${suite.suites[1]} [] ['Example Test 1', 'Example
Test 2']
Check Names ${suite.suites[1].tests[0]} Example Test 1 Some Tests &
Example Tests.Example Tests.
Check Names ${suite.suites[1].tests[1]} Example Test 2 Some Tests &
Example Tests.Example Tests.
Overridden Name
- Run Tests --name My%Name --escape space:%
core${/}misc${/}some_tests.html core${/}misc${/}example_tests.html
- Check Names ${suite} My Name \
- Check Suites and Tests ${suite} ['Some Tests','Example Tests'] [ ]
+ Run Tests --name My%Name --escape space:% core/misc/some_tests.html
core/misc/example_tests.html
+ Check Names ${suite} My Name
+ Check Content ${suite} ['Some Tests','Example Tests'] []
Check Names ${suite.suites[0]} Some Tests My Name.
- Check Suites and Tests ${suite.suites[0]} [ ] ['Some Test 1', 'Some
Test 2']
+ Check Content ${suite.suites[0]} [] ['Some Test 1', 'Some Test 2']
Check Names ${suite.suites[0].tests[0]} Some Test 1 My Name.Some
Tests.
Check Names ${suite.suites[0].tests[1]} Some Test 2 My Name.Some
Tests.
Check Names ${suite.suites[1]} Example Tests My Name.
- Check Suites and Tests ${suite.suites[1]} [ ] ['Example Test
1', 'Example Test 2']
+ Check Content ${suite.suites[1]} [] ['Example Test 1', 'Example
Test 2']
Check Names ${suite.suites[1].tests[0]} Example Test 1 My
Name.Example Tests.
Check Names ${suite.suites[1].tests[1]} Example Test 2 My
Name.Example Tests.
+Wildcards
+ Run Tests ${EMPTY} misc/suites/tsuite?.*ml
+ Check Names ${suite} Tsuite 1 & Tsuite 2 & Tsuite 3
+ Check Content ${suite} ['Tsuite 1', 'Tsuite 2', 'Tsuite 3'] []
+ Check Names ${suite.suites[0]} Tsuite 1 Tsuite 1 & Tsuite 2 &
Tsuite 3.
+ Check Content ${suite.suites[0]} [] ['Suite1 First', 'Suite1
Second', 'Third In Suite1']
+ Check Names ${suite.suites[0].tests[0]} Suite1 First Tsuite 1 &
Tsuite 2 & Tsuite 3.Tsuite 1.
+ Check Names ${suite.suites[0].tests[1]} Suite1 Second Tsuite 1 &
Tsuite 2 & Tsuite 3.Tsuite 1.
+ Check Names ${suite.suites[0].tests[2]} Third In Suite1 Tsuite 1 &
Tsuite 2 & Tsuite 3.Tsuite 1.
+ Check Names ${suite.suites[1]} Tsuite 2 Tsuite 1 & Tsuite 2 &
Tsuite 3.
+ Check Content ${suite.suites[1]} [] ['Suite2 First']
+ Check Names ${suite.suites[1].tests[0]} Suite2 First Tsuite 1 &
Tsuite 2 & Tsuite 3.Tsuite 2.
+ Check Names ${suite.suites[2]} Tsuite 3 Tsuite 1 & Tsuite 2 &
Tsuite 3.
+ Check Content ${suite.suites[2]} [] ['Suite3 First']
+ Check Names ${suite.suites[2].tests[0]} Suite3 First Tsuite 1 &
Tsuite 2 & Tsuite 3.Tsuite 3.
+
+
*** Keywords ***
-Check Suites And Tests
- [Arguments] ${suite} ${suites} ${tests}
+
+Check Content [Arguments] ${suite} ${suites} ${tests}
Should Be True ${suite.suites} == ${suites}
Should Be True ${suite.tests} == ${tests}
