7 new revisions:

Revision: 5b1fe4eb5177
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 10:26:14 2014 UTC
Log:      fix listener test
http://code.google.com/p/robotframework/source/detail?r=5b1fe4eb5177

Revision: a96eba995984
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 11:20:58 2014 UTC
Log:      fix atests processing_output.txt
http://code.google.com/p/robotframework/source/detail?r=a96eba995984

Revision: 40f6a8b1938d
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 11:33:15 2014 UTC
Log:      fix atest under output
http://code.google.com/p/robotframework/source/detail?r=40f6a8b1938d

Revision: d930ef13c770
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 11:36:54 2014 UTC
Log:      fix atest testdoc
http://code.google.com/p/robotframework/source/detail?r=d930ef13c770

Revision: bc9edaef339a
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 11:39:15 2014 UTC
Log:      fix atest xunit
http://code.google.com/p/robotframework/source/detail?r=bc9edaef339a

Revision: 4391faae18a4
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 11:56:14 2014 UTC
Log:      fix java listener (not class file yet(
http://code.google.com/p/robotframework/source/detail?r=4391faae18a4

Revision: 2d32c05872b6
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 12:38:25 2014 UTC
Log:      merge
http://code.google.com/p/robotframework/source/detail?r=2d32c05872b6

==============================================================================
Revision: 5b1fe4eb5177
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 10:26:14 2014 UTC
Log:      fix listener test
http://code.google.com/p/robotframework/source/detail?r=5b1fe4eb5177

Modified:
 /atest/testresources/listeners/listeners.py

=======================================
--- /atest/testresources/listeners/listeners.py Thu May 23 12:19:59 2013 UTC
+++ /atest/testresources/listeners/listeners.py Thu Jan 23 10:26:14 2014 UTC
@@ -33,12 +33,13 @@
 class SuiteAndTestCounts(object):
     ROBOT_LISTENER_API_VERSION = '2'
     exp_data = {
-        'Subsuites & Subsuites2': ([], ['Subsuites', 'Subsuites2'], 4),
+        'Subsuites & Subsuites2': ([], ['Subsuites', 'Subsuites2'], 5),
         'Subsuites':               ([], ['Sub1', 'Sub2'], 2),
         'Sub1':                   (['SubSuite1 First'], [], 1),
         'Sub2':                   (['SubSuite2 First'], [], 1),
-        'Subsuites2':             ([], ['Subsuite3'], 2),
+        'Subsuites2':             ([], ['Sub.Suite.4', 'Subsuite3'], 3),
'Subsuite3': (['SubSuite3 First', 'SubSuite3 Second'], [], 2),
+        'Sub.Suite.4':            (['Test From Sub Suite 4'], [], 1)
         }

     def start_suite(self, name, attrs):

==============================================================================
Revision: a96eba995984
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 11:20:58 2014 UTC
Log:      fix atests processing_output.txt
http://code.google.com/p/robotframework/source/detail?r=a96eba995984

Modified:
 /atest/robot/output/processing_output.txt

=======================================
--- /atest/robot/output/processing_output.txt   Mon Jun 18 07:57:01 2012 UTC
+++ /atest/robot/output/processing_output.txt   Thu Jan 23 11:20:58 2014 UTC
@@ -91,7 +91,7 @@
     Should Contain Suites  ${SUITE.suites[1]}  Sub1  Sub2
Should Be True ${SUITE.suites[0].suites} + ${SUITE.suites[1].suites[0].suites}+ ${SUITE.suites[1].suites[1].suites}+ ${SUITE.suites[2].suites[0].suites}+ ${SUITE.suites[3].suites} + ${SUITE.suites[4].suites} + ${SUITE.suites[5].suites}== [] Check Suite Contains Tests ${SUITE} SubSuite1 First SubSuite2 First SubSuite3 First SubSuite3 Second Suite1 First Suite1 Second
-    ...  Third In Suite1  Suite2 First  Suite3 First  Suite4 First
+ ... Third In Suite1 Suite2 First Suite3 First Suite4 First Test From Sub Suite 4 Check Normal Suite Defaults ${SUITE.suites[0]} ${EMPTY} [] teardown=BuiltIn.Log
     Check Normal Suite Defaults  ${SUITE.suites[1]}
Check Normal Suite Defaults ${SUITE.suites[1].suites[0]} setup=BuiltIn.Log teardown=BuiltIn.No Operation

==============================================================================
Revision: 40f6a8b1938d
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 11:33:15 2014 UTC
Log:      fix atest under output
http://code.google.com/p/robotframework/source/detail?r=40f6a8b1938d

Modified:
 /atest/robot/output/statistics.txt
 /atest/robot/output/statistics_in_log_and_report.txt
 /atest/robot/output/statistics_with_rebot.txt

=======================================
--- /atest/robot/output/statistics.txt  Mon Nov 26 07:50:25 2012 UTC
+++ /atest/robot/output/statistics.txt  Thu Jan 23 11:33:15 2014 UTC
@@ -16,7 +16,7 @@
     ${stats} =    Get Element    ${OUTFILE}    statistics/total
     ${crit}    ${total} =    Call Method    ${stats}    findall    stat
     Node Should Be Correct    ${crit}    Critical Tests    5    1
-    Node Should Be Correct    ${total}    All Tests    9    1
+    Node Should Be Correct    ${total}    All Tests    10    1

 Tag statistics should be Correct
     ${stats} =    Get Element    ${OUTFILE}    statistics/tag
@@ -27,7 +27,7 @@
     Tag Node Should Be Correct    ${stats[5]}    d2    1    0
Tag Node Should Be Correct ${stats[6]} f1 9 1 doc=this is tagdoc links=title:url
     Tag Node Should Be Correct    ${stats[7]}    sub3    2    0
-    Tag Node Should Be Correct    ${stats[8]}    XXX    9    1
+    Tag Node Should Be Correct    ${stats[8]}    XXX    10    1

 Combined Tag Statistics Name Can Be Given
     ${stats} =    Get Element    ${OUTFILE}    statistics/tag
@@ -35,10 +35,10 @@

 Suite statistics should be Correct
     ${stats} =    Get Element    ${OUTFILE}    statistics/suite
-    Suite Node Should Be Correct    ${stats[0]}    Suites    9    1
+    Suite Node Should Be Correct    ${stats[0]}    Suites    10    1
     Suite Node Should Be Correct    ${stats[1]}    Suites.Fourth    0    1
Suite Node Should Be Correct ${stats[2]} Suites.Subsuites 2 0 - Suite Node Should Be Correct ${stats[3]} Suites.Subsuites2 2 0 + Suite Node Should Be Correct ${stats[3]} Suites.Subsuites2 3 0
     Suite Node Should Be Correct    ${stats[4]}    Suites.Tsuite1    3    0
     Suite Node Should Be Correct    ${stats[5]}    Suites.Tsuite2    1    0
     Suite Node Should Be Correct    ${stats[6]}    Suites.Tsuite3    1    0
=======================================
--- /atest/robot/output/statistics_in_log_and_report.txt Wed Jun 27 22:34:50 2012 UTC +++ /atest/robot/output/statistics_in_log_and_report.txt Thu Jan 23 11:33:15 2014 UTC
@@ -46,7 +46,7 @@
     [Arguments]    ${file}
     ${critical}    ${all} =    Get Total Stats    ${OUTDIR}${/}${file}
     Verify stat    ${critical}    label:Critical Tests    pass:5    fail:1
-    Verify stat    ${all}    label:All Tests    pass:9    fail:1
+    Verify stat    ${all}    label:All Tests    pass:10    fail:1

 Verify tag stats
     [Arguments]    ${file}
@@ -65,13 +65,13 @@
     ${stats} =    Get Suite Stats    ${OUTDIR}${/}${file}
     Length Should Be    ${stats}    7
     Verify stat    ${stats[0]}    label:Suites    name:Suites
-    ...    id:s1    pass:9    fail:1
+    ...    id:s1    pass:10    fail:1
     Verify stat    ${stats[1]}    label:Suites.Fourth    name:Fourth
     ...    id:s1-s1    pass:0    fail:1
     Verify stat    ${stats[2]}    label:Suites.Subsuites    name:Subsuites
     ...    id:s1-s2    pass:2    fail:0
Verify stat ${stats[3]} label:Suites.Subsuites2 name:Subsuites2
-    ...    id:s1-s3    pass:2    fail:0
+    ...    id:s1-s3    pass:3    fail:0
     Verify stat    ${stats[4]}    label:Suites.Tsuite1    name:Tsuite1
     ...    id:s1-s4    pass:3    fail:0
     Verify stat    ${stats[5]}    label:Suites.Tsuite2    name:Tsuite2
=======================================
--- /atest/robot/output/statistics_with_rebot.txt Mon Nov 26 07:50:25 2012 UTC +++ /atest/robot/output/statistics_with_rebot.txt Thu Jan 23 11:33:15 2014 UTC
@@ -15,7 +15,7 @@
     ${stats} =    Get Element    ${OUTFILE}    statistics/total
     ${crit}    ${total} =    Call Method    ${stats}    findall    stat
     Node Should Be Correct    ${crit}    Critical Tests    5    1
-    Node Should Be Correct    ${total}    All Tests    9    1
+    Node Should Be Correct    ${total}    All Tests    10    1

 Tag statistics should be Correct
     ${stats} =    Get Element    ${OUTFILE}    statistics/tag
@@ -26,14 +26,14 @@
     Tag Node Should Be Correct    ${stats[4]}    d2    1    0
     Tag Node Should Be Correct    ${stats[5]}    f1    9    1
     Tag Node Should Be Correct    ${stats[6]}    sub3    2    0
-    Tag Node Should Be Correct    ${stats[7]}    XxX    9    1
+    Tag Node Should Be Correct    ${stats[7]}    XxX    10    1

 Suite statistics should be Correct
     ${stats} =    Get Element    ${OUTFILE}    statistics/suite
-    Node Should Be Correct    ${stats[0]}    Suites    9    1
+    Node Should Be Correct    ${stats[0]}    Suites    10    1
     Node Should Be Correct    ${stats[1]}    Suites.Fourth    0    1
     Node Should Be Correct    ${stats[2]}    Suites.Subsuites    2    0
-    Node Should Be Correct    ${stats[3]}    Suites.Subsuites2    2    0
+    Node Should Be Correct    ${stats[3]}    Suites.Subsuites2    3    0
     Node Should Be Correct    ${stats[4]}    Suites.Tsuite1    3    0
     Node Should Be Correct    ${stats[5]}    Suites.Tsuite2    1    0
     Node Should Be Correct    ${stats[6]}    Suites.Tsuite3    1    0

==============================================================================
Revision: d930ef13c770
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 11:36:54 2014 UTC
Log:      fix atest testdoc
http://code.google.com/p/robotframework/source/detail?r=d930ef13c770

Modified:
 /atest/robot/testdoc/testdoc.txt

=======================================
--- /atest/robot/testdoc/testdoc.txt    Thu Sep 19 09:21:15 2013 UTC
+++ /atest/robot/testdoc/testdoc.txt    Thu Jan 23 11:36:54 2014 UTC
@@ -25,7 +25,7 @@

 Many inputs
${output}= Run TestDoc --exclude t1 --title Nön-ÄSCII ${INPUT 1} ${INPUT2} ${INPUT 3} - Testdoc Should Contain "name":"Pass And Fail &amp; Suites &amp; Testdoc" "title":"Nön-ÄSCII" "numberOfTests":7 + Testdoc Should Contain "name":"Pass And Fail &amp; Suites &amp; Testdoc" "title":"Nön-ÄSCII" "numberOfTests":8
     Testdoc Should Not Contain    "name":"Suite4 First"
     Outfile Should Have Correct Line Separators
     Output Should Contain Outfile    ${output}

==============================================================================
Revision: bc9edaef339a
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 11:39:15 2014 UTC
Log:      fix atest xunit
http://code.google.com/p/robotframework/source/detail?r=bc9edaef339a

Modified:
 /atest/robot/rebot/xunit.txt

=======================================
--- /atest/robot/rebot/xunit.txt        Fri Jun  7 17:28:37 2013 UTC
+++ /atest/robot/rebot/xunit.txt        Thu Jan 23 11:39:15 2014 UTC
@@ -29,7 +29,7 @@
     ${root} =  Parse XML  ${OUTDIR}/xunit.xml
     Should Be Equal  ${root.tag}  testsuite
     ${tests} =  Get Elements  ${root}  testcase
-    Length Should Be  ${tests}  18
+    Length Should Be  ${tests}  19
Should Be Equal ${tests[7].attrib['name']} Ünïcödë Tëst änd Këywörd Nämës
     ${failures} =  Get Elements  ${root}  testcase/failure
     Length Should Be  ${failures}  5
@@ -39,7 +39,7 @@
Run Rebot --xUnit xunit.xml --xUnitSkipNonCritical --NonCritical f1 ${INPUT FILE}
     Stderr Should Be Empty
     ${root} =    Parse XML  ${OUTDIR}/xunit.xml
-    Element Attribute Should Be    ${root}    tests    18
+    Element Attribute Should Be    ${root}    tests    19
     Element Attribute Should Be    ${root}    failures    4
     Element Attribute Should Be    ${root}    skip    10
     ${skipped} =  Get Elements  ${root}  xpath=testcase/skipped

==============================================================================
Revision: 4391faae18a4
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 11:56:14 2014 UTC
Log:      fix java listener (not class file yet(
http://code.google.com/p/robotframework/source/detail?r=4391faae18a4

Modified:
 /atest/testresources/listeners/JavaSuiteAndTestCountListener.java

=======================================
--- /atest/testresources/listeners/JavaSuiteAndTestCountListener.java Thu May 27 10:51:27 2010 UTC +++ /atest/testresources/listeners/JavaSuiteAndTestCountListener.java Thu Jan 23 11:56:14 2014 UTC
@@ -10,6 +10,7 @@
         put("Sub2", new int[] {1,0,1});
         put("Subsuites2", new int[] {0,1,2});
         put("Subsuite3", new int[] {2,0,2});
+        put("Sub.Suite.4", new int[] {1, 0, 1});
     }};

     public void startSuite(String name, Map attrs) {

==============================================================================
Revision: 2d32c05872b6
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Thu Jan 23 12:38:25 2014 UTC
Log:      merge
http://code.google.com/p/robotframework/source/detail?r=2d32c05872b6


--

--- You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to