Skip to content

Commit 64df016

Browse files
yanneyanne
committed
remove reST/html tests
1 parent 4601c71 commit 64df016

File tree

17 files changed

+21
-513
lines changed

17 files changed

+21
-513
lines changed

‎atest/robot/parsing/data_formats/formats_resource.robot

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ ${FORMATS DIR} ${DATA DIR}/parsing/data_formats
66
${TSV DIR} ${FORMATS DIR}/tsv
77
${TXT DIR} ${FORMATS DIR}/txt
88
${ROBOT DIR} ${FORMATS DIR}/robot
9-
${REST DIR} ${FORMATS DIR}/rest
10-
${REST DIR 2} ${FORMATS DIR}/rest_directives
9+
${REST DIR} ${FORMATS DIR}/rest_directives
1110
${MIXED DIR} ${FORMATS DIR}/mixed_data
1211
${RESOURCE DIR} ${FORMATS DIR}/resources
1312
@{SAMPLE TESTS} Passing Failing User Keyword Nön-äscïï Own Tags Default Tags Variable Table
@@ -19,15 +18,9 @@ ${RESOURCE DIR} ${FORMATS DIR}/resources
1918
Previous Run Should Have Been Successful
2019
Should Not Be Equal ${SUITE} ${None} Running tests failed. No Values
2120

22-
Run Tests And Verify Status
23-
[Arguments] ${options} ${paths}
24-
Set Suite Variable $SUITE ${None}
25-
Run Tests ${options} ${paths}
26-
Previous Run Should Have Been Successful
27-
2821
Run Sample File And Check Tests
2922
[Arguments] ${options} ${path}
30-
Run Tests And Verify Status ${options} ${path}
23+
Run Tests ${options} ${path}
3124
${ignore} ${type} = Split Extension ${path}
3225
Should Be Equal ${SUITE.name} Sample
3326
Should Be Equal ${SUITE.doc} A complex testdata file in ${type} format.
@@ -50,7 +43,7 @@ Run Sample File And Check Tests
5043

5144
Run Suite Dir And Check Results
5245
[Arguments] ${options} ${path}
53-
Run Tests And Verify Status ${options} ${path}
46+
Run Tests ${options} ${path}
5447
${ignore} ${type} = Split Path ${path}
5548
Should Be Equal ${SUITE.name} ${type.capitalize()}
5649
Should Be Equal ${SUITE.doc} ${EMPTY}

‎atest/robot/parsing/data_formats/mixed.robot

Lines changed: 10 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,26 @@
11
*** Settings ***
2-
Force Tags require-docutils
32
Resource formats_resource.robot
3+
Suite Setup Run tests ${EMPTY} ${MIXEDDIR}
44

55
*** Variables ***
6-
@{TSV TESTS} TSV Passing TSV Failing ReST Resource TXT Resource
7-
@{REST TESTS} ReST Passing ReST Failing TSV Resource TXT Resource
8-
@{TXT TESTS} TXT Passing TXT Failing ReST Resource TSV Resource
6+
@{TSV TESTS} TSV Passing TSV Failing TXT Resource
7+
@{TXT TESTS} TXT Passing TXT Failing TSV Resource
98

109
*** Test Cases ***
11-
TSV Suite With ReST Resource
12-
Previous Run Should Have Been Successful
13-
Check Test Case ReST Resource
14-
1510
TSV Suite With TXT Resource
16-
Previous Run Should Have Been Successful
17-
Check Test Case TXT Resource
18-
19-
ReST Suite With TSV Resource
20-
Previous Run Should Have Been Successful
21-
Check Test Case TSV Resource
22-
23-
ReST Suite With TXT Resource
24-
Previous Run Should Have Been Successful
2511
Check Test Case TXT Resource
2612

27-
TXT Suite With ReST Resource
28-
Previous Run Should Have Been Successful
29-
Check Test Case ReST Resource
30-
3113
TXT Suite With TSV Resource
32-
Previous Run Should Have Been Successful
3314
Check Test Case TSV Resource
3415

3516
Directory With Mixed Data
36-
Run Tests And Verify Status ${EMPTY} ${MIXEDDIR}
37-
Verify Directory with Mixed Data With ReST
38-
39-
Multiple Data Sources Without reST
40-
Run Tests And Verify Status ${EMPTY} ${TSVDIR}/sample.tsv ${TXTDIR}/sample.txt ${MIXEDDIR}
41-
Verify Multiple Data Sources Without ReST
42-
43-
Multiple Data Sources With reST
44-
Run Tests And Verify Status ${EMPTY} ${TSVDIR}/sample.tsv ${RESTDIR}/sample.rst ${TXTDIR}/sample.txt ${MIXEDDIR}
45-
Verify Multiple Data Sources With ReST
17+
Verify Directory with Mixed Data
4618

4719
*** Keywords ***
48-
Verify Directory With Mixed Data With ReST
20+
Verify Directory With Mixed Data
4921
Should Be Equal ${SUITE.name} Mixed Data
50-
Should Contain Suites ${SUITE} REST TSV TXT
51-
Should Be Equal ${SUITE.suites[0].doc} Test suite in ReST file
52-
Should Be Equal ${SUITE.suites[1].doc} Test suite in TSV file
53-
Should Be Equal ${SUITE.suites[2].doc} Test suite in TXT file
54-
Should Contain Tests ${SUITE.suites[0]} @{REST TESTS}
55-
Should Contain Tests ${SUITE.suites[1]} @{TSV TESTS}
56-
Should Contain Tests ${SUITE.suites[2]} @{TXT TESTS}
57-
58-
Verify Multiple Data Sources With ReST
59-
Should Be Equal ${SUITE.name} Sample & Sample & Sample & Sample & Mixed Data
60-
Should Contain Suites ${SUITE} Sample Sample Sample Sample Mixed Data
61-
Should Contain Tests ${SUITE.suites[0]} @{SAMPLE_TESTS}
62-
Should Contain Tests ${SUITE.suites[1]} @{SAMPLE_TESTS}
63-
Should Contain Tests ${SUITE.suites[2]} @{SAMPLE_TESTS}
64-
Should Contain Tests ${SUITE.suites[3]} @{SAMPLE_TESTS}
65-
Should Contain Tests ${SUITE.suites[4]} @{REST TESTS} @{TSV TESTS} @{TXT TESTS}
66-
67-
Verify Multiple Data Sources Without ReST
68-
Should Be Equal ${SUITE.name} Sample & Sample & Sample & Mixed Data
69-
Should Contain Suites ${SUITE} Sample Sample Sample Mixed Data
70-
Should Contain Tests ${SUITE.suites[0]} @{SAMPLE_TESTS}
71-
Should Contain Tests ${SUITE.suites[1]} @{SAMPLE_TESTS}
72-
Should Contain Tests ${SUITE.suites[2]} @{SAMPLE_TESTS}
22+
Should Contain Suites ${SUITE} TSV TXT
23+
Should Be Equal ${SUITE.suites[0].doc} Test suite in TSV file
24+
Should Be Equal ${SUITE.suites[1].doc} Test suite in TXT file
25+
Should Contain Tests ${SUITE.suites[0]} @{TSV TESTS}
26+
Should Contain Tests ${SUITE.suites[1]} @{TXT TESTS}

‎atest/robot/parsing/data_formats/rest.robot

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎atest/robot/parsing/data_formats/rest_directives.robot

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,21 @@ Force Tags require-docutils
33
Resource formats_resource.robot
44

55
*** Test Cases ***
6-
One ReST using code-directive
7-
Run sample file and check tests ${EMPTY} ${RESTDIR2}/sample.rst
6+
One reST using code-directive
7+
Run sample file and check tests ${EMPTY} ${RESTDIR}/sample.rst
88

9-
ReST With ReST Resource
9+
ReST With reST Resource
1010
Previous Run Should Have Been Successful
1111
Check Test Case Resource File
1212

1313
Parsing reST files automatically is deprecated
1414
Previous Run Should Have Been Successful
15-
Check Automatic Parsing Deprecated Message 0 ${RESTDIR2}/sample.rst
15+
Check Automatic Parsing Deprecated Message 0 ${RESTDIR}/sample.rst
1616
Length should be ${ERRORS} 1
1717

1818
Using --extension avoids deprecation warning
19-
Run sample file and check tests --extension rst ${RESTDIR2}/sample.rst
19+
Run sample file and check tests --extension rst ${RESTDIR}/sample.rst
2020
Length should be ${ERRORS} 0
21+
22+
ReST Directory
23+
Run Suite Dir And Check Results ${EMPTY} ${RESTDIR}

‎atest/testdata/parsing/data_formats/mixed_data/REST.rest

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎atest/testdata/parsing/data_formats/mixed_data/TSV.tsv

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
*Setting
22
Documentation Test suite in TSV file
3-
Resource ../resources/rest_resource.rst
43
Resource ../resources/txt_resource.txt
54

65
*Variable
@@ -10,10 +9,6 @@ ${msg} *ERROR*
109
TSV Passing No operation
1110
TSV Failing [Documentation] FAIL **ERROR**
1211
Failing *${msg}*
13-
ReST Resource Keyword from ReST resource
14-
Keyword from ReST resource 2
15-
Should Be Equal ${rest_resource_var} ReST Resource Variable
16-
Should Be Equal ${rest_resource_var2} ReST Resource Variable From Recursive Resource
1712
TXT Resource Keyword from TXT resource
1813
Keyword from TXT resource 2
1914
Should Be Equal ${txt_resource_var} TXT Resource Variable

‎atest/testdata/parsing/data_formats/mixed_data/TXT.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ ${msg} *ERROR*
1010
TXT Passing No operation
1111
TXT Failing [Documentation] FAIL **ERROR**
1212
Failing *${msg}*
13-
ReST Resource Keyword from ReST resource
14-
Keyword from ReST resource 2
15-
Should Be Equal ${rest_resource_var} ReST Resource Variable
16-
Should Be Equal ${rest_resource_var2} ReST Resource Variable From Recursive Resource
1713
TSV Resource Keyword from TSV resource
1814
Keyword from TSV resource 2
1915
Should Be Equal ${tsv_resource_var} TSV Resource Variable

‎atest/testdata/parsing/data_formats/resources/rest_resource.rst

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎atest/testdata/parsing/data_formats/resources/rest_resource2.rest

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎atest/testdata/parsing/data_formats/rest/include.rst

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎atest/testdata/parsing/data_formats/rest/not_a_picture.jpg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)