Revision: 5ec45edd9f45
Author: Janne Härkönen <[email protected]>
Date: Tue Jun 21 04:29:58 2011
Log: Added test data with HTML markup, also fixed grammar
http://code.google.com/p/robotframework/source/detail?r=5ec45edd9f45
Modified:
/src/robot/webcontent/model.js
/src/robot/webcontent/testdata/data.js
/src/robot/webcontent/testdata/dir.suite/tests.txt
=======================================
--- /src/robot/webcontent/model.js Tue Jun 21 03:16:01 2011
+++ /src/robot/webcontent/model.js Tue Jun 21 04:29:58 2011
@@ -141,6 +141,7 @@
var parentPath = (parent.path === undefined) ? parent.fullName :
parent.path;
kw.path = parentPath + "." + data.index;
kw.arguments = data.args;
+ console.log(kw.arguments);
kw.populateKeywords = createIterablePopulator("Keyword");
kw.populateMessages = createIterablePopulator("Message");
kw.children = function () {
=======================================
--- /src/robot/webcontent/testdata/data.js Tue Jun 21 03:45:03 2011
+++ /src/robot/webcontent/testdata/data.js Tue Jun 21 04:29:58 2011
@@ -1,2 +1,2 @@
-window.output =
{"errors":[[40,"E",62]],"stats":[[{"fail":3,"label":"Critical
Tests","pass":2},{"fail":4,"label":"All
Tests","pass":2}],[{"info":"critical","links":"Title of
i1:http://1/","doc":"","label":"i1","combined":"","pass":2,"fail":4},{"info":"critical","links":"Title
of
i2:http://2/","doc":"","label":"i2","combined":"","pass":2,"fail":4},{"info":"non-critical","links":"","doc":"","label":"owner-kekkonen","combined":"","pass":0,"fail":1},{"info":"combined","links":"Title
of iX:http://X/","doc":";<b>Combined</b> tag
doc","label":"IX","combined":"i?","pass":2,"fail":4},{"info":"combined","links":"","doc":"","label":"zap","combined":"foo
&
i*","pass":0,"fail":0},{"info":"","links":"","doc":"","label":"collections","combined":"","pass":2,"fail":0},{"info":"","links":"","doc":"","label":"default","combined":"","pass":0,"fail":3},{"info":"","links":"kuukkeli:http://google.com","doc":"","label":"force","combined":"","pass":0,"fail":4},{"info":"","links":"","doc":"","label":"t1","combined":"","pass":0,"fail":1},{"info":"","links":"","doc":"this
is <b>my bold</b>
test","label":"test","combined":"","pass":0,"fail":4}],[{"fail":4,"label":"Dir.Suite","name":"Dir.Suite","pass":2},{"fail":0,"label":"Dir.Suite.Test.Suite.1","name":"Test.Suite.1","pass":1},{"fail":0,"label":"Dir.Suite.Test.Suite.2","name":"Test.Suite.2","pass":1},{"fail":4,"label":"Dir.Suite.Tests","name":"Tests","pass":0}]],"generatedMillis":-48,"generator":"Robot
trunk 20110613 (Python 2.6.6 on linux2)","generatedTimestamp":"20110621
13:41:28 GMT
+03:00","baseMillis":1308652888048,"suite":["suite","/home/jth/work/robotframework/src/robot/webcontent/testdata/dir.suite","Dir.Suite",1,{"URL":4,"Image":3,"Formatting":2},["setup",5,0,6,7,[0,"I",7],["P",-2,3]],["suite","/home/jth/work/robotframework/src/robot/webcontent/testdata/dir.suite/test.suite.1.txt","Test.Suite.1",0,{},["test",8,0,"Y",0,["kw",9,0,10,11,[21,"I",12],["P",19,1]],["kw",5,0,6,13,[22,"I",14],["P",21,1]],[15,16,17],["P",18,5]],["P",2,22],[1,1,1,1]],["suite","/home/jth/work/robotframework/src/robot/webcontent/testdata/dir.suite/test.suite.2.txt","Test.Suite.2",0,{},["test",18,0,"Y",0,["kw",19,0,20,21,[31,"I",22],["P",30,1]],["kw",5,0,6,23,[33,"I",24],["P",32,1]],[15,16,17],["P",28,6]],["P",24,11],[1,1,1,1]],["suite","/home/jth/work/robotframework/src/robot/webcontent/testdata/dir.suite/tests.txt","Tests",25,{"home
*page*":4},["setup",5,0,6,26,[42,"I",26],["P",41,1]],["test",27,0,"Y",0,["setup",5,0,6,28,[44,"I",28],["P",44,1]],["kw",5,0,6,29,[46,"I",29],["P",45,1]],["teardown",5,0,6,30,[47,"I",30],["P",47,1]],[31,32,16,17,33],["P",42,6]],["test",34,0,"Y",0,["setup",5,0,6,28,[52,"I",28],["P",52,1]],["kw",5,0,6,35,[54,"I",36],["P",53,1]],["teardown",5,0,6,30,[56,"I",30],["P",55,1]],[31,32,16,17,33],["P",50,7]],["test",37,0,"Y",0,["setup",5,0,6,28,[60,"I",28],["P",59,1]],["kw",5,0,6,38,[61,"I",38],["P",61,1]],["teardown",5,0,6,30,[63,"I",30],["P",62,1]],[31,32,16,17,33],["P",58,6]],["test",39,0,"N",40,["setup",5,0,6,41,[66,"I",41],["P",66,1]],["kw",5,0,6,42,[68,"I",42],["P",67,1]],["kw",43,0,0,0,["kw",5,0,6,44,[71,"I",44],["P",70,1]],["P",69,2]],["forloop",45,0,0,0,["foritem",46,0,0,0,["kw",5,0,6,47,[73,"I",48],["P",73,1]],["P",72,2]],["foritem",49,0,0,0,["kw",5,0,6,47,[76,"I",50],["P",75,1]],["P",75,2]],["foritem",51,0,0,0,["kw",5,0,6,47,[78,"I",52],["P",78,1]],["P",77,2]],["foritem",53,0,0,0,["kw",5,0,6,47,[81,"I",54],["P",80,1]],["P",79,2]],["P",72,10]],["teardown",5,0,6,55,[83,"I",55],["P",82,1]],[32,16,17,56,57,33],["P",65,19]],["teardown",58,0,59,0,[89,"F",60],["F",85,4]],["F",36,54,61],[4,0,3,0]],["F",-52,143],[6,2,5,2]],"strings":["*","eNqdzkEKwjAQheG9pxhygAS3Jca14ErwAEk7nQYTJ0wH2t7eunEhuHH9+D+eT+F+u3bepQA+wiQ4nsyk2jrnhBPrKLHiwvKwLGTCz8m7GHwScOHgc7jUSLireVdzJZil/7A9D2iJmQranqtrX5orTHzGVW17kgHNWvDfeNbtHSeWAaWDY1th5pIHIImb2c++AG8mWaA=","*<b>Bold</b>
and
<i>italics</i>","eNqdy8ENgzAMBdBVrAwQiyui7SyQGDdq0h85loDtK1bou7+lNKVh6RHe7n1mTsgSFdAqMaFxZ8MG321tcsA+XKF4yemxfzWQF6/ybx5+3XmDZbGZpn7SQC2Z1NYrED9/2Og45A==","eNqzSVTIKEpNs1XKKCkpsNLXL8pPyi9JK0rMTS3PL8rWyy9KV7LDKWWjn2gHAAV5F7A=","*BuiltIn.Log","*Logs
the given message with the given level.","*higher level suite setup","*list
test","*${list} = BuiltIn.Create List","*Returns a list containing given
items.","*foo, bar, quux","*${list} = [u'foo', u'bar',
u'quux']","*${list}","*[u'foo', u'bar',
u'quux']","*collections","*i1","*i2","*Dictionary test","*${dict} =
Collections.Create Dictionary","*Creates and returns a dictionary from the
given `key_value_pairs`.","*key, value","*${dict} = {u'key':
u'value'}","*${dict}","*{u'key': u'value'}","*Some suite docs with links:
<a
href=\"http://robotframework.org\";>http://robotframework.org</a>","*Suite
setup","*Simple","*Test Setup","*do nothing","*Test
Teardown","*default","*force","*test","*Log HTML","*<blink><b><font
face=\"comic sans ms\" size=\"42\" color=\"red\">I CAN HAZ
HMTL?!?!??!!?</font></b></blink>, HTML","*<blink><b><font face=\"comic sans
ms\" size=\"42\" color=\"red\">I CAN HAZ
HMTL?!?!??!!?</font></b></blink>","*Unicode","*hyv\u00e4\u00e4
joulua","*Complex","*Test doc","*in own setup","*in test","*User Kw","*in
User Kw","*${i} IN [ @{list} ]","*${i} = 1","*Got ${i}","*Got 1","*${i} =
2","*Got 2","*${i} = 3","*Got 3","*${i} = 4","*Got 4","*in own
teardown","*owner-kekkonen","*t1","*BuiltIn.Fail","*Fails the test
immediately with the given (optional) message.","*AssertionError","*Suite
teardown failed:\nAssertionError","*Invalid syntax in
file '/home/jth/work/robotframework/src/robot/webcontent/testdata/dir.suite/tests.txt'
in table 'Settings': Test library 'p\u00f6lk\u00fc/myLib.py' does not
exist."]};
+window.output =
{"errors":[[34,"E",65]],"stats":[[{"fail":3,"label":"Critical
Tests","pass":2},{"fail":4,"label":"All
Tests","pass":2}],[{"info":"critical","links":"Title of
i1:http://1/","doc":"","label":"i1","combined":"","pass":2,"fail":4},{"info":"critical","links":"Title
of
i2:http://2/","doc":"","label":"i2","combined":"","pass":2,"fail":4},{"info":"non-critical","links":"","doc":"","label":"owner-kekkonen","combined":"","pass":0,"fail":1},{"info":"combined","links":"Title
of iX:http://X/","doc":";<b>Combined</b> tag
doc","label":"IX","combined":"i?","pass":2,"fail":4},{"info":"combined","links":"","doc":"","label":"zap","combined":"foo
& i*","pass":0,"fail":0},{"info":"","links":"","doc":"","label":"<
<","combined":"","pass":0,"fail":4},{"info":"","links":"","doc":"","label":"collections","combined":"","pass":2,"fail":0},{"info":"","links":"","doc":"","label":"default","combined":"","pass":0,"fail":3},{"info":"","links":"kuukkeli:http://google.com","doc":"","label":"force","combined":"","pass":0,"fail":4},{"info":"","links":"","doc":"","label":"t1","combined":"","pass":0,"fail":1},{"info":"","links":"","doc":"this
is <b>my bold</b>
test","label":"test","combined":"","pass":0,"fail":4}],[{"fail":4,"label":"Dir.Suite","name":"Dir.Suite","pass":2},{"fail":0,"label":"Dir.Suite.Test.Suite.1","name":"Test.Suite.1","pass":1},{"fail":0,"label":"Dir.Suite.Test.Suite.2","name":"Test.Suite.2","pass":1},{"fail":4,"label":"Dir.Suite.Tests","name":"Tests","pass":0}]],"generatedMillis":-211,"generator":"Robot
trunk 20110613 (Python 2.6.6 on linux2)","generatedTimestamp":"20110621
14:06:57 GMT
+03:00","baseMillis":1308654417211,"suite":["suite","/home/jth/work/robotframework/src/robot/webcontent/testdata/dir.suite","Dir.Suite",1,{"URL":4,"Image":3,"Formatting":2},["setup",5,0,6,7,[0,"I",7],["P",-1,1]],["suite","/home/jth/work/robotframework/src/robot/webcontent/testdata/dir.suite/test.suite.1.txt","Test.Suite.1",0,{},["test",8,0,"Y",0,["kw",9,0,10,11,[16,"I",12],["P",15,0]],["kw",5,0,6,13,[17,"I",14],["P",16,1]],[15,16,17],["P",13,5]],["P",1,18],[1,1,1,1]],["suite","/home/jth/work/robotframework/src/robot/webcontent/testdata/dir.suite/test.suite.2.txt","Test.Suite.2",0,{},["test",18,0,"Y",0,["kw",19,0,20,21,[26,"I",22],["P",25,1]],["kw",5,0,6,23,[27,"I",24],["P",26,2]],[15,16,17],["P",23,5]],["P",20,9],[1,1,1,1]],["suite","/home/jth/work/robotframework/src/robot/webcontent/testdata/dir.suite/tests.txt","Tests",25,{"home
*page*":4},["setup",5,0,6,26,[36,"I",26],["P",35,1]],["test",27,0,"Y",0,["setup",5,0,6,28,[38,"I",28],["P",37,2]],["kw",5,0,6,29,[40,"I",29],["P",39,1]],["teardown",5,0,6,30,[41,"I",30],["P",41,1]],[31,32,33,16,17,34],["P",36,6]],["test",35,0,"Y",0,["setup",5,0,6,28,[45,"I",28],["P",44,1]],["kw",5,0,6,36,[47,"I",37],["P",46,1]],["kw",5,0,6,38,[48,"I",39],["P",47,1]],["kw",40,0,41,38,[51,"F",39],["F",49,3]],["teardown",5,0,6,30,[53,"I",30],["P",52,1]],[31,32,33,16,17,34],["F",43,11,38]],["test",42,0,"Y",0,["setup",5,0,6,28,[57,"I",28],["P",56,1]],["kw",5,0,6,43,[59,"I",43],["P",58,1]],["teardown",5,0,6,30,[60,"I",30],["P",59,1]],[31,32,33,16,17,34],["P",55,6]],["test",44,0,"N",45,["setup",5,0,6,46,[64,"I",46],["P",63,1]],["kw",5,0,6,47,[66,"I",47],["P",65,1]],["kw",48,0,0,0,["kw",5,0,6,49,[68,"I",49],["P",68,1]],["P",67,2]],["forloop",50,0,0,0,["foritem",51,0,0,0,["kw",5,0,6,52,[71,"I",53],["P",70,1]],["P",70,2]],["foritem",54,0,0,0,["kw",5,0,6,52,[74,"I",55],["P",73,1]],["P",72,2]],["foritem",56,0,0,0,["kw",5,0,6,52,[76,"I",57],["P",75,1]],["P",75,2]],["foritem",58,0,0,0,["kw",5,0,6,52,[78,"I",59],["P",78,1]],["P",77,2]],["P",70,9]],["teardown",5,0,6,60,[81,"I",60],["P",80,1]],[31,33,16,17,61,62,34],["P",62,19]],["teardown",40,0,41,0,[83,"F",63],["F",83,1]],["F",30,54,64],[4,0,3,0]],["F",-46,131],[6,2,5,2]],"strings":["*","eNqdzkEKwjAQheG9pxhygAS3Jca14ErwAEk7nQYTJ0wH2t7eunEhuHH9+D+eT+F+u3bepQA+wiQ4nsyk2jrnhBPrKLHiwvKwLGTCz8m7GHwScOHgc7jUSLireVdzJZil/7A9D2iJmQranqtrX5orTHzGVW17kgHNWvDfeNbtHSeWAaWDY1th5pIHIImb2c++AG8mWaA=","*<b>Bold</b>
and
<i>italics</i>","eNqdy8ENgzAMBdBVrAwQiyui7SyQGDdq0h85loDtK1bou7+lNKVh6RHe7n1mTsgSFdAqMaFxZ8MG321tcsA+XKF4yemxfzWQF6/ybx5+3XmDZbGZpn7SQC2Z1NYrED9/2Og45A==","eNqzSVTIKEpNs1XKKCkpsNLXL8pPyi9JK0rMTS3PL8rWyy9KV7LDKWWjn2gHAAV5F7A=","*BuiltIn.Log","*Logs
the given message with the given level.","*higher level suite setup","*list
test","*${list} = BuiltIn.Create List","*Returns a list containing given
items.","*foo, bar, quux","*${list} = [u'foo', u'bar',
u'quux']","*${list}","*[u'foo', u'bar',
u'quux']","*collections","*i1","*i2","*Dictionary test","*${dict} =
Collections.Create Dictionary","*Creates and returns a dictionary from the
given `key_value_pairs`.","*key, value","*${dict} = {u'key':
u'value'}","*${dict}","*{u'key': u'value'}","*Some suite docs with links:
<a
href=\"http://robotframework.org\";>http://robotframework.org</a>","*Suite
setup","*Simple","*Test Setup","*do nothing","*Test Teardown","*<
<","*default","*force","*test","*Log HTML","*<blink><b><font
face=\"comic sans ms\" size=\"42\" color=\"red\">CAN HAZ
HMTL?!?!??!!?</font></b></blink>, HTML","*<blink><b><font face=\"comic sans
ms\" size=\"42\" color=\"red\">CAN HAZ
HMTL?!?!??!!?</font></b></blink>","*escape < < <b>no bold</b>","*escape
< &lt; <b>no bold</b>","*BuiltIn.Fail","*Fails the test
immediately with the given (optional)
message.","*Unicode","*hyv\u00e4\u00e4 joulua","*Complex","*Test doc","*in
own setup","*in test","*User Kw","*in User Kw","*${i} IN [ @{list}
]","*${i} = 1","*Got ${i}","*Got 1","*${i} = 2","*Got 2","*${i} = 3","*Got
3","*${i} = 4","*Got 4","*in own
teardown","*owner-kekkonen","*t1","*AssertionError","*Suite teardown
failed:\nAssertionError","*Invalid syntax in
file '/home/jth/work/robotframework/src/robot/webcontent/testdata/dir.suite/tests.txt'
in table 'Settings': Test library 'p\u00f6lk\u00fc/myLib.py' does not
exist."]};
window.settings =
{"reportURL":"report.html","background":{"fail":"DeepPink"},"logURL":"log.html"};
=======================================
--- /src/robot/webcontent/testdata/dir.suite/tests.txt Mon Jun 20 12:59:40
2011
+++ /src/robot/webcontent/testdata/dir.suite/tests.txt Tue Jun 21 04:29:58
2011
@@ -5,7 +5,7 @@
Test Setup Log Test Setup
Test Teardown Log Test Teardown
Metadata home *page* http://robotframework.org
-Force Tags force test
+Force Tags force test < <
Default Tags default
Library pölkü/myLib.py
@@ -18,7 +18,9 @@
Log do nothing
Log HTML
- Log <blink><b><font face="comic sans ms" size="42" color="red">I CAN
HAZ HMTL?!?!??!!?</font></b></blink> HTML
+ Log <blink><b><font face="comic sans ms" size="42" color="red">CAN
HAZ HMTL?!?!??!!?</font></b></blink> HTML
+ Log escape < < <b>no bold</b>
+ Fail escape < < <b>no bold</b>
Unicode
Log hyvää joulua
