Skip to content

Include workspace property sets in the property filter dialog 馃 - #3240

Merged
lwrage merged 2 commits into
masterfrom
3234_preserve_workspace_property_sets
Sep 17, 2026
Merged

lwrage merged 2 commits into
masterfrom
3234_preserve_workspace_property_sets

Conversation

@lwrage

@lwrage lwrage commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

Fixes #3234

Confirming the property-set filter dialog previously hid workspace property sets because the dialog only offered contributed sets. The dialog now reads workspace property sets from the Xtext index and makes them individually selectable under Workspace Property Sets, immediately after Predeclared Property Sets. The predeclared group label no longer contains underscores.

Issue3234Test replaces the previous characterization with a separate, validated AADL model project. It reproduces workspace properties disappearing after Select All, then verifies the fix, group ordering, an unimported workspace set, individual and group checkboxes, reopening, and cancellation. The branch contains the regression commit followed by the production fix.

Validation

The regression failed before the fix with both workspace sets missing from the view and the old underscored group label. After the fix, both regression tests passed:

mvn -o -s releng/osate.releng/settings.xml -Plocal,with-ui-tests \
  -pl :org.osate.xtext.aadl2.ui,:org.osate.core.feature,:org.osate.ui.tests \
  -Dtycho.localArtifacts=default -Dpr.build=true -Dsign=false \
  -Dspotbugs=false -Dcodecoverage=false -Djavadoc=false \
  -Dtest=Issue3234Test -DfailIfNoTests=false clean install

The clean root reactor passed all 144 modules and 1,690 tests, including 53 UI tests, with zero failures, errors, or skips:

mvn -o -T5 -s releng/osate.releng/settings.xml -Plocal,with-ui-tests \
  -Dtycho.localArtifacts=ignore -Dpr.build=true -Dsign=false \
  -Dspotbugs=false -Dcodecoverage=false -Djavadoc=false \
  -DfailIfNoTests=false -fae clean install

Scope and dependencies

Targets master with no dependencies on unmerged PRs. Risk is limited to property-view filter selection and presentation; the change uses the existing URI-based filter and checkbox behavior, and workspace discovery relies on the Xtext index.

Replace the property-set filter characterization with a minimal SWTBot regression using two assigned workspace property sets and a contributed set. Validate the fixture before checking that Select All preserves workspace properties.

Cover the requested group labels and order, an unimported workspace set, individual and group selection, reopening, and cancellation. Both tests fail on the existing dialog for the reported behavior.
Read workspace property sets from the Xtext index whenever the property view opens its filter dialog. Offer them in a Workspace Property Sets group immediately after the renamed Predeclared Property Sets group.

Use the same URI-based selection and checkbox propagation for workspace and contributed sets so Select All restores workspace properties and individual selections survive reopening. Fixes #3234.
@lwrage
lwrage merged commit 7b9f204 into master Sep 17, 2026
1 check passed
@lwrage
lwrage deleted the 3234_preserve_workspace_property_sets branch September 17, 2026 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

AADL Property Values view hides workspace property sets once a property set filter is applied 馃

2 participants