Skip to content

Commit df413f8

Browse files
mcharfadiAxelRICHARD
authored andcommitted
[1860] Add preconditionExpression to some NodeDescriptionProvider
Bug: #1860 Signed-off-by: Michaël Charfadi <michael.charfadi@obeosoft.com> Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
1 parent ddf7d17 commit df413f8

24 files changed

Lines changed: 244 additions & 235 deletions

CHANGELOG.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ The property `SysONTestsProperties#ELASTICSEARCH` has been removed, tests that r
3434
- https://github.com/eclipse-syson/syson/issues/1887[#1887] [export] Export fails to escape some names when using qualified name.
3535
- https://github.com/eclipse-syson/syson/issues/1953[#1953] [import] Fix an issue where `TransitionUsage` with `SendActionUsage` were not properly resolved.
3636
- https://github.com/eclipse-syson/syson/issues/1973[#1973] [import] Fix an error during textual import when resolving the name of an unnamed redefined `Feature`.
37+
- https://github.com/eclipse-syson/syson/issues/1860[#1860] [diagrams] Add a precondition for compartment item node descriptions in order to filter out unwanted types.
38+
For example `ViewUsage` elements are no longer rendered in _parts_ compartments.
3739

3840
=== Improvements
3941

backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/compartments/ActionFlowTests.java

Lines changed: 52 additions & 44 deletions
Large diffs are not rendered by default.

backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/general/view/GVIncludeUseCaseUsageTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,9 @@ public void checkIncludeUsageActionCreation() {
167167
.verify(Duration.ofSeconds(10));
168168
}
169169

170-
@Test
171170
@DisplayName("GIVEN an IncludeUseCaseUsage, WHEN reconnecting the target, THEN the new target of the IncludeUseCaseUsage is correct")
172171
@GivenSysONServer({ IncludeUseCaseUsageProjectData.SCRIPT_PATH })
173-
172+
@Test
174173
public void reconnectIncludeUsaceCaseUsageTarget() {
175174
var flux = this.givenSubscriptionToDiagram();
176175

@@ -210,9 +209,9 @@ public void reconnectIncludeUsaceCaseUsageTarget() {
210209
.verify(Duration.ofSeconds(10));
211210
}
212211

213-
@Test
214212
@DisplayName("GIVEN an IncludeUseCaseUsage, WHEN reconnecting the source, THEN the new source of the IncludeUseCaseUsage is correct")
215213
@GivenSysONServer({ IncludeUseCaseUsageProjectData.SCRIPT_PATH })
214+
@Test
216215
public void reconnectIncludeUseCaseUsageSource() {
217216
var flux = this.givenSubscriptionToDiagram();
218217

backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/general/view/GVStateDoActionWithReferencedActionTests.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.eclipse.sirius.components.view.emf.diagram.IDiagramIdProvider;
3535
import org.eclipse.sirius.web.tests.services.api.IGivenInitialServerState;
3636
import org.eclipse.syson.AbstractIntegrationTests;
37+
import org.eclipse.syson.GivenSysONServer;
3738
import org.eclipse.syson.application.controllers.diagrams.testers.ToolTester;
3839
import org.eclipse.syson.application.data.GeneralViewEmptyTestProjectData;
3940
import org.eclipse.syson.services.diagrams.DiagramDescriptionIdProvider;
@@ -48,8 +49,6 @@
4849
import org.junit.jupiter.api.Test;
4950
import org.springframework.beans.factory.annotation.Autowired;
5051
import org.springframework.boot.test.context.SpringBootTest;
51-
import org.springframework.test.context.jdbc.Sql;
52-
import org.springframework.test.context.jdbc.SqlConfig;
5352
import org.springframework.transaction.annotation.Transactional;
5453

5554
import reactor.core.publisher.Flux;
@@ -94,11 +93,9 @@ public void beforeEach() {
9493
this.givenInitialServerState.initialize();
9594
}
9695

97-
@Test
98-
@Sql(scripts = { GeneralViewEmptyTestProjectData.SCRIPT_PATH }, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD,
99-
config = @SqlConfig(transactionMode = SqlConfig.TransactionMode.ISOLATED))
100-
@Sql(scripts = { "/scripts/cleanup.sql" }, executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD, config = @SqlConfig(transactionMode = SqlConfig.TransactionMode.ISOLATED))
10196
@DisplayName("GIVEN a General View with a state and action, WHEN invoking do action with referenced action, THEN the PerformActionUsage is visible in the state")
97+
@GivenSysONServer({ GeneralViewEmptyTestProjectData.SCRIPT_PATH })
98+
@Test
10299
public void checkPerformActionRevealInState() {
103100
var flux = this.givenSubscriptionToDiagram();
104101

@@ -160,9 +157,8 @@ public void checkPerformActionRevealInState() {
160157
assertThat(diagram.getEdges()).isEmpty();
161158
DiagramNavigator navigator = new DiagramNavigator(diagram);
162159
Collection<Node> visibleNodes = navigator.findAllNodes().stream().filter(node -> node.getState() == ViewModifier.Normal).toList();
163-
assertThat(visibleNodes.stream().filter(node -> node.getInsideLabel().getText().equals("actions"))).hasSize(1).allMatch(node -> node.getChildNodes().size() == 1);
164160
assertThat(visibleNodes.stream().filter(node -> node.getInsideLabel().getText().equals("perform actions"))).hasSize(1).allMatch(node -> node.getChildNodes().size() == 1);
165-
assertThat(visibleNodes.stream().filter(node -> node.getInsideLabel().getText().equals("ref do ::> action1"))).hasSize(2);
161+
assertThat(visibleNodes.stream().filter(node -> node.getInsideLabel().getText().equals("ref do ::> action1"))).hasSize(1);
166162
}, () -> fail("Missing diagram"));
167163

168164
StepVerifier.create(flux)

0 commit comments

Comments
 (0)