Trim excess whitespace in Boost test output

The code for boost test running parsing left all the excess whitespace from the XML file. This led to a lot whitespace in messages in the UI. This change trims leading and trailing whitespace, but preserves whitespace within a message.
eclipse-cdt · Aug 14, 2023 · 0639a8b · 0639a8b
1 parent 9f342cc
commit 0639a8b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/....testsrunner.boost/src/org/eclipse/cdt/testsrunner/internal/boost/BoostXmlLogHandler.java b/....testsrunner.boost/src/org/eclipse/cdt/testsrunner/internal/boost/BoostXmlLogHandler.java
@@ -149,7 +149,7 @@ public void startElement(String namespaceURI, String localName, String qName, At
 	 * @param level test message level
 	 */
 	private void addCurrentMessage(ITestMessage.Level level) {
-		modelUpdater.addTestMessage(fileName, lineNumber, level, elementDataStack.peek().toString());
+		modelUpdater.addTestMessage(fileName, lineNumber, level, elementDataStack.peek().toString().trim());
 		fileName = DEFAULT_LOCATION_FILE;
 		lineNumber = DEFAULT_LOCATION_LINE;
 		if (level == ITestMessage.Level.Error || level == ITestMessage.Level.FatalError) {
@@ -200,7 +200,11 @@ public void endElement(String namespaceURI, String localName, String qName) thro
 
 		case XML_NODE_EXCEPTION:
 			if (fileName != DEFAULT_LOCATION_FILE && !fileName.isEmpty() && lineNumber >= 0) {
-				elementDataStack.peek().append(BoostTestsRunnerMessages.BoostXmlLogHandler_exception_suffix);
+				StringBuilder current = elementDataStack.peek();
+				String trimmed = current.toString().trim();
+				current.setLength(0);
+				current.append(trimmed);
+				current.append(BoostTestsRunnerMessages.BoostXmlLogHandler_exception_suffix);
 			}
 			addCurrentMessage(ITestMessage.Level.Exception);
 			break;

diff --git a/...pse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BoostTestCase.java b/...pse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BoostTestCase.java
@@ -226,7 +226,8 @@ public void testEmptyMessage() {
 		mockModelUpdater.enterTestSuite("MainTS");
 		mockModelUpdater.enterTestCase("test");
 		mockModelUpdater.addTestMessage("file.cpp", 22, ITestMessage.Level.Info, "");
-		mockModelUpdater.addTestMessage("file2.cpp", 47, ITestMessage.Level.Exception, EXCEPTION_CHECKPOINT_SUFFIX);
+		mockModelUpdater.addTestMessage("file2.cpp", 47, ITestMessage.Level.Exception,
+				EXCEPTION_CHECKPOINT_SUFFIX.trim());
 		mockModelUpdater.exitTestCase();
 		mockModelUpdater.exitTestSuite();
 	}
@@ -245,9 +246,9 @@ public void testSpacesInBeginAndEndOfMessage() {
 
 		mockModelUpdater.enterTestSuite("MainTS");
 		mockModelUpdater.enterTestCase("test");
-		mockModelUpdater.addTestMessage("file", 42, ITestMessage.Level.Warning, "  Custom warning   ");
+		mockModelUpdater.addTestMessage("file", 42, ITestMessage.Level.Warning, "Custom warning");
 		mockModelUpdater.addTestMessage("file2", 47, ITestMessage.Level.Exception,
-				"  Exception message  end   " + EXCEPTION_CHECKPOINT_SUFFIX);
+				"Exception message  end" + EXCEPTION_CHECKPOINT_SUFFIX);
 		mockModelUpdater.exitTestCase();
 		mockModelUpdater.exitTestSuite();
 	}