test cleanup

pekkaklarck · pekkaklarck · commit 99c52244fb2a · 2020-10-16T00:41:22.000+03:00
diff --git a/atest/robot/running/test_case_status.robot b/atest/robot/running/test_case_status.robot
@@ -7,46 +7,46 @@ Resource          atest_resource.robot
 
 *** Test Case ***
 Test Passes
-    Check Test Case    Test Pass
+    Check Test Case    ${TEST NAME}
 
 Test Fails
-    Check Test Case    Test Fail
+    Check Test Case    ${TEST NAME}
 
 Non-Existing Keyword Error
-    Check Test Case    Non-Existing Keyword Error
+    Check Test Case    ${TEST NAME}
 
 Test Setup Passes
-    Check Test Case    Tests Setup Pass
+    Check Test Case    ${TEST NAME}
 
 Test Setup Fails
     [Documentation]    Checks also that test is not run if setup fails
-    Check Test Case    Tests Setup Fail
+    Check Test Case    ${TEST NAME}
 
-Test Setup Errors
-    Check Test Case    Tests Setup Error Non Existing KW
+Test Setup Error
+    Check Test Case    ${TEST NAME}
 
 Test Teardown Passes
-    Check Test Case    Tests Teardown Pass
+    Check Test Case    ${TEST NAME}
 
 Test Teardown Fails
-    Check Test Case    Tests Teardown Fail
+    Check Test Case    ${TEST NAME}
 
-Test Teardown Errors
-    Check Test Case    Tests Teardown Error Non Existing KW
+Test Teardown Error
+    Check Test Case    ${TEST NAME}
 
 Test And Teardown Fails
-    Check Test Case    Test And Teardown Fails
+    Check Test Case    ${TEST NAME}
 
 Test Setup And Teardown Pass
-    Check Test Case    Test Setup And Teardown Pass
+    Check Test Case    ${TEST NAME}
 
 Test Teardown is Run When Setup Fails
-    ${test}    Check Test Case    Test Teardown is Run When Setup Fails
+    ${test}    Check Test Case    ${TEST NAME}
     ${td} =    Set Variable    ${test.teardown}
     Should Not Be Equal    ${td}    ${None}    Teardown not run    No values
     Length Should Be   ${td.msgs}    1
     Check Log Message    ${td.msgs[0]}    Hello from teardown!
     Length Should Be   ${td.kws}    0
 
 Test Setup And Teardown Fails
-    Check Test Case    Test Setup And Teardown Fails
+    Check Test Case    ${TEST NAME}
diff --git a/atest/testdata/running/test_case_status.robot b/atest/testdata/running/test_case_status.robot
@@ -1,45 +1,45 @@
 *** Test Case ***
-Test Pass
+Test Passes
     [Documentation]    PASS
     No Operation
 
-Test Fail
+Test Fails
     [Documentation]    FAIL failure
     Fail    failure
 
 Non-Existing Keyword Error
     [Documentation]    FAIL No keyword with name 'Non Existing KW' found.
     Non Existing KW
 
-Tests Setup Pass
+Test Setup Passes
     [Documentation]    PASS
     [Setup]    No operation
     No Operation
 
-Tests Setup Fail
+Test Setup Fails
     [Documentation]    FAIL Setup failed:
     ...    failure
     [Setup]    Fail    failure
     Fail    This should not be executed
 
-Tests Setup Error Non Existing KW
+Test Setup Error
     [Documentation]    FAIL Setup failed:
     ...    No keyword with name 'Non Existing KW' found.
     [Setup]    Non Existing KW
     No Operation
 
-Tests Teardown Pass
+Test Teardown Passes
     [Documentation]    PASS
     No Operation
     [Teardown]    No operation
 
-Tests Teardown Fail
+Test Teardown Fails
     [Documentation]    FAIL Teardown failed:
     ...    failure
     No Operation
     [Teardown]    Fail    failure
 
-Tests Teardown Error Non Existing KW
+Test Teardown Error
     [Documentation]    FAIL Teardown failed:
     ...    No keyword with name 'Non Existing KW' found.
     No Operation
