From abf1814aaf7daaac05f00ea34be94240080f7c1d Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Wed, 18 Dec 2024 11:26:33 +0100 Subject: [PATCH] Sskz: update swtbot test --- .../org/eclipse/set/swtbot/table/AbstractTableTest.java | 5 +++-- .../src/org/eclipse/set/swtbot/table/TestFailHandle.java | 2 +- .../test_res/table_reference/pphn/sskz_reference.csv | 7 ++----- 3 files changed, 6 insertions(+), 8 deletions(-) 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 1bbdcfd53..78058987f 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 @@ -49,8 +49,9 @@ protected static Stream providesPtTable() { public void beforeEach() throws Exception { super.beforeEach(); @SuppressWarnings("unchecked") - final List expandItems = bot.widgets(allOf( - widgetOfType(ExpandItem.class), withRegex("^.+ – Tabellen$"))); + final List expandItems = bot + .widgets(allOf(widgetOfType(ExpandItem.class), + withRegex("^.+ – (Zusatzt|T)abellen$"))); expandItems.forEach(item -> { final SWTBotExpandItem swtBotExpandItem = new SWTBotExpandItem( item); diff --git a/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/table/TestFailHandle.java b/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/table/TestFailHandle.java index 59e356c47..76d197240 100644 --- a/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/table/TestFailHandle.java +++ b/java/bundles/org.eclipse.set.swtbot/src/org/eclipse/set/swtbot/table/TestFailHandle.java @@ -76,7 +76,7 @@ protected void exportCurrentCSV(final TestFile testFile, }; final SWTBotNatTable nattableBot = SWTBotUtils .waitForNattable(AbstractSWTBotTest.bot, 30000); - nattableBot.click(4, 5); + nattableBot.click(0, 1); nattableBot.pressShortcut(SWT.MOD1, 'r'); AbstractSWTBotTest.bot.waitUntil(new DefaultCondition() { diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn/sskz_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn/sskz_reference.csv index 205a36343..004268780 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn/sskz_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn/sskz_reference.csv @@ -1,5 +1,2 @@ -Row;A;B;C;D;E;F;G;H;I;J;K;L;M;N -;Weiche/Kreuzung;Weiche/Kreuzung;Weiche/Kreuzung;Weiche/Kreuzung;Weiche/Kreuzung;Weiche/Kreuzung;Weiche/Kreuzung;Zulässige Geschwindigkeit​​​​​​​;Zulässige Geschwindigkeit​​​​​​​;Zulässige Geschwindigkeit​​​​​​​;Zulässige Geschwindigkeit​​​​​​​;Ansteuerung​​​​​​​​​​​;Ansteuerung​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​ -;Bezeichnung;Art​;Bauform​​;Standort​​​;Standort​​​;Länge​​​​​;Länge​​​​​;Weiche​​​​​​​;Weiche​​​​​​​;Kreuzung​​​​​​​​​;Kreuzung​​​​​​​​​;Ansteuerung​​​​​​​​​​​;Ansteuerung​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​ -;Bezeichnung;Art​;Bauform​​;Strecke​​​;km​​​​;Links​​​​​;Rechts​​​​​​;Links (KrW: A abzw.)​​​​​​​;Rechts (KrW: B abzw.)​​​​​​​​;Links​​​​​​​​​;Rechts​​​​​​​​​​;ESTW-Zentraleinheit​​​​​​​​​​​;Stellbereich​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​ -;;;;;;;;km/h;km/h;km/h;km/h;;; +Row;A;B;C;D;E;F +;Betrieblicher Bezeichner FEAx;Betrieblicher Bezeichner Feldelement;Technischer Bezeichner Object Controller;Türanschlag;Montage;Blattnummer