3 new revisions:
Revision: 323979fe0b38
Author: Mikko Korpela <[email protected]>
Date: Thu Jun 16 23:13:54 2011
Log: forloop matchers
http://code.google.com/p/robotframework/source/detail?r=323979fe0b38
Revision: 700cdfe270f4
Author: Mikko Korpela <[email protected]>
Date: Thu Jun 16 23:35:07 2011
Log: forloop visible in logs
http://code.google.com/p/robotframework/source/detail?r=700cdfe270f4
Revision: 17b4c97077d5
Author: Mikko Korpela <[email protected]>
Date: Thu Jun 16 23:35:33 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=17b4c97077d5
==============================================================================
Revision: 323979fe0b38
Author: Mikko Korpela <[email protected]>
Date: Thu Jun 16 23:13:54 2011
Log: forloop matchers
http://code.google.com/p/robotframework/source/detail?r=323979fe0b38
Modified:
/src/robot/webcontent/testdata.js
=======================================
--- /src/robot/webcontent/testdata.js Thu Jun 16 05:42:23 2011
+++ /src/robot/webcontent/testdata.js Thu Jun 16 23:13:54 2011
@@ -80,7 +80,7 @@
return kw;
}
- var keywordMatcher = headerMatcher("kw", "setup", "teardown");
+ var keywordMatcher =
headerMatcher("kw", "setup", "teardown", "foritem", "for");
function messageMatcher(elem) {
return (elem.length == 3 &&
==============================================================================
Revision: 700cdfe270f4
Author: Mikko Korpela <[email protected]>
Date: Thu Jun 16 23:35:07 2011
Log: forloop visible in logs
http://code.google.com/p/robotframework/source/detail?r=700cdfe270f4
Modified:
/src/robot/webcontent/testdata.js
/utest/webcontent/spec/ParsingSpec.js
=======================================
--- /src/robot/webcontent/testdata.js Thu Jun 16 23:13:54 2011
+++ /src/robot/webcontent/testdata.js Thu Jun 16 23:35:07 2011
@@ -4,7 +4,10 @@
var LEVEL = {I:'info', H:'info', T:'trace', W:'warn', E:'error',
D:'debug', F:'fail'};
var KEYWORD_TYPE = {kw: 'KEYWORD',
setup:'SETUP',
- teardown:'TEARDOWN'};
+ teardown:'TEARDOWN',
+ for:'FOR',
+ foritem:'VAR'
+ };
var _statistics = null;
function addElement(elem) {
=======================================
--- /utest/webcontent/spec/ParsingSpec.js Tue Jun 14 13:12:03 2011
+++ /utest/webcontent/spec/ParsingSpec.js Thu Jun 16 23:35:07 2011
@@ -62,11 +62,14 @@
beforeEach(function () {
var keyword = ["kw",2,0,3,4, [0,"I",4], ["P",0,0]];
- var test = ["test",1,10,"Y",6, keyword, [7, 8],["P",-1,2]];
+ var forloop = ["for",11,0,0,0,
+ ["foritem",12,0,0,0, keyword, ["P", 0, 0]], ["P", 0, 0],
+ ["foritem",13,0,0,0, keyword, ["P", 0, 0]], ["P", 0, 0]]
+ var test = ["test",1,10,"Y",6, keyword, forloop, [7,
8],["P",-1,2]];
var suite = ["suite","/tmp/test.txt","Suite",5,{"meta":9}, test,
["P",-38,39], [1,1,1,1]];
var strings = ["*","*Test","*lib.kw","*Kw doc.","*message",
"*suite doc", "*test doc", "*tag1", "*tag2",
- "*data", "*1 second"];
+ "*data", "*1 second", "*${i} IN RANGE [ 2
]", "*${i} = 0", "*${i} = 1"];
populateOutput(suite, strings);
});
@@ -112,6 +115,19 @@
expect(kw.times).toBeDefined();
expect(kw.times.elapsedMillis).toEqual(0);
expect(kw.path).toEqual("Suite.Test.0");
+ expect(kw.type).toEqual("KEYWORD");
+ });
+
+ it("should parse for loop", function() {
+ var forloop = window.testdata.suite().test(0).keyword(1);
+ expect(forloop.name).toEqual("${i} IN RANGE [ 2 ]");
+ expect(forloop.type).toEqual("FOR");
+ var foritem = forloop.keyword(0);
+ expect(foritem.name).toEqual("${i} = 0");
+ expect(foritem.type).toEqual("VAR");
+ foritem = forloop.keyword(1);
+ expect(foritem.name).toEqual("${i} = 1");
+ expect(foritem.type).toEqual("VAR");
});
it("should parse message", function () {
==============================================================================
Revision: 17b4c97077d5
Author: Mikko Korpela <[email protected]>
Date: Thu Jun 16 23:35:33 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=17b4c97077d5
