Merge branch 'master' of git@github.com:eclipse-rcptt/org.eclipse.rcptt.git

basilevs · basilevs · commit e211bc2c6c52 · 2026-03-19T20:03:15.000+04:00
diff --git a/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java b/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java
@@ -315,12 +315,12 @@ private void renderNode(InfoNode infoNode) {
 			// Out properties
 			if (list.size() != 0) {
 				for (NodeProperty nodeProperty : list) {
-					writer.println(nodeProperty.getName() + "=" + nodeProperty.getValue() + " <br>");
+					writer.println(escape(nodeProperty.getName()) + "=" + escape(nodeProperty.getValue()) + " <br>");
 				}
 			}
 			if (childs.size() != 0) {
 				for (InfoNode child : childs) {
-					writer.println(child.getName());
+					writer.println(escape(child.getName()));
 					renderNode(child);
 				}
 			}
diff --git a/launching/tests/org.eclipse.rcptt.reporting.html.tests/src/org/eclipse/rcptt/reporting/html/tests/FullSingleTestHtmlRendererTest.java b/launching/tests/org.eclipse.rcptt.reporting.html.tests/src/org/eclipse/rcptt/reporting/html/tests/FullSingleTestHtmlRendererTest.java
@@ -10,7 +10,10 @@
  *******************************************************************************/
 package org.eclipse.rcptt.reporting.html.tests;
 
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.stringContainsInOrder;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -28,6 +31,10 @@
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Screenshot;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Snaphot;
 import org.eclipse.rcptt.tesla.core.Q7WaitUtils;
+import org.eclipse.rcptt.tesla.core.info.AdvancedInformation;
+import org.eclipse.rcptt.tesla.core.info.InfoFactory;
+import org.eclipse.rcptt.tesla.core.info.InfoNode;
+import org.eclipse.rcptt.tesla.core.info.NodeProperty;
 import org.eclipse.rcptt.verifications.status.EVerificationStatus;
 import org.eclipse.rcptt.verifications.status.StatusFactory;
 import org.eclipse.rcptt.verifications.status.VerificationStatusData;
@@ -183,13 +190,47 @@ public void escapeExecutionStatus() {
 
 		String result = generate(report);
 		
-		assertThat(result, Matchers.stringContainsInOrder(
+		assertThat(result, stringContainsInOrder(
 				"Failure Reason",
 				"expected:&lt;wait 200\\n&gt; but was:&lt;wait 200&gt;",
 				"Details",  
 				"expected:&lt;wait 200\\n&gt; but was:&lt;wait 200&gt;"
 		));
 	}
+	
+	@Test
+	public void escapeSwtSnapshot() {
+		Report report = createReport("2", IStatus.ERROR);
+		Snaphot sn = ReportFactory.eINSTANCE.createSnaphot();
+		report.getRoot().getSnapshots().add(sn);
+		AdvancedInformation information = InfoFactory.eINSTANCE.createAdvancedInformation();
+		sn.setData(information);
+		InfoNode node = InfoFactory.eINSTANCE.createInfoNode();
+		information.getNodes().add(node);
+		node.setName("swt.info");
+		InfoNode node2 = InfoFactory.eINSTANCE.createInfoNode();
+		node.getChildren().add(node2);
+		node2.setName("Text(502<html><head><title>502 Bad Gateway...)");
+		NodeProperty property = InfoFactory.eINSTANCE.createNodeProperty();
+		node2.getProperties().add(property);
+		property.setName("<propertyName>");
+		property.setValue("<propertyValue>");
+		
+		String result = generate(report);
+		assertThat(result, stringContainsInOrder(
+				"Text",
+				"502",
+				"502 Bad Gateway..."
+				));
+		assertThat(result, not(containsString("502<")));
+		assertThat(result, not(containsString(">502")));
+		assertThat(result, containsString("502&lt;"));
+		assertThat(result, containsString("&gt;502"));
+		assertThat(result, not(containsString("<propertyName>")));
+		assertThat(result, not(containsString("<propertyValue>")));
+		assertThat(result, containsString("&lt;propertyName&gt;"));
+		assertThat(result, containsString("&lt;propertyValue&gt;"));
+	}
 
 	
 

Original file line number	Diff line number	Diff line change
`@@ -315,12 +315,12 @@ private void renderNode(InfoNode infoNode) {`
`315`	`315`	`// Out properties`
`316`	`316`	`if (list.size() != 0) {`
`317`	`317`	`for (NodeProperty nodeProperty : list) {`
`318`		`- writer.println(nodeProperty.getName() + "=" + nodeProperty.getValue() + " <br>");`
	`318`	`+ writer.println(escape(nodeProperty.getName()) + "=" + escape(nodeProperty.getValue()) + " <br>");`
`319`	`319`	`}`
`320`	`320`	`}`
`321`	`321`	`if (childs.size() != 0) {`
`322`	`322`	`for (InfoNode child : childs) {`
`323`		`- writer.println(child.getName());`
	`323`	`+ writer.println(escape(child.getName()));`
`324`	`324`	`renderNode(child);`
`325`	`325`	`}`
`326`	`326`	`}`