From a79c438f67b0939fab3d5f00e819c937dc7c4b94 Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Wed, 19 Aug 2026 10:43:44 +0200 Subject: [PATCH 1/2] Update validation csv export --- .../OSGI-INF/l10n/bundle.properties | 2 +- .../set/feature/validation/Messages.java | 2 +- .../table/ValidationTableColumns.xtend | 5 +-- .../validation/table/ValidationTableView.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../org/eclipse/set/swtbot/PlaZModelTest.java | 12 +++++- .../set/swtbot/ValidationViewTest.java | 42 +++++++++++-------- .../set/swtbot/table/AbstractTableTest.java | 11 ++++- .../validation_view_reference.csv | 2 +- 9 files changed, 53 insertions(+), 29 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.validation/OSGI-INF/l10n/bundle.properties b/java/bundles/org.eclipse.set.feature.validation/OSGI-INF/l10n/bundle.properties index ff45bff53a..bae49ee701 100644 --- a/java/bundles/org.eclipse.set.feature.validation/OSGI-INF/l10n/bundle.properties +++ b/java/bundles/org.eclipse.set.feature.validation/OSGI-INF/l10n/bundle.properties @@ -43,7 +43,7 @@ ValidationTableColumns_Severity=Schweregrad ValidationTableColumns_ProblemType=Problemart ValidationTableColumns_LineNumber=Zeilennummer ValidationTableColumns_ObjectType=Objektart -ValidationTableColumns_ObjectDesignation=Objectbezeichnung +ValidationTableColumns_ObjectDesignation=Objektbezeichnung ValidationTableColumns_AttributeGroup=Attribut/-gruppe ValidationTableColumns_ObjectScope=Bereich ValidationTableColumns_ObjectState=Zustand diff --git a/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/Messages.java b/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/Messages.java index 311ad377ea..bde18c0a62 100644 --- a/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/Messages.java +++ b/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/Messages.java @@ -197,7 +197,7 @@ public class Messages { public String ValidationTableColumns_ObjectType; /** - * Objectbezeichnung + * Objektbezeichnung */ public String ValidationTableColumns_ObjectDesignation; diff --git a/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/table/ValidationTableColumns.xtend b/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/table/ValidationTableColumns.xtend index cf8be2a2f6..d421b73ed9 100644 --- a/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/table/ValidationTableColumns.xtend +++ b/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/table/ValidationTableColumns.xtend @@ -41,9 +41,8 @@ class ValidationTableColumns extends AbstractColumns { ProblemType = createNew(messages.ValidationTableColumns_ProblemType) LineNumber = createNew(messages.ValidationTableColumns_LineNumber) ObjectType = createNew(messages.ValidationTableColumns_ObjectType) - AttributeGroup = createNew( - messages.ValidationTableColumns_AttributeGroup) - ObjectDesignation = createNew(messages.ValidationTableColumns_ObjectDesignation) + AttributeGroup = createNew(messages.ValidationTableColumns_AttributeGroup) + ObjectDesignation = createNew(messages.ValidationTableColumns_ObjectDesignation) ObjectScope = createNew(messages.ValidationTableColumns_ObjectScope) ObjectState = createNew(messages.ValidationTableColumns_ObjectState) Message = createNew(messages.ValidationTableColumns_Message) diff --git a/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/table/ValidationTableView.java b/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/table/ValidationTableView.java index b876656537..4a6f709d63 100644 --- a/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/table/ValidationTableView.java +++ b/java/bundles/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/table/ValidationTableView.java @@ -39,7 +39,7 @@ public class ValidationTableView extends AbstractTreeLayerTable { Validierung: %s Werkzeugkofferversion: %s - "Lfd. Nr.";"Schweregrad";"Problemart";"Zeilennummer";"Objektart";"Attribut/-gruppe";"Bereich";"Zustand";"Meldung" + "Lfd. Nr.";"Schweregrad";"Problemart";"Zeilennummer";"Objektart";"Objekbezeichnung";"Attribut/-gruppe";"Bereich";"Zustand";"Meldung" """; private final Messages messages; private final BasePart part; diff --git a/java/bundles/org.eclipse.set.swtbot/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.swtbot/META-INF/MANIFEST.MF index 126539e258..7cccc78020 100644 --- a/java/bundles/org.eclipse.set.swtbot/META-INF/MANIFEST.MF +++ b/java/bundles/org.eclipse.set.swtbot/META-INF/MANIFEST.MF @@ -26,7 +26,9 @@ Require-Bundle: org.eclipse.swt, junit-jupiter-api, junit-jupiter-params, org.junit -Import-Package: jakarta.inject, +Import-Package: com.google.common.escape, + com.google.common.html, + jakarta.inject, org.eclipse.e4.core.di, org.eclipse.e4.ui.di, org.eclipse.nebula.widgets.nattable, diff --git a/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/PlaZModelTest.java b/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/PlaZModelTest.java index 6dc92dc547..c51be3ac0f 100644 --- a/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/PlaZModelTest.java +++ b/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/PlaZModelTest.java @@ -8,7 +8,7 @@ */ package org.eclipse.set.swtbot; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; @@ -18,6 +18,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import com.google.common.html.HtmlEscapers; + /** * Test for changes in PlaZ Model */ @@ -59,7 +61,13 @@ protected void compareValue(final ILayer nattableLayer, final int startRow, .get(columnIndex) .replaceAll(CELL_VALUE_REPLACE_REGEX, "") .replaceAll(ZERO_WIDTH_SPACE, ""); - assertEquals(referenceValue, cellValue); + final String toHtmlString = HtmlEscapers.htmlEscaper() + .escape(referenceValue); + assertTrue( + referenceValue.equals(cellValue) + || toHtmlString.equals(cellValue), + getErrorMessage(columnIndex, rowIndex, referenceValue, + toHtmlString)); } } } diff --git a/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/ValidationViewTest.java b/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/ValidationViewTest.java index 2beb638fc6..1af114a281 100644 --- a/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/ValidationViewTest.java +++ b/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/ValidationViewTest.java @@ -38,6 +38,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtensionContext; +import com.google.common.html.HtmlEscapers; + /** * Test for changes in Validation View * @@ -45,20 +47,6 @@ */ @TestInstance(Lifecycle.PER_CLASS) public class ValidationViewTest extends AbstractTableTest { - static List> widgetItems = Arrays - .> asList(new Pair<>("Geladene Datei", "MD5"), - new Pair<>("Geladene Datei", "GUID"), - new Pair<>("Verwendetes XML-Schema (in Datei)", "PlanPro"), - new Pair<>("Verwendetes XML-Schema (in Datei)", - "Signalbegriffe"), - new Pair<>("Unterstütztes XML-Schema", "PlanPro"), - new Pair<>("Unterstütztes XML-Schema", "Signalbegriffe"), - new Pair<>("Gültigkeit", "XSD-Gültigkeit"), - new Pair<>("Gültigkeit", "EMF-Gültigkeit"), - new Pair<>("Gültigkeit", "Verarbeitbar"), - new Pair<>("PlanPro-Container", "Enthalten"), - new Pair<>("Untergewerke", "Enthalten")); - private static class ValidationViewFailHandle extends TestFailHandle { String csvHeader = "\"Item Group\";\"Item label\";\"Expect Value\"" + System.lineSeparator(); @@ -104,10 +92,22 @@ private void exportWidgeValue(final ValidationViewTest testInstance) { } protected static final String RICHTEXT_REPLACE_REGEX = "<[^>]+>"; + protected static final String VALIDATION_INFORMATION_CSV = "validation_information"; protected static final String VALIDATION_TABLE_NAME = "validation_view"; - - private String tableName = VALIDATION_TABLE_NAME; + static List> widgetItems = Arrays + .> asList(new Pair<>("Geladene Datei", "MD5"), + new Pair<>("Geladene Datei", "GUID"), + new Pair<>("Verwendetes XML-Schema (in Datei)", "PlanPro"), + new Pair<>("Verwendetes XML-Schema (in Datei)", + "Signalbegriffe"), + new Pair<>("Unterstütztes XML-Schema", "PlanPro"), + new Pair<>("Unterstütztes XML-Schema", "Signalbegriffe"), + new Pair<>("Gültigkeit", "XSD-Gültigkeit"), + new Pair<>("Gültigkeit", "EMF-Gültigkeit"), + new Pair<>("Gültigkeit", "Verarbeitbar"), + new Pair<>("PlanPro-Container", "Enthalten"), + new Pair<>("Untergewerke", "Enthalten")); private static List splitString(final String text, final String regex) { @@ -115,6 +115,8 @@ private static List splitString(final String text, return asList.stream().map(e -> e.replaceAll(" ", "")).toList(); } + private String tableName = VALIDATION_TABLE_NAME; + protected List informationReference; @BeforeEach @@ -148,7 +150,13 @@ protected void compareValue(final ILayer nattableLayer, final int startRow, .get(columnIndex) .replaceAll(CELL_VALUE_REPLACE_REGEX, "") .replaceAll(ZERO_WIDTH_SPACE, ""); - assertEquals(referenceValue, cellValue); + final String toHtmlString = HtmlEscapers.htmlEscaper() + .escape(referenceValue); + assertTrue( + referenceValue.equals(cellValue) + || toHtmlString.equals(cellValue), + getErrorMessage(columnIndex, rowIndex, referenceValue, + toHtmlString)); } } } diff --git a/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/table/AbstractTableTest.java b/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/table/AbstractTableTest.java index 2ae60b665a..e19738e9c9 100644 --- a/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/table/AbstractTableTest.java +++ b/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/table/AbstractTableTest.java @@ -27,6 +27,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.provider.Arguments; +import com.google.common.html.HtmlEscapers; + /** * Abstract class for table test * @@ -90,8 +92,13 @@ protected void compareValue(final ILayer nattableLayer, final int startRow, // richtext // value .replace("\"\"", "\""); - assertEquals(referenceValue, cellValue, getErrorMessage( - columnIndex, rowIndex, referenceValue, cellValue)); + final String toHtmlString = HtmlEscapers.htmlEscaper() + .escape(referenceValue); + assertTrue( + referenceValue.equals(cellValue) + || toHtmlString.equals(cellValue), + getErrorMessage(columnIndex, rowIndex, referenceValue, + toHtmlString)); } } } diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/validation_view_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/validation_view_reference.csv index 50a60ddb95..191722c9de 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/validation_view_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/validation_view_reference.csv @@ -3,7 +3,7 @@ Datei: validation_view_current.csv Validierung: 2026-08-18 12:00:05 Werkzeugkofferversion: ${application-version} -"Lfd. Nr.";"Schweregrad";"Problemart";"Zeilennummer";"Objektart";"Attribut/-gruppe";"Bereich";"Zustand";"Meldung" +"Lfd. Nr.";"Schweregrad";"Problemart";"Zeilennummer";"Objektart";"Objekbezeichnung";"Attribut/-gruppe";"Bereich";"Zustand";"Meldung" "1";"Warnung";"Fachliche Vollständigkeit";"533";"Aussenelementansteuerung";"ESTW-A P-Hausen";"Datum_Regelwerk";"Planung";"Start";"Die nach Datenmodell erforderliche Angabe ist nicht vorhanden." "2";"Warnung";"Fachliche Vollständigkeit";"610";"Aussenelementansteuerung";"P-Hausen Achszählrechner";"Datum_Regelwerk";"Planung";"Start";"Die nach Datenmodell erforderliche Angabe ist nicht vorhanden." "3";"Warnung";"Fachliche Vollständigkeit";"647";"Aussenelementansteuerung";"ESTW-A Linksdorf";"Datum_Regelwerk";"Planung";"Start";"Die nach Datenmodell erforderliche Angabe ist nicht vorhanden." From e3021de016a6e0eec7579c274633d021b8b667df Mon Sep 17 00:00:00 2001 From: eclipse-set-bot Date: Wed, 19 Aug 2026 11:36:37 +0000 Subject: [PATCH 2/2] Update table reference --- .../table_reference/pphn_1_10_0_3/validation_view_reference.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/validation_view_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/validation_view_reference.csv index 191722c9de..5f46a76c0b 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/validation_view_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/validation_view_reference.csv @@ -1,6 +1,6 @@ Validierungsmeldungen Datei: validation_view_current.csv -Validierung: 2026-08-18 12:00:05 +Validierung: 2026-08-19 08:59:33 Werkzeugkofferversion: ${application-version} "Lfd. Nr.";"Schweregrad";"Problemart";"Zeilennummer";"Objektart";"Objekbezeichnung";"Attribut/-gruppe";"Bereich";"Zustand";"Meldung"