development/webtester
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

filter special ascii commands from output, otherwise jenkins cannot read the test output xml file

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-06-09 08:09:12 +00:00
parent 52087c3906
commit d991ec9133
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/commands.hxx
View File

@@ -436,11 +436,8 @@ class Script: public QObject {
}; };
public: public:
static QString xmlattr(QString attr, bool br = false) { static QString xmlattr(QString attr, bool br = false) {
attr.replace("&", "&amp;")//.replace(" ", "&nbsp;") if (br) return attr.toHtmlEscaped().replace("\n", "<br/>");
.replace("\"", "&quot;"); return attr.toHtmlEscaped();
if (br) attr.replace("\n", "<br/>");
attr.replace("<", "&lt;").replace(">", "&gt;");
return attr;
} }
static QString xmlstr(const std::string& attr) { static QString xmlstr(const std::string& attr) {
return xmlstr(QString::fromStdString(attr)); return xmlstr(QString::fromStdString(attr));
@@ -899,6 +896,7 @@ class Script: public QObject {
QString prefix QString prefix
(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss ")); (QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss "));
Command* cmd(command?command:_command); Command* cmd(command?command:_command);
for (QChar& c: text) if (c<32) c='?';
if (cmd) if (cmd)
prefix += QString("%2:%3%1 ") prefix += QString("%2:%3%1 ")
.arg(QString(cmd->indent(), QChar(' '))) .arg(QString(cmd->indent(), QChar(' ')))
@@ -2105,7 +2103,8 @@ class If: public Command {
"less (as integer), bigger (as integer). " "less (as integer), bigger (as integer). "
"Match allows a regular expression. " "Match allows a regular expression. "
"The second variant checks for a text in a selector, " "The second variant checks for a text in a selector, "
"similar to command exists. " "similar to command exists. The text can be empty to just "
"check for the existence of a selector. "
"There is an optional else part."; "There is an optional else part.";
} }
QString command() const { QString command() const {