2 new revisions:
Revision: da3b63c87401
Author: Pekka Klärck
Date: Tue Jun 7 07:41:06 2011
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=da3b63c87401
Revision: e3c4034e3f34
Author: Pekka Klärck
Date: Tue Jun 7 07:42:34 2011
Log: read tests' error message from xml.
http://code.google.com/p/robotframework/source/detail?r=e3c4034e3f34
==============================================================================
Revision: da3b63c87401
Author: Pekka Klärck
Date: Tue Jun 7 07:41:06 2011
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=da3b63c87401
Modified:
/src/robot/webcontent/log.html
=======================================
--- /src/robot/webcontent/log.html Tue Jun 7 05:47:15 2011
+++ /src/robot/webcontent/log.html Tue Jun 7 07:41:06 2011
@@ -580,8 +580,9 @@
<script type="text/html" id="test_template">
<table class="test" id="${id}">
<tr>
- <td><a class="expand"
- href="javascript:expandAllChildren('${id}')">Expand All</a>
+ <td>
+ <a class="expand"
+ href="javascript:expandAllChildren('${id}')">Expand All</a>
<div class="foldingbutton"
id="${id}_unfoldlink"
onclick="openTest('${id}');"
==============================================================================
Revision: e3c4034e3f34
Author: Pekka Klärck
Date: Tue Jun 7 07:42:34 2011
Log: read tests' error message from xml.
http://code.google.com/p/robotframework/source/detail?r=e3c4034e3f34
Modified:
/src/robot/serializing/jsparser.py
/src/robot/webcontent/js/testdata.js
=======================================
--- /src/robot/serializing/jsparser.py Mon Jun 6 23:08:54 2011
+++ /src/robot/serializing/jsparser.py Tue Jun 7 07:42:34 2011
@@ -409,7 +409,8 @@
def end_element(self, text):
return [self._status,
self._starttime,
- self._endtime-self._starttime]
+ self._endtime-self._starttime,
+ self._context.get_text_id(text or '')]
class _TestStatusHandler(_StatusHandler):
=======================================
--- /src/robot/webcontent/js/testdata.js Tue Jun 7 04:09:07 2011
+++ /src/robot/webcontent/js/testdata.js Tue Jun 7 07:42:34 2011
@@ -23,6 +23,7 @@
return new Date(window.basemillis + millis);
}
+ // TODO: Remove this function and use texts.get everywhere.
function get(id) {
return texts.get(id)
}
@@ -39,13 +40,19 @@
model.Message(LEVEL[element[1]], timestamp(element[0]),
get(element[2]), element[3]));
}
+ // TODO: Is separate status object needed? Probably not.
function createStatus(stats, parentSuiteTeardownFailed) {
var status = (stats[0] == "P" ? model.PASS : model.FAIL);
return model.Status(status, parentSuiteTeardownFailed);
}
function last(items) {
- return items[items.length - 1];
+ return items[items.length-1];
+ }
+
+ // TODO: Consider better name...
+ function last2(items) {
+ return items[items.length-2];
}
function childCreator(parent, childType) {
@@ -91,8 +98,9 @@
timeout: get(element[2]),
isCritical: (element[3] == "Y"),
status: createStatus(last(element),
suite.hasTeardownFailure()),
+ message: get(last(last(element))),
times: model.Times(times(last(element))),
- tags: tags(element[element.length - 2])
+ tags: tags(last2(element))
});
test.populateKeywords(Populator(element, keywordMatcher,
childCreator(test, createKeyword)));
return test;
@@ -104,8 +112,10 @@
name: element[2],
source: element[1],
doc: get(element[3]),
- status: createStatus(element[element.length - 2], parent &&
parent.hasTeardownFailure()),
- times: model.Times(times(element[element.length - 2])),
+ status: createStatus(last2(element), parent &&
parent.hasTeardownFailure()),
+ // TODO: Add message to suite. Following ought to work but
breaks 40+ specs...
+ // message: get(last(last2(element))),
+ times: model.Times(times(last2(element))),
statistics: suiteStats(last(element)),
metadata: parseMetadata(element[4])
});
