From 4ba2980f77ef7f4cfced577476914b3575382dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Dinis=20Ferreira?= Date: Sat, 20 Sep 2025 00:38:10 +0200 Subject: [PATCH 1/2] fix: fix Check UI tests chore: bump PMD to v7.17.0 in GitHub actions --- .../tools/ddk/check/ui/test/CheckCatalogWizardTest.java | 1 + .../avaloq/tools/ddk/test/ui/swtbot/SwtWorkbenchBot.java | 1 + .../tools/ddk/test/ui/swtbot/util/SwtBotWizardUtil.java | 8 ++++++++ ddk-target/ddk.target | 3 ++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java index 06fef0015c..5f2a92d35a 100644 --- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java +++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java @@ -54,6 +54,7 @@ */ @InjectWith(CheckWizardUiTestInjectorProvider.class) @RunWith(XtextClassRunner.class) +@SuppressWarnings("nls") public class CheckCatalogWizardTest { /** This is the name of the catalog wizard. It's the name SWTBot uses to look up the wizard. */ diff --git a/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/SwtWorkbenchBot.java b/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/SwtWorkbenchBot.java index d66bc846b8..050bd0bd62 100644 --- a/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/SwtWorkbenchBot.java +++ b/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/SwtWorkbenchBot.java @@ -55,6 +55,7 @@ /** * Extended {@link SWTWorkbenchBot}. */ +@SuppressWarnings("nls") public class SwtWorkbenchBot extends SWTWorkbenchBot { private static final int DELAY_WIZARD_PAGE = 1000; private static final String TIMEOUT_MSG = "Timeout of {0} ms reached while waiting for Button {1} to become active"; diff --git a/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/util/SwtBotWizardUtil.java b/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/util/SwtBotWizardUtil.java index e0e11cdf21..5b2f0ca124 100644 --- a/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/util/SwtBotWizardUtil.java +++ b/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/util/SwtBotWizardUtil.java @@ -26,6 +26,7 @@ /** * Utility class for selection methods in an eclipse widget for SWTBot testing. */ +@SuppressWarnings("nls") public final class SwtBotWizardUtil { private SwtBotWizardUtil() { @@ -41,6 +42,13 @@ private SwtBotWizardUtil() { * the folder name */ public static void selectProjectFolder(final SwtWorkbenchBot bot, final String folderName) { + // try { + // bot.viewById("org.eclipse.jdt.ui.PackageExplorer"); + // } catch (WidgetNotFoundException e) { + // // If view not found, open it via menu + // bot.menu("Window").menu("Show View").menu("Package Explorer").click(); + // } + // SWTBotView packageExplorer = bot.viewById("org.eclipse.jdt.ui.PackageExplorer"); SWTBotView packageExplorer = bot.viewByTitle("Project Explorer"); packageExplorer.show(); Composite comp = (Composite) packageExplorer.getWidget(); diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target index ed6ac298aa..12d0856615 100644 --- a/ddk-target/ddk.target +++ b/ddk-target/ddk.target @@ -1,6 +1,6 @@ - + @@ -14,6 +14,7 @@ + From 3826669a1f0c75b043bd6d9fa226a34e55297cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Dinis=20Ferreira?= Date: Fri, 19 Sep 2025 20:46:38 +0200 Subject: [PATCH 2/2] chore: bump PMD to v7.17.0 in GitHub actions --- .github/workflows/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 9e4f392b5d..bd2b216ff9 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -13,7 +13,7 @@ jobs: uses: pmd/pmd-github-action@v2.0.0 id: pmd with: - version: '7.15.0' + version: '7.17.0' rulesets: 'ddk-configuration/pmd/ruleset.xml' analyzeModifiedFilesOnly: false - name: Fail build if there are violations