mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-06 17:26:01 +02:00
Bug 459197 - C++ Unit Testing does not work with QT5
- change default behaviour on unknown tag to be just to log the unknown tag instead of throwing exception Change-Id: Ia8880622ec3791ba546384edf536951b2c8c1edc
This commit is contained in:
parent
26f81215ac
commit
ca29390671
1 changed files with 14 additions and 2 deletions
|
@ -319,7 +319,7 @@ public class QtXmlLogHandler extends DefaultHandler {
|
||||||
/* just skip, do nothing */
|
/* just skip, do nothing */
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
logAndThrowErrorForElement(qName);
|
logUnknownTag(qName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -359,7 +359,7 @@ public class QtXmlLogHandler extends DefaultHandler {
|
||||||
/* just skip, do nothing */
|
/* just skip, do nothing */
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
logAndThrowErrorForElement(qName);
|
logUnknownTag(qName);
|
||||||
}
|
}
|
||||||
elementData = null;
|
elementData = null;
|
||||||
}
|
}
|
||||||
|
@ -379,12 +379,24 @@ public class QtXmlLogHandler extends DefaultHandler {
|
||||||
* @param tagName XML tag name
|
* @param tagName XML tag name
|
||||||
* @throws SAXException the exception that will be thrown
|
* @throws SAXException the exception that will be thrown
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private void logAndThrowErrorForElement(String tagName) throws SAXException {
|
private void logAndThrowErrorForElement(String tagName) throws SAXException {
|
||||||
logAndThrowError(
|
logAndThrowError(
|
||||||
MessageFormat.format(QtTestsRunnerMessages.QtXmlLogHandler_wrong_tag_name, tagName)
|
MessageFormat.format(QtTestsRunnerMessages.QtXmlLogHandler_wrong_tag_name, tagName)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Logs a message regarding an unknown XML tag.
|
||||||
|
*
|
||||||
|
* @param tagName XML tag name
|
||||||
|
*/
|
||||||
|
private void logUnknownTag(String tagName) {
|
||||||
|
QtTestsRunnerPlugin.log(new SAXException(
|
||||||
|
MessageFormat.format(QtTestsRunnerMessages.QtXmlLogHandler_wrong_tag_name, tagName))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Throws the testing exception with the specified message.
|
* Throws the testing exception with the specified message.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Add table
Reference in a new issue