From 18f53afb91b12ad54764dd0dce828a5ff0eae68c Mon Sep 17 00:00:00 2001 From: delchev Date: Thu, 13 Aug 2026 20:17:16 +0300 Subject: [PATCH] perf(tests): the sample projects publish once per family, not once per sample The 14 sample-project ITs were the same journey 14 times - clone a dirigiblelabs/* repo through the Git perspective, publishAll, verify - each paying its own Dirigible boot, Chrome session and publish cycle (1088s on the h2 leg, the biggest remaining block in the samples shard). SampleProjectsIT now clones a FAMILY of repos into one workspace, publishes once, and lets each subclass verify one sample per @Test under AFTER_CLASS: TypeScriptSampleProjectsIT (8 samples) and JavaSampleProjectsIT (5 samples) replace 13 classes, so 13 boots become 2. SampleLibraryLocalNativeAppIT moves onto the new base but keeps its own instance - it spawns a real OS process. Every assertion is carried over unchanged. Two families rather than one class because sample-entity-decorators and sample-java-entity-decorators both own the SAMPLE_COUNTRY table and both CSVIM-seed it; the split keeps them in separate instances and needs no change to any sample repo. The preflight for the Java family came back clean - all 17 client classes sit in distinct demo.* packages with distinct simple names, so the shared javac batch and bean container have nothing to collide on. The one-time publish is a guarded @BeforeEach, not a @BeforeAll on a @TestInstance(PER_CLASS) class: PER_CLASS autowires the instance - booting the platform - before @BeforeAll runs, so IntegrationTest's cleaner then deleted the Dirigible folder under the running instance and the next sync pass reaped the platform's own registry (Definition deleted: /shell-ide/extensions/shell.extension), leaving the IDE with no perspectives. The guard is keyed by class, not a boolean: the field is shared by every subclass, and a flag would let the second family skip its own publish. Part of #6710. --- CLAUDE.md | 10 +- CLAUDE_FEATURES.md | 2 +- components/engine/engine-intent/CLAUDE.md | 2 +- components/engine/engine-java/CLAUDE.md | 8 +- .../engine/engine-native-apps/CLAUDE.md | 2 +- .../framework/util/SynchronizationUtil.java | 2 +- .../tests/ui/tests/IntentEditorLoadsIT.java | 2 +- .../ComponentDecoratorSampleProjectIT.java | 33 -- .../EntityDecoratorsSampleProjectIT.java | 93 ----- .../ExtensionDecoratorSampleProjectIT.java | 35 -- .../JavaEntityDecoratorsSampleProjectIT.java | 72 ---- ...JavaExtensionDecoratorSampleProjectIT.java | 48 --- .../JavaJobDecoratorSampleProjectIT.java | 99 ----- .../JavaListenerDecoratorSampleProjectIT.java | 58 --- .../ui/tests/sample/JavaSampleProjectsIT.java | 229 +++++++++++ ...JavaWebsocketDecoratorSampleProjectIT.java | 37 -- .../sample/JobDecoratorSampleProjectIT.java | 42 -- .../ListenerDecoratorSampleProjectIT.java | 44 -- .../sample/RolesDecoratorSampleProjectIT.java | 80 ---- .../sample/SampleLibraryLocalNativeAppIT.java | 24 +- .../sample/SampleProjectRepositoryIT.java | 63 --- .../ui/tests/sample/SampleProjectsIT.java | 114 ++++++ .../tests/sample/StoreAPISampleProjectIT.java | 171 -------- .../sample/TypeScriptSampleProjectsIT.java | 383 ++++++++++++++++++ .../WebsocketDecoratorSampleProjectIT.java | 52 --- 25 files changed, 759 insertions(+), 946 deletions(-) delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ComponentDecoratorSampleProjectIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/EntityDecoratorsSampleProjectIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ExtensionDecoratorSampleProjectIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaEntityDecoratorsSampleProjectIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaExtensionDecoratorSampleProjectIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaJobDecoratorSampleProjectIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaListenerDecoratorSampleProjectIT.java create mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaSampleProjectsIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaWebsocketDecoratorSampleProjectIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JobDecoratorSampleProjectIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ListenerDecoratorSampleProjectIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/RolesDecoratorSampleProjectIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleProjectRepositoryIT.java create mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleProjectsIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/StoreAPISampleProjectIT.java create mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/TypeScriptSampleProjectsIT.java delete mode 100644 tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/WebsocketDecoratorSampleProjectIT.java diff --git a/CLAUDE.md b/CLAUDE.md index aa755a348b9..7c4fc2c57b8 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -367,9 +367,9 @@ Do **not** widen by reintroducing wildcards or a config-driven allow-list — th - **Synchronizer artefact locations are registry-relative; `IRepository` paths are repository-absolute.** `SynchronizationWalker` strips the registry folder, so an artefact's `location` looks like `/myproject/file.ext` — but to read or write that file through `IRepository` you must prepend `IRepositoryStructure.PATH_REGISTRY_PUBLIC`. Code that confuses the two writes outside `/registry/public`, where no synchronizer, IT assertion, or Registry view will ever see the output (engine-intent shipped this bug once — see its CLAUDE.md "wrong turns"). The same convention shows up in `SynchronizationProcessor`'s cleanup pass and `CsvimProcessor.getCsvResource`. - **`JsonHelper`/`GsonHelper` exclude fields without `@Expose` — and pretty-print.** Their Gson is built with `excludeFieldsWithoutExposeAnnotation()`, so `fromJson` into a POJO whose fields lack `@Expose` silently produces an all-null object (no exception — engine-intent's parser "worked" while generating nothing). Map-shaped data is unaffected (maps aren't field-reflected). For POJO mapping either annotate every field or use a private plain `Gson`; when asserting generated JSON content in tests remember the output is pretty-printed (`"key": "value"` with a space). - **Stale H2 files break IT runs after a killed JVM.** The file-backed H2 under `tests/tests-integrations/target/dirigible` survives a killed test run and the next context fails to load with `missing artefact with name: [DefaultDB]` or `Table ... not found (this database is empty)` cascades. `rm -rf tests/tests-integrations/target/dirigible` before re-running locally. -- **Sample-project tests live in `tests/ui/tests/sample/`** — each extends `SampleProjectRepositoryIT` and overrides `getRepositoryURL()` + `verifyProject()`. `SampleProjectRepositoryIT` clones the repo through the IDE Git perspective, calls `Workbench.publishAll(true)`, and runs `forceProcessSynchronizers()` before delegating to `verifyProject()`. UI-based (Selenide → Chrome), slower than HTTP-only ITs. Inventory of sample repos under `dirigiblelabs/*`: `sample-entity-decorators`, `sample-java-entity-decorators`, `sample-roles-decorator`, `sample-job-decorator`, `sample-listener-decorator`, `sample-extension-decorator`, `sample-component-decorator`, `sample-websocket-decorator`, `sample-store-api`, `sample-intent-model`. When adding a new sample-project IT, drop the project in its own `dirigiblelabs/*` repo first, then reference the clone URL from the test. `IntentEditorLoadsIT` is not a `SampleProjectRepositoryIT` subclass (the intent generates in the workspace, not on publish) but uses the same clone-a-real-repo pattern: it clones `dirigiblelabs/sample-intent-model`, opens its `app.intent`, and drives the editor's Generate. +- **Sample-project tests live in `tests/ui/tests/sample/` and come in FAMILIES, not one class per sample.** `SampleProjectsIT` clones a *list* of `dirigiblelabs/*` repos through the IDE Git perspective, calls `Workbench.publishAll(true)` once, runs `forceProcessSynchronizers()` + `waitForStableSynchronization()`, and does all of that in a single `@BeforeAll` under `@TestInstance(PER_CLASS)` + `@DirtiesContext(AFTER_CLASS)`; each subclass then verifies one sample per `@Test`. UI-based (Selenide → Chrome), slower than HTTP-only ITs — which is exactly why the boot, the browser and the publish cycle are shared. Three subclasses: `TypeScriptSampleProjectsIT` (the TS/JS decorator samples), `JavaSampleProjectsIT` (the client-Java samples) and `SampleLibraryLocalNativeAppIT` (alone, because it spawns a real OS process). **The family split is a runtime constraint, not taste:** `sample-entity-decorators` and `sample-java-entity-decorators` both own the `SAMPLE_COUNTRY` table and both CSVIM-seed it, so they cannot be published into the same instance. Before adding a sample to a family, check it against the family for a table/route/queue/websocket-endpoint/Java-FQN collision (the whole family shares one `javac` batch and one `ClientClassLoader`), and keep the verification order-independent — the methods run against one live instance. When adding a new sample, drop the project in its own `dirigiblelabs/*` repo first, then add its URL to a family's `getRepositoryUrls()`. Inventory of sample repos under `dirigiblelabs/*`: `sample-entity-decorators`, `sample-java-entity-decorators`, `sample-roles-decorator`, `sample-job-decorator`, `sample-listener-decorator`, `sample-extension-decorator`, `sample-component-decorator`, `sample-websocket-decorator`, `sample-store-api`, `sample-intent-model`. `IntentEditorLoadsIT` is not a `SampleProjectsIT` subclass (the intent generates in the workspace, not on publish) but uses the same clone-a-real-repo pattern: it clones `dirigiblelabs/sample-intent-model`, opens its `app.intent`, and drives the editor's Generate. - **Spring Boot 4 strips `ResponseStatusException.getReason()`** from the default JSON error body even with `server.error.include-message=always` in `application-common.properties`. Status code reaches the client correctly; the reason text doesn't. ITs asserting 404 must check `statusCode` only, not body content (`JavaEngineIT.delete_unregisters_handler` and `compile_error_keeps_endpoint_unregistered` learned this the hard way — see commit `f13c8c219e`). -- **The client-Java effort is split across three repositories.** The platform code (engine-java, data-store-java, IT) ships in this repo via PR [#5923](https://github.com/eclipse-dirigible/dirigible/pull/5923). The sample project that `JavaEntityDecoratorsSampleProjectIT` clones lives in [`dirigiblelabs/sample-java-entity-decorators`](https://github.com/dirigiblelabs/sample-java-entity-decorators) (initial content from PR [#1](https://github.com/dirigiblelabs/sample-java-entity-decorators/pull/1)). The announcement blog "Return of the Java – Decorators Awaken in Eclipse Dirigible" (sister piece to the December 2025 TS decorators post) goes through the docs portal in PR [`dirigible-io/dirigible-io.github.io#123`](https://github.com/dirigible-io/dirigible-io.github.io/pull/123). Follow-up Java-runtime features generally touch the same three places. +- **The client-Java effort is split across three repositories.** The platform code (engine-java, data-store-java, IT) ships in this repo via PR [#5923](https://github.com/eclipse-dirigible/dirigible/pull/5923). The sample project that `JavaSampleProjectsIT` clones lives in [`dirigiblelabs/sample-java-entity-decorators`](https://github.com/dirigiblelabs/sample-java-entity-decorators) (initial content from PR [#1](https://github.com/dirigiblelabs/sample-java-entity-decorators/pull/1)). The announcement blog "Return of the Java – Decorators Awaken in Eclipse Dirigible" (sister piece to the December 2025 TS decorators post) goes through the docs portal in PR [`dirigible-io/dirigible-io.github.io#123`](https://github.com/dirigible-io/dirigible-io.github.io/pull/123). Follow-up Java-runtime features generally touch the same three places. ## Browser UI — BlimpKit gotchas @@ -459,7 +459,7 @@ The user-facing help portal at documents the ID The portal is **a separate repository** — MkDocs-built from (Markdown sources under `docs-help/docs/`, nav in `docs-help/mkdocs.yml`). Doc fixes go there as PRs, not in this repo. Blog posts (`docs-blogs/docs/YYYY/MM/DD/*.md`) need three coordinated updates per post: the markdown source, `docs/blogs.json` (CI normally regenerates from the last 5 dated `.md` files via `.github/folders.sh`, but a manual edit lights the home page up immediately), and `docs-blogs/mkdocs.yml` nav (year heading + per-post entry). The `docs/` tree is otherwise CI-generated — see the repo's own `CLAUDE.md` and don't hand-edit it for routine changes; `ci skip` in a commit message *suppresses* the regeneration job. -The companion sample repos under `dirigiblelabs/*` are also separate. For end-to-end tests that clone such repos (`SampleProjectRepositoryIT` subclasses), the merge order follows the dependency direction, both ways: a dirigible-side IT that expects new sample content needs the sample-side PR merged first (else it clones an empty `master`), and a sample-side change that uses new platform APIs needs the platform PR merged first — the ITs clone the sample repo's HEAD, so merging the sample early breaks **every** PR's CI and master until the platform lands (this happened with the typed-handler interfaces: sample PR merged a day before platform PR [#6010](https://github.com/eclipse-dirigible/dirigible/pull/6010), and `JavaEntityDecoratorsSampleProjectIT` failed across the board until #6010 merged). Re-running a failed PR check does NOT pick up a newer master — re-runs build the original merge snapshot; use `gh pr update-branch` (or push) to get a fresh merge. +The companion sample repos under `dirigiblelabs/*` are also separate. For end-to-end tests that clone such repos (`SampleProjectsIT` subclasses), the merge order follows the dependency direction, both ways: a dirigible-side IT that expects new sample content needs the sample-side PR merged first (else it clones an empty `master`), and a sample-side change that uses new platform APIs needs the platform PR merged first — the ITs clone the sample repo's HEAD, so merging the sample early breaks **every** PR's CI and master until the platform lands (this happened with the typed-handler interfaces: sample PR merged a day before platform PR [#6010](https://github.com/eclipse-dirigible/dirigible/pull/6010), and the Java entity-decorators verification failed across the board until #6010 merged). Re-running a failed PR check does NOT pick up a newer master — re-runs build the original merge snapshot; use `gh pr update-branch` (or push) to get a fresh merge. Treat `modules/commons/commons-config/src/main/java/org/eclipse/dirigible/commons/config/DirigibleConfig.java` (the enum) and `Configuration.java` (the allow-list) as the source of truth for env-var names and defaults, not the portal — the env-vars page lags the code by months. Specifically, the in-repo OAuth flow is Spring's `spring.security.oauth2.client.registration.github.*` activated by the `github` profile and configured via `DIRIGIBLE_GITHUB_CLIENT_ID` / `_CLIENT_SECRET` / `_SCOPE` (`build/application/src/main/resources/application-github.properties`), not the generic `DIRIGIBLE_OAUTH_*` entries some doc pages still describe. Current servlet mappings are rooted at `/services/...` and `/public/...` per `BaseEndpoint`; any `/services/v4/...` URL in a doc snippet is legacy. @@ -480,9 +480,9 @@ The full Selenide UI suite takes ~1.5h per DB, so it does **not** run on every P - **`nightly.yml`** (cron `0 2 * * *` + `workflow_dispatch`) and **push to master** (`build.yml`) run the **full** suite on H2 + PostgreSQL. **Test tagging convention (JUnit 5 `@Tag`, wired to failsafe via the `${it.groups}` / `${it.excludedGroups}` properties in the root `pom.xml`):** -- Every browser-driven IT is `@Tag("ui")` - inherited from the `UserInterfaceIntegrationTest` base (and thus by `SampleProjectRepositoryIT` and all sample-project ITs). Do not tag these individually. +- Every browser-driven IT is `@Tag("ui")` - inherited from the `UserInterfaceIntegrationTest` base (and thus by `SampleProjectsIT` and all sample-project ITs). Do not tag these individually. - HTTP-level ITs (`extends IntegrationTest` directly) carry no tag, so they are always in the smoke set. - To force a specific UI IT to run on every PR, add `@Tag("smoke")` to that class (keep the list small - smoke must stay fast). -- Shard-routing tags: `@Tag("sample")` sits on the `SampleProjectRepositoryIT` base (inherited by every sample-project IT); `@Tag("camel")` sits on each IT in `ui/tests/camel` (their `PredefinedProjectIT` base is shared with non-camel tests, so the base cannot carry it — tag new camel ITs individually). These route classes into the `samples` CI shard; everything else UI stays in the `ui` shard. +- Shard-routing tags: `@Tag("sample")` sits on the `SampleProjectsIT` base (inherited by every sample-project IT); `@Tag("camel")` sits on each IT in `ui/tests/camel` (their `PredefinedProjectIT` base is shared with non-camel tests, so the base cannot carry it — tag new camel ITs individually). These route classes into the `samples` CI shard; everything else UI stays in the `ui` shard. `codeql.yml`, `release.yml` cover CodeQL and Maven Central release respectively. diff --git a/CLAUDE_FEATURES.md b/CLAUDE_FEATURES.md index 103434788e4..597784ed1f4 100644 --- a/CLAUDE_FEATURES.md +++ b/CLAUDE_FEATURES.md @@ -680,7 +680,7 @@ native-image -jar build/application/target/dirigible-application-*-executable.ja ### 10.6 Tests - `tests/tests-framework/` — Selenide / Spring test base classes. - `tests/tests-integrations/` — `*IT.java` Selenide-driven UI integration tests with per-test fixture projects under `src/main/resources//`. -- `tests/ui/tests/sample/` — `SampleProjectRepositoryIT` subclasses that clone `dirigiblelabs/sample-*` repos, publish them, and call `verifyProject()`. +- `tests/ui/tests/sample/` — `SampleProjectsIT` subclasses that clone a family of `dirigiblelabs/sample-*` repos into one workspace, publish them together, and verify one sample per `@Test`. - HTTP-only ITs (faster, headless) extend `IntegrationTest` and call `SynchronizationProcessor.forceProcessSynchronizers()` directly — see `JavaEngineIT`. - Surefire (`*Test.java`) = unit. Failsafe (`*IT.java`) = integration. Naming matters. - `-D selenide.headless=true` is the headless flag. diff --git a/components/engine/engine-intent/CLAUDE.md b/components/engine/engine-intent/CLAUDE.md index b54fd0c153c..f3861eaed9d 100644 --- a/components/engine/engine-intent/CLAUDE.md +++ b/components/engine/engine-intent/CLAUDE.md @@ -201,7 +201,7 @@ heading, because VitePress collapses an em dash to ONE hyphen (`#stage-what-a-st GitHub's markdown keeps TWO (`#stage--what-a-status-means…`), so the same heading needs a different link in each repo. -`IntentEditorLoadsIT` **clones [`dirigiblelabs/sample-intent-model`](https://github.com/dirigiblelabs/sample-intent-model)** (the library intent sample - same clone-a-real-repo pattern as the `SampleProjectRepositoryIT` subclasses; it replaced the old local `IntentEditorIT` fixture so the published sample stays the single source of truth), opens its `app.intent`, then asserts the mxGraph diagram renders (`.intent-diagram svg` is visible) **and** that the parsed `Book` entity's label appears inside `.intent-diagram` - so it fails on an empty or broken diagram, unlike the old "any `` exists" check that a Mermaid error bomb satisfied. It does not separately exercise a theme switch because the fixed-colour palette renders identically in both themes. Editing the sample's entities/process means the sample repo must change too (the IT clones its HEAD). `IntentEngineIT` stays self-contained (inline YAML) for fast, network-free coverage. +`IntentEditorLoadsIT` **clones [`dirigiblelabs/sample-intent-model`](https://github.com/dirigiblelabs/sample-intent-model)** (the library intent sample - same clone-a-real-repo pattern as the `SampleProjectsIT` subclasses; it replaced the old local `IntentEditorIT` fixture so the published sample stays the single source of truth), opens its `app.intent`, then asserts the mxGraph diagram renders (`.intent-diagram svg` is visible) **and** that the parsed `Book` entity's label appears inside `.intent-diagram` - so it fails on an empty or broken diagram, unlike the old "any `` exists" check that a Mermaid error bomb satisfied. It does not separately exercise a theme switch because the fixed-colour palette renders identically in both themes. Editing the sample's entities/process means the sample repo must change too (the IT clones its HEAD). `IntentEngineIT` stays self-contained (inline YAML) for fast, network-free coverage. ### General build/serve gotcha (applies to all UI modules) diff --git a/components/engine/engine-java/CLAUDE.md b/components/engine/engine-java/CLAUDE.md index c8c2d1f7821..179360b0d24 100644 --- a/components/engine/engine-java/CLAUDE.md +++ b/components/engine/engine-java/CLAUDE.md @@ -189,9 +189,9 @@ browser-IDE developer sees what's wrong without reading the server log. - Platform: this repo, PR #6051. - Samples: `dirigiblelabs/sample-java-{entity,listener,job,websocket,extension}-decorator` — each shows the - styles above; the entity sample is the kitchen-sink. The `Java*DecoratorsSampleProjectIT` / - `Java*DecoratorSampleProjectIT` clone these repos' HEAD, so **merge order is load-bearing**: the - platform PR merges first; the sample-clone ITs are temporarily `@Disabled` until the sample PRs land - (the samples' old API doesn't compile against the new engine). Re-enable them after. + styles above; the entity sample is the kitchen-sink. `JavaSampleProjectsIT` clones all five repos' + HEAD into one workspace and publishes them together, so **merge order is load-bearing**: the + platform PR merges first; that IT is temporarily `@Disabled` until the sample PRs land (the samples' + old API doesn't compile against the new engine). Re-enable it after. - Docs: `dirigible-io/dirigible-io.github.io` — `/help/develop` (incl. a "Coming from Spring Boot" guide) and `/sdk`. diff --git a/components/engine/engine-native-apps/CLAUDE.md b/components/engine/engine-native-apps/CLAUDE.md index a59f50d5a9c..f9b701b2ce4 100644 --- a/components/engine/engine-native-apps/CLAUDE.md +++ b/components/engine/engine-native-apps/CLAUDE.md @@ -37,4 +37,4 @@ User projects can declare a `*.nativeapp` JSON file that turns an external web s - **Gotchas worth remembering.** - `Python 3.14` on macOS has a bind regression in `http.server.HTTPServer` — don't use Python for embedded test servers; use `java Server.java`. - `ServerSocket(port, 0, InetAddress.getLoopbackAddress())` can succeed on loopback even when another listener is bound to `0.0.0.0:port` on macOS — this is why `PortResolver.isBindable` deliberately probes the wildcard interface (`new ServerSocket(port, 0, null)`). Keep it that way; reverting to a loopback probe will reintroduce silent `EADDRINUSE` failures when the parent platform (or any other process) is already on the preferred port. - - `Spring Boot's DevTools` (or whatever `FileSystemWatcher` wires up) can deadlock against `sun.nio.fs.PollingWatchService$PollingWatchKey` on macOS during full IT runs (last seen on `JavaLspIT`, `CreateNewFileIT`, `JavaEntityDecoratorsSampleProjectIT`). This is NOT a native-apps regression. When the full reactor IT run hangs, jstack the surefire JVM and check for `Found one Java-level deadlock` between `main` and `FileSystemWatcher`. + - `Spring Boot's DevTools` (or whatever `FileSystemWatcher` wires up) can deadlock against `sun.nio.fs.PollingWatchService$PollingWatchKey` on macOS during full IT runs (last seen on `JavaLspIT`, `CreateNewFileIT`, `JavaSampleProjectsIT`). This is NOT a native-apps regression. When the full reactor IT run hangs, jstack the surefire JVM and check for `Found one Java-level deadlock` between `main` and `FileSystemWatcher`. diff --git a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/util/SynchronizationUtil.java b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/util/SynchronizationUtil.java index e48b654fbdc..9bcf70bc294 100644 --- a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/util/SynchronizationUtil.java +++ b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/util/SynchronizationUtil.java @@ -47,7 +47,7 @@ public static void waitForSynchronizationExecution() { * Wait until the synchronizer stays idle for a full quiet period. A plain idle check is not enough * right after a publish: the registry file watcher (a polling watcher on some platforms) delivers * trailing change events SECONDS after the copy, scheduling one more cycle - which may re-register - * data-store entities and rebuild their tables mid-test (StoreAPISampleProjectIT saw its + * data-store entities and rebuild their tables mid-test (the store-api sample verification saw its * just-inserted rows vanish exactly this way). Requiring the idle condition to HOLD for ten seconds * absorbs those late events before the test proceeds. */ diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/IntentEditorLoadsIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/IntentEditorLoadsIT.java index abcc0aa95c9..70df3da9cef 100644 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/IntentEditorLoadsIT.java +++ b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/IntentEditorLoadsIT.java @@ -42,7 +42,7 @@ * (a missing {@code ng-editor} platform-links category, or the config script not being loaded, both * leave the services green while the editor is dead). This test clones the * {@code dirigiblelabs/sample-intent-model} sample project (the same clone-a-real-repo pattern the - * {@code SampleProjectRepositoryIT} subclasses use), opens its {@code app.intent}, and asserts: + * {@code SampleProjectsIT} subclasses use), opens its {@code app.intent}, and asserts: *
    *
  • the file is routed to the Intent Editor (the editor tab appears),
    • *
  • the AngularJS {@code intentEditor} module actually bootstrapped (its injector resolves - diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ComponentDecoratorSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ComponentDecoratorSampleProjectIT.java deleted file mode 100644 index a93c1b41e18..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ComponentDecoratorSampleProjectIT.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2022 codbex or an codbex affiliate company and contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.Matchers.equalToCompressingWhiteSpace; - -public class ComponentDecoratorSampleProjectIT extends SampleProjectRepositoryIT { - - @Override - protected void verifyProject() { - restAssuredExecutor.execute( // - () -> given().when() - .get("/services/ts/sample-component-decorators/OrderProcessor.ts") - .then() - .statusCode(200) - .body(equalToCompressingWhiteSpace("Do Payment: {\"status\":\"OK\",\"data\":\"123.45\"}"))); - } - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-component-decorators.git"; - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/EntityDecoratorsSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/EntityDecoratorsSampleProjectIT.java deleted file mode 100644 index fc76ffaefdb..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/EntityDecoratorsSampleProjectIT.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2022 codbex or an codbex affiliate company and contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import java.util.regex.Pattern; - -import io.restassured.builder.RequestSpecBuilder; -import io.restassured.specification.RequestSpecification; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalToCompressingWhiteSpace; - -public class EntityDecoratorsSampleProjectIT extends SampleProjectRepositoryIT { - - private static final String COUNTRIES_RESPONSE_BODY = - """ - [{"Code2":"AF","Numeric":"004","Code3":"AFG","Id":1,"$type$":"CountryEntity","Name":"Afghanistan"},{"Code2":"AL","Numeric":"008","Code3":"ALB","Id":2,"$type$":"CountryEntity","Name":"Albania"},{"Code2":"DZ","Numeric":"012","Code3":"DZA","Id":3,"$type$":"CountryEntity","Name":"Algeria"}] - """; - - /** - * The expected OpenAPI document with the instance's own version replaced by - * {@link #VERSION_PLACEHOLDER}. The served {@code info.version} is the real build version, which - * changes on every release and every development bump - so it is normalised out of BOTH sides of - * the comparison rather than pinned here. Pinning it made this test fail on both CI databases the - * first night after the version stopped being served as a literal {@code ${project.version}} - * (#6644). - */ - private static final String VERSION_PLACEHOLDER = ""; - - private static final String OPENAPI_RESPONSE_BODY = - """ - {"openapi":"3.0.1","info":{"title":"Applications Services Open API","description":"Services Open API provided by the applications","contact":{"name":"Eclipse Dirigible","url":"https://www.dirigible.io","email":"dirigible-dev@eclipse.org"},"license":{"name":"Eclipse Public License - v 2.0","url":"https://www.eclipse.org/legal/epl-v20.html"},"version":""},"servers":[{"url":"/services/ts"},{"url":"/services/ts"}],"security":[],"tags":[],"paths":{"/sample-entity-decorators/CountryController.ts/":{"get":{"tags":["CountryController"],"summary":"getAll CountryController ","operationId":"getAll","parameters":[],"responses":{"200":{"description":"Success","content":{"application/json":{"schema":{"type":"array","items":{"$ref":"#/components/schemas/CountryEntity"}}}}}}}}},"components":{"schemas":{"number":{"type":"number"},"CountryEntity":{"type":"object","properties":{"Code2":{"type":"string"},"Numeric":{"type":"string"},"Code3":{"type":"string"},"Id":{"type":"number","description":"My Id"},"Name":{"type":"string","description":"My Name"}},"description":"Sample Country Entity"},"string":{"type":"string"},"any":{"type":"object"}},"responses":{},"parameters":{},"examples":{},"requestBodies":{},"headers":{},"securitySchemes":{},"links":{},"callbacks":{}}} - """; - - /** {@code "version":""} inside the OpenAPI {@code info} block. */ - private static final Pattern OPENAPI_VERSION = Pattern.compile("\"version\":\"[^\"]*\""); - - @Override - protected void verifyProject() { - restAssuredExecutor.execute( // - () -> { - RequestSpecification requestSpec = new RequestSpecBuilder().setUrlEncodingEnabled(false) - .build(); - - // Use the spec where encoding is disabled otherwise limit param is encoded and skipped by the code - given().spec(requestSpec) - .queryParam("$limit", 3) - .get("/services/ts/sample-entity-decorators/CountryController.ts") - .then() - .statusCode(200) - .body(equalToCompressingWhiteSpace(COUNTRIES_RESPONSE_BODY)); - - // TODO: documentation texts from @Document annotations are not added to the open api response. Fix - // this issue and adapt the test. - String openApi = given().when() - .get("/services/openapi") - .then() - .statusCode(200) - .extract() - .asString(); - assertThat("the served OpenAPI document should match, ignoring the instance's own version", // - withoutVersion(openApi), equalToCompressingWhiteSpace(OPENAPI_RESPONSE_BODY)); - }, 60); - } - - /** - * The OpenAPI document with the instance's own {@code info.version} normalised to - * {@link #VERSION_PLACEHOLDER}, so the assertion survives every release and development version - * bump. - * - * @param openApi the served document - * @return the document with its version normalised - */ - private static String withoutVersion(String openApi) { - return OPENAPI_VERSION.matcher(openApi) - .replaceFirst("\"version\":\"" + VERSION_PLACEHOLDER + "\""); - } - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-entity-decorators.git"; - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ExtensionDecoratorSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ExtensionDecoratorSampleProjectIT.java deleted file mode 100644 index 2c17d783c8a..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ExtensionDecoratorSampleProjectIT.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2022 codbex or an codbex affiliate company and contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.Matchers.equalToCompressingWhiteSpace; - -public class ExtensionDecoratorSampleProjectIT extends SampleProjectRepositoryIT { - - @Override - protected void verifyProject() { - restAssuredExecutor.execute( // - () -> given().when() - .get("/services/ts/sample-extension-decorator/OrderDiscount.ts") - .then() - .statusCode(200) - .body(equalToCompressingWhiteSpace("\"Discount: 5\"")) - - ); - } - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-extension-decorator.git"; - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaEntityDecoratorsSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaEntityDecoratorsSampleProjectIT.java deleted file mode 100644 index a3bcf2e2cc8..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaEntityDecoratorsSampleProjectIT.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2010-2026 Eclipse Dirigible contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.Matchers.containsString; - -/** - * Clones {@code dirigiblelabs/sample-java-entity-decorators}, publishes it through the IDE, and - * verifies the {@code @Entity} / {@code @Repository} / {@code @Controller} annotation stack with - * CSVIM-seeded country CRUD and OpenAPI registration, plus the Spring-style DI showcase - * (constructor injection and the {@code Beans} facade). - */ -public class JavaEntityDecoratorsSampleProjectIT extends SampleProjectRepositoryIT { - - private static final String PROJECT = "sample-java-entity-decorators"; - private static final String CONTROLLER_BASE = "/services/java/" + PROJECT + "/demo/CountryController"; - private static final String GREETING_BASE = "/services/java/" + PROJECT + "/demo/GreetingController"; - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-java-entity-decorators.git"; - } - - @Override - protected void verifyProject() { - restAssuredExecutor.execute(() -> { - given().when() - .get(CONTROLLER_BASE) - .then() - .statusCode(200) - .body(containsString("Afghanistan")) - .body(containsString("Albania")) - .body(containsString("Algeria")); - - given().when() - .get(CONTROLLER_BASE + "/1") - .then() - .statusCode(200) - .body(containsString("Afghanistan")); - - given().when() - .get("/services/openapi") - .then() - .statusCode(200) - .body(containsString(CONTROLLER_BASE)) - .body(containsString(CONTROLLER_BASE + "/{id}")); - - // DI showcase — constructor injection of the @Component GreetingService. - given().when() - .get(GREETING_BASE + "/greet/World") - .then() - .statusCode(200) - .body(containsString("Hello, World!")); - - // DI showcase — the Beans facade for programmatic lookup. - given().when() - .get(GREETING_BASE + "/greet-via-beans/World") - .then() - .statusCode(200) - .body(containsString("Hello, World!")); - }); - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaExtensionDecoratorSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaExtensionDecoratorSampleProjectIT.java deleted file mode 100644 index bb6be7c1c6e..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaExtensionDecoratorSampleProjectIT.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2010-2026 Eclipse Dirigible contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.Matchers.containsString; - -public class JavaExtensionDecoratorSampleProjectIT extends SampleProjectRepositoryIT { - - private static final String PROJECT = "sample-java-extension-decorator"; - private static final String EXTENSION_CONSUMER_BASE = "/services/java/" + PROJECT + "/demo/extension/ExtensionConsumer"; - private static final String INJECTING_CONSUMER_BASE = "/services/java/" + PROJECT + "/demo/extension/InjectingConsumer"; - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-java-extension-decorator.git"; - } - - @Override - protected void verifyProject() { - restAssuredExecutor.execute(() -> { - // Style 1 — Extensions.find(SampleExtensionPoint.class) returns the SampleContribution - // instances; the consumer maps each via describe(), so the body carries the contribution's - // own string. Asserting on it also verifies the cast — only a real implementor reaches it. - given().when() - .get(EXTENSION_CONSUMER_BASE + "/contributions") - .then() - .statusCode(200) - .body(containsString("Hello from SampleContribution!")); - - // Style 2 — collection injection: the container populates the controller's - // List with every @Component contribution, no explicit lookup. - given().when() - .get(INJECTING_CONSUMER_BASE + "/injected-contributions") - .then() - .statusCode(200) - .body(containsString("Hello from SampleContribution!")); - }); - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaJobDecoratorSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaJobDecoratorSampleProjectIT.java deleted file mode 100644 index e1936a801ee..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaJobDecoratorSampleProjectIT.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2010-2026 Eclipse Dirigible contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import static io.restassured.RestAssured.given; -import static org.awaitility.Awaitility.await; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; - -import java.util.concurrent.TimeUnit; - -import org.eclipse.dirigible.tests.framework.logging.LogsAsserter; -import io.restassured.http.ContentType; -import org.eclipse.dirigible.tests.framework.util.SynchronizationUtil; -import org.junit.jupiter.api.BeforeEach; - -import ch.qos.logback.classic.Level; - -public class JavaJobDecoratorSampleProjectIT extends SampleProjectRepositoryIT { - - private LogsAsserter consoleLogAsserter; - - @BeforeEach - void setUp() { - consoleLogAsserter = new LogsAsserter("app.out", Level.INFO); - } - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-java-job-decorator.git"; - } - - @Override - protected void verifyProject() { - // Self-describing interface style — CleanupJob implements JobHandler (schedule from cron()). - await().atMost(20, TimeUnit.SECONDS) - .pollInterval(1, TimeUnit.SECONDS) - .until(() -> consoleLogAsserter.containsMessage("CleanupJob executed!", Level.INFO)); - - // Method-level annotation style — Maintenance's @Scheduled method. - await().atMost(20, TimeUnit.SECONDS) - .pollInterval(1, TimeUnit.SECONDS) - .until(() -> consoleLogAsserter.containsMessage("Maintenance.purgeTempFiles executed", Level.INFO)); - - // Client-Java jobs are now real Job definitions on the shared scheduler, so they are VISIBLE - // and MONITORED in the Jobs perspective (which reads /services/jobs) with engine "java" - - // not hidden on a private in-JVM scheduler as before. - restAssuredExecutor.execute(() -> given().when() - .get("/services/jobs") - .then() - .statusCode(200) - .body("findAll { it.engine == 'java' }.size()", greaterThanOrEqualTo(2))); - - // And they SURVIVE a registry synchronization pass - the synchronizer must not reap the - // runtime-registered rows (they are not backed by a registry artefact). - synchronizationProcessor.forceProcessSynchronizers(); - SynchronizationUtil.waitForStableSynchronization(); - restAssuredExecutor.execute(() -> given().when() - .get("/services/jobs") - .then() - .statusCode(200) - .body("findAll { it.engine == 'java' }.size()", greaterThanOrEqualTo(2))); - - verifyTriggerNowRunsTheClientJavaJob(); - } - - /** - * Trigger-now (the Jobs perspective's play button) must run a client-Java job on the Java engine. - * The manual path used to be JavaScript-only, so it tried to run the job's CLASS NAME as a - * repository path to a JS module and answered 500 (dirigible #6305). - * - *

    - * The status is the whole assertion: the Java dispatch either resolves the client bean and invokes - * it, or throws (an unknown bean, a job body that fails) - and either way the endpoint surfaces - * that as a 500. It cannot answer 200 without having run the job. - */ - private void verifyTriggerNowRunsTheClientJavaJob() { - String name = restAssuredExecutor.executeWithResult(() -> given().when() - .get("/services/jobs") - .then() - .statusCode(200) - .extract() - .path("find { it.engine == 'java' }.name")); - - restAssuredExecutor.execute(() -> given().contentType(ContentType.JSON) - .body("[]") - .when() - .post("/services/jobs/trigger/" + name) - .then() - .statusCode(200)); - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaListenerDecoratorSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaListenerDecoratorSampleProjectIT.java deleted file mode 100644 index ed22c4c1e3b..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaListenerDecoratorSampleProjectIT.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2010-2026 Eclipse Dirigible contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import static io.restassured.RestAssured.given; -import static org.awaitility.Awaitility.await; - -import java.util.concurrent.TimeUnit; - -import org.eclipse.dirigible.tests.framework.logging.LogsAsserter; -import org.junit.jupiter.api.BeforeEach; - -import ch.qos.logback.classic.Level; - -public class JavaListenerDecoratorSampleProjectIT extends SampleProjectRepositoryIT { - - private static final String PROJECT = "sample-java-listener-decorator"; - private static final String LISTENER_TRIGGER = "/services/js/" + PROJECT + "/demo/listener/trigger.mjs"; - - private LogsAsserter consoleLogAsserter; - - @BeforeEach - void setUp() { - consoleLogAsserter = new LogsAsserter("app.out", Level.INFO); - } - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-java-listener-decorator.git"; - } - - @Override - protected void verifyProject() { - restAssuredExecutor.execute(() -> given().when() - .get(LISTENER_TRIGGER) - .then() - .statusCode(200)); - - // Self-describing interface style — OrderListener implements MessageHandler. - await().atMost(15, TimeUnit.SECONDS) - .pollInterval(1, TimeUnit.SECONDS) - .until(() -> consoleLogAsserter.containsMessage("OrderListener received:", Level.INFO)); - - // Method-level annotation style — InvoiceListener's @Listener method records via the injected - // Auditor. - await().atMost(15, TimeUnit.SECONDS) - .pollInterval(1, TimeUnit.SECONDS) - .until(() -> consoleLogAsserter.containsMessage("Auditor: invoice received:", Level.INFO)); - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaSampleProjectsIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaSampleProjectsIT.java new file mode 100644 index 00000000000..c1c03813851 --- /dev/null +++ b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaSampleProjectsIT.java @@ -0,0 +1,229 @@ +/* + * Copyright (c) 2010-2026 Eclipse Dirigible contributors + * + * All rights reserved. This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v20.html + * + * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0 + */ +package org.eclipse.dirigible.integration.tests.ui.tests.sample; + +import static io.restassured.RestAssured.given; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; + +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.eclipse.dirigible.tests.framework.logging.LogsAsserter; +import org.eclipse.dirigible.tests.framework.util.SynchronizationUtil; +import org.junit.jupiter.api.Test; + +import ch.qos.logback.classic.Level; +import io.restassured.http.ContentType; + +/** + * The client-Java samples, published together into one instance and verified one sample per test. + * + *

    + * Publishing them together also covers something the per-sample runs could not: the five projects + * are compiled in ONE {@code javac} batch into ONE {@code ClientClassLoader}, so they exercise the + * bean container with the whole family's {@code @Component}s registered side by side. + * + *

    + * Counterpart of {@link TypeScriptSampleProjectsIT} - the two families cannot share an instance + * because their entity samples both own the {@code SAMPLE_COUNTRY} table (see + * {@link SampleProjectsIT}). + */ +class JavaSampleProjectsIT extends SampleProjectsIT { + + private static final String ENTITY_PROJECT = "sample-java-entity-decorators"; + private static final String COUNTRY_CONTROLLER_BASE = "/services/java/" + ENTITY_PROJECT + "/demo/CountryController"; + private static final String GREETING_BASE = "/services/java/" + ENTITY_PROJECT + "/demo/GreetingController"; + + private static final String EXTENSION_PROJECT = "sample-java-extension-decorator"; + private static final String EXTENSION_CONSUMER_BASE = "/services/java/" + EXTENSION_PROJECT + "/demo/extension/ExtensionConsumer"; + private static final String INJECTING_CONSUMER_BASE = "/services/java/" + EXTENSION_PROJECT + "/demo/extension/InjectingConsumer"; + + private static final String LISTENER_TRIGGER = "/services/js/sample-java-listener-decorator/demo/listener/trigger.mjs"; + + private static final String WEBSOCKET_STATUS_BASE = "/services/java/sample-java-websocket-decorator/demo/websocket/WebsocketStatus"; + + @Override + protected List getRepositoryUrls() { + return List.of( // + "https://github.com/dirigiblelabs/sample-java-entity-decorators.git", // + "https://github.com/dirigiblelabs/sample-java-extension-decorator.git", // + "https://github.com/dirigiblelabs/sample-java-job-decorator.git", // + "https://github.com/dirigiblelabs/sample-java-listener-decorator.git", // + "https://github.com/dirigiblelabs/sample-java-websocket-decorator.git"); + } + + /** + * The {@code @Entity} / {@code @Repository} / {@code @Controller} annotation stack with + * CSVIM-seeded country CRUD and OpenAPI registration, plus the Spring-style DI showcase + * (constructor injection and the {@code Beans} facade). + */ + @Test + void entityDecorators() { + restAssuredExecutor.execute(() -> { + given().when() + .get(COUNTRY_CONTROLLER_BASE) + .then() + .statusCode(200) + .body(containsString("Afghanistan")) + .body(containsString("Albania")) + .body(containsString("Algeria")); + + given().when() + .get(COUNTRY_CONTROLLER_BASE + "/1") + .then() + .statusCode(200) + .body(containsString("Afghanistan")); + + given().when() + .get("/services/openapi") + .then() + .statusCode(200) + .body(containsString(COUNTRY_CONTROLLER_BASE)) + .body(containsString(COUNTRY_CONTROLLER_BASE + "/{id}")); + + // DI showcase — constructor injection of the @Component GreetingService. + given().when() + .get(GREETING_BASE + "/greet/World") + .then() + .statusCode(200) + .body(containsString("Hello, World!")); + + // DI showcase — the Beans facade for programmatic lookup. + given().when() + .get(GREETING_BASE + "/greet-via-beans/World") + .then() + .statusCode(200) + .body(containsString("Hello, World!")); + }); + } + + @Test + void extensionDecorator() { + restAssuredExecutor.execute(() -> { + // Style 1 — Extensions.find(SampleExtensionPoint.class) returns the SampleContribution + // instances; the consumer maps each via describe(), so the body carries the contribution's + // own string. Asserting on it also verifies the cast — only a real implementor reaches it. + given().when() + .get(EXTENSION_CONSUMER_BASE + "/contributions") + .then() + .statusCode(200) + .body(containsString("Hello from SampleContribution!")); + + // Style 2 — collection injection: the container populates the controller's + // List with every @Component contribution, no explicit lookup. + given().when() + .get(INJECTING_CONSUMER_BASE + "/injected-contributions") + .then() + .statusCode(200) + .body(containsString("Hello from SampleContribution!")); + }); + } + + @Test + void jobDecorator() { + LogsAsserter consoleLogAsserter = new LogsAsserter("app.out", Level.INFO); + + // Both jobs fire on a sub-5s cron, so they log again regardless of how long ago the sample + // was published - the asserter only sees messages logged after it attached. + + // Self-describing interface style — CleanupJob implements JobHandler (schedule from cron()). + await().atMost(20, TimeUnit.SECONDS) + .pollInterval(1, TimeUnit.SECONDS) + .until(() -> consoleLogAsserter.containsMessage("CleanupJob executed!", Level.INFO)); + + // Method-level annotation style — Maintenance's @Scheduled method. + await().atMost(20, TimeUnit.SECONDS) + .pollInterval(1, TimeUnit.SECONDS) + .until(() -> consoleLogAsserter.containsMessage("Maintenance.purgeTempFiles executed", Level.INFO)); + + // Client-Java jobs are now real Job definitions on the shared scheduler, so they are VISIBLE + // and MONITORED in the Jobs perspective (which reads /services/jobs) with engine "java" - + // not hidden on a private in-JVM scheduler as before. + restAssuredExecutor.execute(() -> given().when() + .get("/services/jobs") + .then() + .statusCode(200) + .body("findAll { it.engine == 'java' }.size()", greaterThanOrEqualTo(2))); + + // And they SURVIVE a registry synchronization pass - the synchronizer must not reap the + // runtime-registered rows (they are not backed by a registry artefact). + synchronizationProcessor.forceProcessSynchronizers(); + SynchronizationUtil.waitForStableSynchronization(); + restAssuredExecutor.execute(() -> given().when() + .get("/services/jobs") + .then() + .statusCode(200) + .body("findAll { it.engine == 'java' }.size()", greaterThanOrEqualTo(2))); + + verifyTriggerNowRunsTheClientJavaJob(); + } + + /** + * Trigger-now (the Jobs perspective's play button) must run a client-Java job on the Java engine. + * The manual path used to be JavaScript-only, so it tried to run the job's CLASS NAME as a + * repository path to a JS module and answered 500 (dirigible #6305). + * + *

    + * The status is the whole assertion: the Java dispatch either resolves the client bean and invokes + * it, or throws (an unknown bean, a job body that fails) - and either way the endpoint surfaces + * that as a 500. It cannot answer 200 without having run the job. + */ + private void verifyTriggerNowRunsTheClientJavaJob() { + String name = restAssuredExecutor.executeWithResult(() -> given().when() + .get("/services/jobs") + .then() + .statusCode(200) + .extract() + .path("find { it.engine == 'java' }.name")); + + restAssuredExecutor.execute(() -> given().contentType(ContentType.JSON) + .body("[]") + .when() + .post("/services/jobs/trigger/" + name) + .then() + .statusCode(200)); + } + + @Test + void listenerDecorator() { + LogsAsserter consoleLogAsserter = new LogsAsserter("app.out", Level.INFO); + + restAssuredExecutor.execute(() -> given().when() + .get(LISTENER_TRIGGER) + .then() + .statusCode(200)); + + // Self-describing interface style — OrderListener implements MessageHandler. + await().atMost(15, TimeUnit.SECONDS) + .pollInterval(1, TimeUnit.SECONDS) + .until(() -> consoleLogAsserter.containsMessage("OrderListener received:", Level.INFO)); + + // Method-level annotation style — InvoiceListener's @Listener method records via the injected + // Auditor. + await().atMost(15, TimeUnit.SECONDS) + .pollInterval(1, TimeUnit.SECONDS) + .until(() -> consoleLogAsserter.containsMessage("Auditor: invoice received:", Level.INFO)); + } + + @Test + void websocketDecorator() { + restAssuredExecutor.execute(() -> given().when() + .get(WEBSOCKET_STATUS_BASE + "/status") + .then() + .statusCode(200) + // Self-describing interface style — ChatHandler implements WebsocketHandler. + .body(containsString("\"chat\":true")) + // Method-level annotation style — TickerHandler is @Websocket + @OnX. + .body(containsString("\"ticker\":true"))); + } + +} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaWebsocketDecoratorSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaWebsocketDecoratorSampleProjectIT.java deleted file mode 100644 index 3b3f83e30ca..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JavaWebsocketDecoratorSampleProjectIT.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2010-2026 Eclipse Dirigible contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.Matchers.containsString; - -public class JavaWebsocketDecoratorSampleProjectIT extends SampleProjectRepositoryIT { - - private static final String PROJECT = "sample-java-websocket-decorator"; - private static final String WEBSOCKET_STATUS_BASE = "/services/java/" + PROJECT + "/demo/websocket/WebsocketStatus"; - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-java-websocket-decorator.git"; - } - - @Override - protected void verifyProject() { - restAssuredExecutor.execute(() -> given().when() - .get(WEBSOCKET_STATUS_BASE + "/status") - .then() - .statusCode(200) - // Self-describing interface style — ChatHandler implements WebsocketHandler. - .body(containsString("\"chat\":true")) - // Method-level annotation style — TickerHandler is @Websocket + @OnX. - .body(containsString("\"ticker\":true"))); - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JobDecoratorSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JobDecoratorSampleProjectIT.java deleted file mode 100644 index 69af9c4acca..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/JobDecoratorSampleProjectIT.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2022 codbex or an codbex affiliate company and contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import ch.qos.logback.classic.Level; -import org.eclipse.dirigible.tests.framework.logging.LogsAsserter; -import org.junit.jupiter.api.BeforeEach; - -import java.util.concurrent.TimeUnit; - -import static org.awaitility.Awaitility.await; - -public class JobDecoratorSampleProjectIT extends SampleProjectRepositoryIT { - - private LogsAsserter consoleLogAsserter; - - @BeforeEach - void setUp() { - this.consoleLogAsserter = new LogsAsserter("app.out", Level.INFO); - } - - @Override - protected void verifyProject() { - await().atMost(60, TimeUnit.SECONDS) - .pollInterval(3, TimeUnit.SECONDS) - .until(() -> consoleLogAsserter.containsMessage("MyJob executed!", Level.INFO)); - } - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-job-decorator.git"; - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ListenerDecoratorSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ListenerDecoratorSampleProjectIT.java deleted file mode 100644 index 7de02819113..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/ListenerDecoratorSampleProjectIT.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2022 codbex or an codbex affiliate company and contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import ch.qos.logback.classic.Level; -import org.eclipse.dirigible.tests.framework.logging.LogsAsserter; -import org.junit.jupiter.api.BeforeEach; - -import static io.restassured.RestAssured.given; - -public class ListenerDecoratorSampleProjectIT extends SampleProjectRepositoryIT { - - private LogsAsserter consoleLogAsserter; - - @BeforeEach - void setUp() { - this.consoleLogAsserter = new LogsAsserter("app.out", Level.INFO); - } - - @Override - protected void verifyProject() { - restAssuredExecutor.execute( // - () -> given().get("/services/js/sample-listener-decorator/OrderListenerTrigger.js") - .then() - .statusCode(200)); - - consoleLogAsserter.containsMessage("Hello from the OrderListener Trigger! Message: [ I am a message created at:", Level.INFO); - consoleLogAsserter.containsMessage("Processing message event: [ I am a message created at:", Level.INFO); - } - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-listener-decorator.git"; - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/RolesDecoratorSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/RolesDecoratorSampleProjectIT.java deleted file mode 100644 index b319185f285..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/RolesDecoratorSampleProjectIT.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2022 codbex or an codbex affiliate company and contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import ch.qos.logback.classic.Level; -import io.restassured.parsing.Parser; -import org.eclipse.dirigible.components.base.http.roles.Roles; -import org.eclipse.dirigible.tests.framework.logging.LogsAsserter; -import org.eclipse.dirigible.tests.framework.security.SecurityUtil; -import org.junit.jupiter.api.BeforeEach; -import org.springframework.beans.factory.annotation.Autowired; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.Matchers.equalTo; - -public class RolesDecoratorSampleProjectIT extends SampleProjectRepositoryIT { - - private static final String ADMIN_USERNAME = "adm1"; - private static final String ADMIN_PASS = "adm1-pass"; - - private static final String UNAUTHORIZED_USER_USERNAME = "unathorized-usr"; - private static final String UNAUTHORIZED_USER_PASS = "unathorized-usr-pass"; - - @Autowired - private SecurityUtil securityUtil; - - private LogsAsserter consoleErrorLogAsserter; - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-roles-decorator.git"; - } - - @BeforeEach - void setUp() { - this.consoleErrorLogAsserter = new LogsAsserter("app.err", Level.INFO); - - } - - @Override - protected void verifyProject() { - securityUtil.createUserInDefaultTenant(ADMIN_USERNAME, ADMIN_PASS, Roles.ADMINISTRATOR.getRoleName()); - restAssuredExecutor.execute(this::verifyAuthorizedUserAccess, ADMIN_USERNAME, ADMIN_PASS); - - securityUtil.createUserInDefaultTenant(UNAUTHORIZED_USER_USERNAME, UNAUTHORIZED_USER_PASS); - restAssuredExecutor.execute(this::verifyUnauthorizedUserAccess, UNAUTHORIZED_USER_USERNAME, UNAUTHORIZED_USER_PASS); - } - - private void verifyAuthorizedUserAccess() { - // set default parser to enforce restassured json body validations - // since the response doesn't specify the content type - given().when() - .get("/services/ts/sample-roles-decorator/RolesCheck.ts") - .then() - .statusCode(200) - .using() - .defaultParser(Parser.JSON) - .body("message", equalTo("Roles Check")) - .body("user", equalTo(ADMIN_USERNAME)); - } - - private void verifyUnauthorizedUserAccess() { - given().when() - .get("/services/ts/sample-roles-decorator/RolesCheck.ts") - .then() - .statusCode(500); - - consoleErrorLogAsserter.assertLoggedMessage("Current user [" + UNAUTHORIZED_USER_USERNAME - + "] is not allowed to call module [RolesCheck]. Required some of roles [ADMINISTRATOR]", Level.ERROR); - } - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleLibraryLocalNativeAppIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleLibraryLocalNativeAppIT.java index d8bd28d3a0a..dca330ff26f 100644 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleLibraryLocalNativeAppIT.java +++ b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleLibraryLocalNativeAppIT.java @@ -12,11 +12,14 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.containsString; +import java.util.List; + import io.restassured.http.ContentType; import org.eclipse.dirigible.commons.config.DirigibleConfig; import org.eclipse.dirigible.tests.framework.security.SecurityUtil; import org.eclipse.dirigible.tests.framework.tenant.DirigibleTestTenant; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; /** @@ -33,8 +36,14 @@ * *

    * Counterpart to {@code RemoteNativeAppIT} which exercises the {@code remote} kind. + * + *

    + * Stays a family of its own rather than joining {@link TypeScriptSampleProjectsIT} or + * {@link JavaSampleProjectsIT}: it spawns and reaps a real OS process (an {@code npm install} on + * first run) and grants a role on the fly, so sharing its instance would make the other samples pay + * for that and would leave live processes around their verifications. */ -public class SampleLibraryLocalNativeAppIT extends SampleProjectRepositoryIT { +public class SampleLibraryLocalNativeAppIT extends SampleProjectsIT { private static final String API_ROOT = "/services/native-apps-proxy/v1/library-native-app-nodejs/rest/api/v1"; @@ -65,16 +74,21 @@ static void allowTimeForFirstRunBootstrap() { // first spawn, which dwarfs the platform's 30 s default ready timeout when node_modules has // to be fetched. Five minutes is comfortably above worst-case cold-cache install + tsc on // CI runners; the lazy-start filter polls every 200 ms so a fast warm run still wins early. + // + // Runs after the base class's clone-and-publish @BeforeAll, which is soon enough: the + // artefact declares `"mode": "lazy"`, and only a StartMode.ALWAYS app is spawned by the + // bootstrap, the monitor job or the synchronizer - this one waits for the first proxied + // request, which the test method below makes. DirigibleConfig.NATIVE_APP_READY_TIMEOUT_MS.setIntValue(5 * 60 * 1000); } @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-library-local-native-app.git"; + protected List getRepositoryUrls() { + return List.of("https://github.com/dirigiblelabs/sample-library-local-native-app.git"); } - @Override - protected void verifyProject() { + @Test + void localNativeApp() { // The default 'admin' user holds DEVELOPER + ADMINISTRATOR, which short-circuits the scope // check in ExposedPathFilter — so we can't use it to exercise the negative path. Create a // dedicated user with no privileged roles, then watch the proxy flip from 403 to 200/201 diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleProjectRepositoryIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleProjectRepositoryIT.java deleted file mode 100644 index dc3e61ac0f1..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleProjectRepositoryIT.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2022 codbex or an codbex affiliate company and contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import org.eclipse.dirigible.components.initializers.synchronizer.SynchronizationProcessor; -import org.eclipse.dirigible.tests.base.UserInterfaceIntegrationTest; -import org.eclipse.dirigible.tests.framework.ide.GitPerspective; -import org.eclipse.dirigible.tests.framework.ide.Workbench; -import org.eclipse.dirigible.tests.framework.restassured.RestAssuredExecutor; -import org.eclipse.dirigible.tests.framework.util.SynchronizationUtil; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; - -// "sample" (on top of the inherited "ui") routes the whole sample-project family into its own CI -// shard - see the integration-tests matrix in .github/workflows/build.yml. -@Tag("sample") -abstract class SampleProjectRepositoryIT extends UserInterfaceIntegrationTest { - - @Autowired - protected RestAssuredExecutor restAssuredExecutor; - - @Autowired - protected SynchronizationProcessor synchronizationProcessor; - - @Test - final void testSampleProject() { - cloneProject(); - - Workbench workbench = ide.openWorkbench(); - workbench.publishAll(true); - - synchronizationProcessor.forceProcessSynchronizers(); - - // The registry watcher may deliver trailing publish events seconds later, scheduling one - // more sync cycle that can re-register data-store entities (rebuilding their tables) while - // the verification is already inserting data. Proceed only after the sync stays idle. - SynchronizationUtil.waitForStableSynchronization(); - - verifyProject(); - } - - protected abstract void verifyProject(); - - private void cloneProject() { - ide.openHomePage(); - - GitPerspective gitPerspective = ide.openGitPerspective(); - String repositoryUrl = getRepositoryURL(); - gitPerspective.cloneRepository(repositoryUrl); - } - - protected abstract String getRepositoryURL(); - -} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleProjectsIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleProjectsIT.java new file mode 100644 index 00000000000..0c781df5e78 --- /dev/null +++ b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/SampleProjectsIT.java @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2010-2026 Eclipse Dirigible contributors + * + * All rights reserved. This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v20.html + * + * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0 + */ +package org.eclipse.dirigible.integration.tests.ui.tests.sample; + +import java.util.List; + +import org.eclipse.dirigible.components.initializers.synchronizer.SynchronizationProcessor; +import org.eclipse.dirigible.tests.base.UserInterfaceIntegrationTest; +import org.eclipse.dirigible.tests.framework.ide.GitPerspective; +import org.eclipse.dirigible.tests.framework.ide.Workbench; +import org.eclipse.dirigible.tests.framework.restassured.RestAssuredExecutor; +import org.eclipse.dirigible.tests.framework.util.SynchronizationUtil; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.DirtiesContext; + +/** + * Base for the sample-project ITs: clones a family of {@code dirigiblelabs/sample-*} repositories + * into one workspace, publishes them together, and lets each subclass verify one sample per + * {@code @Test} method. + * + *

    + * The clone-and-publish journey is identical for every sample, and it is the expensive part - a + * Dirigible boot, a Chrome session and a full publish + synchronization cycle. Running it once per + * sample cost the {@code samples} CI shard ~18 minutes for 14 near-identical journeys, so the + * family shares one boot ({@link DirtiesContext.ClassMode#AFTER_CLASS} overrides the per-method + * context reset inherited from the base) and one publish. + * + *

    + * Verifications must stay independent of each other and of their order: they run against the same + * live instance, so a method may not rely on state another method leaves behind. + * + *

    + * The families are split by what can share a runtime, not by taste: + * {@code sample-entity-decorators} and {@code sample-java-entity-decorators} both own the + * {@code SAMPLE_COUNTRY} table and both seed it from their own CSVIM, so they cannot be published + * side by side. + */ +// "sample" (on top of the inherited "ui") routes the whole sample-project family into its own CI +// shard - see the integration-tests matrix in .github/workflows/build.yml. +@Tag("sample") +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) +abstract class SampleProjectsIT extends UserInterfaceIntegrationTest { + + /** + * The test class whose family is already cloned and published, or {@code null}. + * + *

    + * Static because the test instance is not: JUnit's default per-method lifecycle builds a fresh + * instance for every test, while the Spring context - and the published instance behind it - lives + * for the whole class. Keyed by class rather than a plain flag because this field is shared by + * every subclass, and a flag would let the second family skip its own publish and verify against + * the first family's instance. + */ + private static Class publishedFamily; + + @Autowired + protected RestAssuredExecutor restAssuredExecutor; + + @Autowired + protected SynchronizationProcessor synchronizationProcessor; + + /** + * Clones and publishes the family once, before the first verification. + * + *

    + * Deliberately a guarded {@code @BeforeEach} and NOT a {@code @BeforeAll} on a + * {@code @TestInstance(PER_CLASS)} class: PER_CLASS creates and autowires the test instance BEFORE + * the {@code @BeforeAll} methods run, so the Spring context - and with it the whole platform - + * starts before {@code IntegrationTest.cleanBeforeTestClassExecution()} deletes the Dirigible + * folder. The next synchronization pass then reaps the platform's own registry + * ({@code Definition deleted: /shell-ide/extensions/shell.extension}) and the IDE renders with no + * perspectives at all. The default lifecycle keeps the cleaner ahead of the boot. + */ + @BeforeEach + final void cloneAndPublishSamplesOnce() { + if (getClass().equals(publishedFamily)) { + return; + } + + ide.openHomePage(); + + GitPerspective gitPerspective = ide.openGitPerspective(); + getRepositoryUrls().forEach(gitPerspective::cloneRepository); + + Workbench workbench = ide.openWorkbench(); + workbench.publishAll(true); + + synchronizationProcessor.forceProcessSynchronizers(); + + // The registry watcher may deliver trailing publish events seconds later, scheduling one + // more sync cycle that can re-register data-store entities (rebuilding their tables) while + // the verification is already inserting data. Proceed only after the sync stays idle. + SynchronizationUtil.waitForStableSynchronization(); + + publishedFamily = getClass(); + } + + /** + * The sample repositories to clone and publish together, in clone order. + * + * @return the repository URLs + */ + protected abstract List getRepositoryUrls(); + +} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/StoreAPISampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/StoreAPISampleProjectIT.java deleted file mode 100644 index 18f6391432d..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/StoreAPISampleProjectIT.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright (c) 2022 codbex or an codbex affiliate company and contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.Matchers.equalToCompressingWhiteSpace; - -public class StoreAPISampleProjectIT extends SampleProjectRepositoryIT { - - private static final String LIST_CUSTOMERS_RESPONSE_BODY = """ - List all customers: - [ - { - "address": "Sofia, Bulgaria", - "name": "John", - "id": 1, - "$type$": "Customer" - }, - { - "address": "Varna, Bulgaria", - "name": "Jane", - "id": 2, - "$type$": "Customer" - }, - { - "address": "Berlin, Germany", - "name": "Matthias", - "id": 3, - "$type$": "Customer" - } - ]"""; - private static final String COMPLEX_CUSTOMERS_RESPONSE_BODY = """ - - Select customers with first name John: - [ - { - "address": "Sofia, Bulgaria", - "name": "John", - "id": 1, - "$type$": "Customer" - } - ] - - Select native customers with first name John: - [ - { - "customer_id": 1, - "customer_address": "Sofia, Bulgaria", - "customer_name": "John" - } - ] - - Find customers by Example: - [ - { - "address": "Sofia, Bulgaria", - "name": "John", - "id": 1, - "$type$": "Customer" - } - ] - - List customers with filter options: - [ - { - "address": "Varna, Bulgaria", - "name": "Jane", - "id": 2, - "$type$": "Customer" - }, - { - "address": "Sofia, Bulgaria", - "name": "John", - "id": 1, - "$type$": "Customer" - } - ] - - Select customers with first name starts with J: - [ - { - "address": "Sofia, Bulgaria", - "name": "John", - "id": 1, - "$type$": "Customer" - }, - { - "address": "Varna, Bulgaria", - "name": "Jane", - "id": 2, - "$type$": "Customer" - } - ] - - Select customers with first name starts with M with typed query: - [ - { - "address": "Berlin, Germany", - "name": "Matthias", - "id": 3, - "$type$": "Customer" - } - ] - - Select customers with first name starts with M with named query: - [ - { - "address": "Berlin, Germany", - "name": "Matthias", - "id": 3, - "$type$": "Customer" - } - ] - - Select customers with first name in ['John', 'Jane'] with named query: - [ - { - "address": "Sofia, Bulgaria", - "name": "John", - "id": 1, - "$type$": "Customer" - }, - { - "address": "Varna, Bulgaria", - "name": "Jane", - "id": 2, - "$type$": "Customer" - } - ]"""; - - @Override - protected void verifyProject() { - // Retry-on-AssertionError: if a late sync cycle re-registers the Customer entity and - // rebuilds its table between the init and the list (dropping the just-inserted rows and - // resetting the identity counter), the next attempt re-inits and converges. - restAssuredExecutor.execute( // - () -> { - given().when() - .get("/services/ts/sample-store-api/InitCustomers.ts") - .then() - .statusCode(200); - - given().when() - .get("/services/ts/sample-store-api/ListCustomers.ts") - .then() - .statusCode(200) - .body(equalToCompressingWhiteSpace(LIST_CUSTOMERS_RESPONSE_BODY)); - - given().when() - .get("/services/ts/sample-store-api/ComplexQueries.ts") - .then() - .statusCode(200) - .body(equalToCompressingWhiteSpace(COMPLEX_CUSTOMERS_RESPONSE_BODY)); - }, 90); - } - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-store-api.git"; - } - -} - diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/TypeScriptSampleProjectsIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/TypeScriptSampleProjectsIT.java new file mode 100644 index 00000000000..a04ae147ab3 --- /dev/null +++ b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/TypeScriptSampleProjectsIT.java @@ -0,0 +1,383 @@ +/* + * Copyright (c) 2010-2026 Eclipse Dirigible contributors + * + * All rights reserved. This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v20.html + * + * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0 + */ +package org.eclipse.dirigible.integration.tests.ui.tests.sample; + +import static io.restassured.RestAssured.given; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.equalToCompressingWhiteSpace; + +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; + +import org.eclipse.dirigible.components.base.http.roles.Roles; +import org.eclipse.dirigible.tests.framework.logging.LogsAsserter; +import org.eclipse.dirigible.tests.framework.security.SecurityUtil; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import ch.qos.logback.classic.Level; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.parsing.Parser; +import io.restassured.specification.RequestSpecification; + +/** + * The TypeScript / JavaScript decorator samples, published together into one instance and verified + * one sample per test. Counterpart of {@link JavaSampleProjectsIT}, which covers the client-Java + * samples - the two families are kept apart because their entity samples share a table name (see + * {@link SampleProjectsIT}). + */ +class TypeScriptSampleProjectsIT extends SampleProjectsIT { + + private static final String COUNTRIES_RESPONSE_BODY = + """ + [{"Code2":"AF","Numeric":"004","Code3":"AFG","Id":1,"$type$":"CountryEntity","Name":"Afghanistan"},{"Code2":"AL","Numeric":"008","Code3":"ALB","Id":2,"$type$":"CountryEntity","Name":"Albania"},{"Code2":"DZ","Numeric":"012","Code3":"DZA","Id":3,"$type$":"CountryEntity","Name":"Algeria"}] + """; + + /** + * The expected OpenAPI document with the instance's own version replaced by + * {@link #VERSION_PLACEHOLDER}. The served {@code info.version} is the real build version, which + * changes on every release and every development bump - so it is normalised out of BOTH sides of + * the comparison rather than pinned here. Pinning it made this test fail on both CI databases the + * first night after the version stopped being served as a literal {@code ${project.version}} + * (#6644). + * + *

    + * The document stays an exact match even though seven more samples share the instance: + * {@code CountryController.ts} is the only {@code @Controller} in the family, and only a controller + * contributes an OpenAPI fragment. + */ + private static final String VERSION_PLACEHOLDER = ""; + + private static final String OPENAPI_RESPONSE_BODY = + """ + {"openapi":"3.0.1","info":{"title":"Applications Services Open API","description":"Services Open API provided by the applications","contact":{"name":"Eclipse Dirigible","url":"https://www.dirigible.io","email":"dirigible-dev@eclipse.org"},"license":{"name":"Eclipse Public License - v 2.0","url":"https://www.eclipse.org/legal/epl-v20.html"},"version":""},"servers":[{"url":"/services/ts"},{"url":"/services/ts"}],"security":[],"tags":[],"paths":{"/sample-entity-decorators/CountryController.ts/":{"get":{"tags":["CountryController"],"summary":"getAll CountryController ","operationId":"getAll","parameters":[],"responses":{"200":{"description":"Success","content":{"application/json":{"schema":{"type":"array","items":{"$ref":"#/components/schemas/CountryEntity"}}}}}}}}},"components":{"schemas":{"number":{"type":"number"},"CountryEntity":{"type":"object","properties":{"Code2":{"type":"string"},"Numeric":{"type":"string"},"Code3":{"type":"string"},"Id":{"type":"number","description":"My Id"},"Name":{"type":"string","description":"My Name"}},"description":"Sample Country Entity"},"string":{"type":"string"},"any":{"type":"object"}},"responses":{},"parameters":{},"examples":{},"requestBodies":{},"headers":{},"securitySchemes":{},"links":{},"callbacks":{}}} + """; + + /** {@code "version":""} inside the OpenAPI {@code info} block. */ + private static final Pattern OPENAPI_VERSION = Pattern.compile("\"version\":\"[^\"]*\""); + + private static final String LIST_CUSTOMERS_RESPONSE_BODY = """ + List all customers: + [ + { + "address": "Sofia, Bulgaria", + "name": "John", + "id": 1, + "$type$": "Customer" + }, + { + "address": "Varna, Bulgaria", + "name": "Jane", + "id": 2, + "$type$": "Customer" + }, + { + "address": "Berlin, Germany", + "name": "Matthias", + "id": 3, + "$type$": "Customer" + } + ]"""; + + private static final String COMPLEX_CUSTOMERS_RESPONSE_BODY = """ + + Select customers with first name John: + [ + { + "address": "Sofia, Bulgaria", + "name": "John", + "id": 1, + "$type$": "Customer" + } + ] + + Select native customers with first name John: + [ + { + "customer_id": 1, + "customer_address": "Sofia, Bulgaria", + "customer_name": "John" + } + ] + + Find customers by Example: + [ + { + "address": "Sofia, Bulgaria", + "name": "John", + "id": 1, + "$type$": "Customer" + } + ] + + List customers with filter options: + [ + { + "address": "Varna, Bulgaria", + "name": "Jane", + "id": 2, + "$type$": "Customer" + }, + { + "address": "Sofia, Bulgaria", + "name": "John", + "id": 1, + "$type$": "Customer" + } + ] + + Select customers with first name starts with J: + [ + { + "address": "Sofia, Bulgaria", + "name": "John", + "id": 1, + "$type$": "Customer" + }, + { + "address": "Varna, Bulgaria", + "name": "Jane", + "id": 2, + "$type$": "Customer" + } + ] + + Select customers with first name starts with M with typed query: + [ + { + "address": "Berlin, Germany", + "name": "Matthias", + "id": 3, + "$type$": "Customer" + } + ] + + Select customers with first name starts with M with named query: + [ + { + "address": "Berlin, Germany", + "name": "Matthias", + "id": 3, + "$type$": "Customer" + } + ] + + Select customers with first name in ['John', 'Jane'] with named query: + [ + { + "address": "Sofia, Bulgaria", + "name": "John", + "id": 1, + "$type$": "Customer" + }, + { + "address": "Varna, Bulgaria", + "name": "Jane", + "id": 2, + "$type$": "Customer" + } + ]"""; + + private static final String ADMIN_USERNAME = "adm1"; + private static final String ADMIN_PASS = "adm1-pass"; + + private static final String UNAUTHORIZED_USER_USERNAME = "unathorized-usr"; + private static final String UNAUTHORIZED_USER_PASS = "unathorized-usr-pass"; + + @Autowired + private SecurityUtil securityUtil; + + @Override + protected List getRepositoryUrls() { + return List.of( // + "https://github.com/dirigiblelabs/sample-component-decorators.git", // + "https://github.com/dirigiblelabs/sample-entity-decorators.git", // + "https://github.com/dirigiblelabs/sample-extension-decorator.git", // + "https://github.com/dirigiblelabs/sample-job-decorator.git", // + "https://github.com/dirigiblelabs/sample-listener-decorator.git", // + "https://github.com/dirigiblelabs/sample-roles-decorator.git", // + "https://github.com/dirigiblelabs/sample-store-api.git", // + "https://github.com/dirigiblelabs/sample-websocket-decorator.git"); + } + + @Test + void componentDecorator() { + restAssuredExecutor.execute( // + () -> given().when() + .get("/services/ts/sample-component-decorators/OrderProcessor.ts") + .then() + .statusCode(200) + .body(equalToCompressingWhiteSpace("Do Payment: {\"status\":\"OK\",\"data\":\"123.45\"}"))); + } + + @Test + void entityDecorators() { + restAssuredExecutor.execute( // + () -> { + RequestSpecification requestSpec = new RequestSpecBuilder().setUrlEncodingEnabled(false) + .build(); + + // Use the spec where encoding is disabled otherwise limit param is encoded and skipped by the code + given().spec(requestSpec) + .queryParam("$limit", 3) + .get("/services/ts/sample-entity-decorators/CountryController.ts") + .then() + .statusCode(200) + .body(equalToCompressingWhiteSpace(COUNTRIES_RESPONSE_BODY)); + + // TODO: documentation texts from @Document annotations are not added to the open api response. Fix + // this issue and adapt the test. + String openApi = given().when() + .get("/services/openapi") + .then() + .statusCode(200) + .extract() + .asString(); + assertThat("the served OpenAPI document should match, ignoring the instance's own version", // + withoutVersion(openApi), equalToCompressingWhiteSpace(OPENAPI_RESPONSE_BODY)); + }, 60); + } + + /** + * The OpenAPI document with the instance's own {@code info.version} normalised to + * {@link #VERSION_PLACEHOLDER}, so the assertion survives every release and development version + * bump. + * + * @param openApi the served document + * @return the document with its version normalised + */ + private static String withoutVersion(String openApi) { + return OPENAPI_VERSION.matcher(openApi) + .replaceFirst("\"version\":\"" + VERSION_PLACEHOLDER + "\""); + } + + @Test + void extensionDecorator() { + restAssuredExecutor.execute( // + () -> given().when() + .get("/services/ts/sample-extension-decorator/OrderDiscount.ts") + .then() + .statusCode(200) + .body(equalToCompressingWhiteSpace("\"Discount: 5\""))); + } + + @Test + void jobDecorator() { + LogsAsserter consoleLogAsserter = new LogsAsserter("app.out", Level.INFO); + + // The job's cron fires every 10 seconds, so it logs again regardless of how long ago the + // sample was published - the asserter only sees messages logged after it attached. + await().atMost(60, TimeUnit.SECONDS) + .pollInterval(3, TimeUnit.SECONDS) + .until(() -> consoleLogAsserter.containsMessage("MyJob executed!", Level.INFO)); + } + + @Test + void listenerDecorator() { + LogsAsserter consoleLogAsserter = new LogsAsserter("app.out", Level.INFO); + + restAssuredExecutor.execute( // + () -> given().get("/services/js/sample-listener-decorator/OrderListenerTrigger.js") + .then() + .statusCode(200)); + + consoleLogAsserter.containsMessage("Hello from the OrderListener Trigger! Message: [ I am a message created at:", Level.INFO); + consoleLogAsserter.containsMessage("Processing message event: [ I am a message created at:", Level.INFO); + } + + @Test + void rolesDecorator() { + LogsAsserter consoleErrorLogAsserter = new LogsAsserter("app.err", Level.INFO); + + securityUtil.ensureUserInDefaultTenant(ADMIN_USERNAME, ADMIN_PASS, Roles.ADMINISTRATOR.getRoleName()); + restAssuredExecutor.execute(this::verifyAuthorizedUserAccess, ADMIN_USERNAME, ADMIN_PASS); + + securityUtil.ensureUserInDefaultTenant(UNAUTHORIZED_USER_USERNAME, UNAUTHORIZED_USER_PASS); + restAssuredExecutor.execute(() -> verifyUnauthorizedUserAccess(consoleErrorLogAsserter), UNAUTHORIZED_USER_USERNAME, + UNAUTHORIZED_USER_PASS); + } + + private void verifyAuthorizedUserAccess() { + // set default parser to enforce restassured json body validations + // since the response doesn't specify the content type + given().when() + .get("/services/ts/sample-roles-decorator/RolesCheck.ts") + .then() + .statusCode(200) + .using() + .defaultParser(Parser.JSON) + .body("message", equalTo("Roles Check")) + .body("user", equalTo(ADMIN_USERNAME)); + } + + private void verifyUnauthorizedUserAccess(LogsAsserter consoleErrorLogAsserter) { + given().when() + .get("/services/ts/sample-roles-decorator/RolesCheck.ts") + .then() + .statusCode(500); + + consoleErrorLogAsserter.assertLoggedMessage("Current user [" + UNAUTHORIZED_USER_USERNAME + + "] is not allowed to call module [RolesCheck]. Required some of roles [ADMINISTRATOR]", Level.ERROR); + } + + @Test + void storeApi() { + // Retry-on-AssertionError: if a late sync cycle re-registers the Customer entity and + // rebuilds its table between the init and the list (dropping the just-inserted rows and + // resetting the identity counter), the next attempt re-inits and converges. + restAssuredExecutor.execute( // + () -> { + given().when() + .get("/services/ts/sample-store-api/InitCustomers.ts") + .then() + .statusCode(200); + + given().when() + .get("/services/ts/sample-store-api/ListCustomers.ts") + .then() + .statusCode(200) + .body(equalToCompressingWhiteSpace(LIST_CUSTOMERS_RESPONSE_BODY)); + + given().when() + .get("/services/ts/sample-store-api/ComplexQueries.ts") + .then() + .statusCode(200) + .body(equalToCompressingWhiteSpace(COMPLEX_CUSTOMERS_RESPONSE_BODY)); + }, 90); + } + + @Test + void websocketDecorator() { + LogsAsserter consoleLogAsserter = new LogsAsserter("app.out", Level.INFO); + + // The only verification in the family that drives the browser. Every test gets a fresh Chrome + // (the base closes the driver after each), so the session has to be established here - the + // sample's page is behind authentication and would otherwise render the login form. + ide.openHomePage(); + + browser.openPath("/services/web/sample-websocket-decorator/order-websocket-page.html"); + + browser.enterTextInElementById("fromInput", "Test user"); + browser.clickOnElementById("connectBtn"); + + browser.enterTextInElementById("textInput", "A test message"); + browser.clickOnElementById("sendMessage"); + + browser.assertElementExistsByIdAndContainsText("response", "Test user: Hello from OrderWebsocket! [A test message]"); + + await().atMost(10, TimeUnit.SECONDS) + .pollInterval(1, TimeUnit.SECONDS) + .until(() -> consoleLogAsserter.containsMessage("Message received: A test message, from: Test user", Level.INFO)); + } + +} diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/WebsocketDecoratorSampleProjectIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/WebsocketDecoratorSampleProjectIT.java deleted file mode 100644 index a8894943a0c..00000000000 --- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/sample/WebsocketDecoratorSampleProjectIT.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2025 codbex or an codbex affiliate company and contributors - * - * All rights reserved. This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v20.html - * - * SPDX-FileCopyrightText: 2025 codbex or an codbex affiliate company and contributors - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.dirigible.integration.tests.ui.tests.sample; - -import ch.qos.logback.classic.Level; -import org.eclipse.dirigible.tests.framework.logging.LogsAsserter; -import org.junit.jupiter.api.BeforeEach; - -import java.util.concurrent.TimeUnit; - -import static org.awaitility.Awaitility.await; - -public class WebsocketDecoratorSampleProjectIT extends SampleProjectRepositoryIT { - - private LogsAsserter consoleLogAsserter; - - @BeforeEach - void setUp() { - this.consoleLogAsserter = new LogsAsserter("app.out", Level.INFO); - } - - @Override - protected void verifyProject() { - browser.openPath("/services/web/sample-websocket-decorator/order-websocket-page.html"); - - browser.enterTextInElementById("fromInput", "Test user"); - browser.clickOnElementById("connectBtn"); - - browser.enterTextInElementById("textInput", "A test message"); - browser.clickOnElementById("sendMessage"); - - browser.assertElementExistsByIdAndContainsText("response", "Test user: Hello from OrderWebsocket! [A test message]"); - - await().atMost(10, TimeUnit.SECONDS) - .pollInterval(1, TimeUnit.SECONDS) - .until(() -> consoleLogAsserter.containsMessage("Message received: A test message, from: Test user", Level.INFO)); - } - - @Override - protected String getRepositoryURL() { - return "https://github.com/dirigiblelabs/sample-websocket-decorator.git"; - } - -}