-
Notifications
You must be signed in to change notification settings - Fork 83
[2174] Add the support for frame edge #2191
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
gcoutable
wants to merge
1
commit into
main
Choose a base branch
from
gco/enh/frames-relationship
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
188 changes: 188 additions & 0 deletions
188
...org/eclipse/syson/application/controllers/diagrams/general/view/GVFramedConcernTests.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2026 Obeo. | ||
| * 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 | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Obeo - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.syson.application.controllers.diagrams.general.view; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.InstanceOfAssertFactories.type; | ||
| import static org.eclipse.sirius.components.diagrams.tests.DiagramEventPayloadConsumer.assertRefreshedDiagramThat; | ||
| import static org.eclipse.sirius.components.diagrams.tests.assertions.DiagramInstanceOfAssertFactories.EDGE; | ||
| import static org.eclipse.sirius.components.diagrams.tests.assertions.DiagramInstanceOfAssertFactories.EDGE_STYLE; | ||
|
|
||
| import java.time.Duration; | ||
| import java.util.List; | ||
| import java.util.UUID; | ||
| import java.util.concurrent.atomic.AtomicReference; | ||
| import java.util.function.Consumer; | ||
|
|
||
| import org.eclipse.emf.ecore.EClass; | ||
| import org.eclipse.sirius.components.collaborative.diagrams.dto.DiagramEventInput; | ||
| import org.eclipse.sirius.components.collaborative.diagrams.dto.DiagramRefreshedEventPayload; | ||
| import org.eclipse.sirius.components.core.api.IObjectSearchService; | ||
| import org.eclipse.sirius.components.diagrams.ArrowStyle; | ||
| import org.eclipse.sirius.components.diagrams.Diagram; | ||
| import org.eclipse.sirius.components.diagrams.Edge; | ||
| import org.eclipse.sirius.components.diagrams.Label; | ||
| import org.eclipse.sirius.components.diagrams.ViewModifier; | ||
| import org.eclipse.sirius.components.view.emf.diagram.IDiagramIdProvider; | ||
| import org.eclipse.sirius.web.tests.services.api.IGivenInitialServerState; | ||
| import org.eclipse.syson.AbstractIntegrationTests; | ||
| import org.eclipse.syson.GivenSysONServer; | ||
| import org.eclipse.syson.application.controller.editingcontext.checkers.SemanticCheckerService; | ||
| import org.eclipse.syson.application.controllers.diagrams.testers.EdgeCreationTester; | ||
| import org.eclipse.syson.application.data.GeneralViewWithTopNodesTestProjectData; | ||
| import org.eclipse.syson.services.SemanticRunnableFactory; | ||
| import org.eclipse.syson.services.diagrams.DiagramComparator; | ||
| import org.eclipse.syson.services.diagrams.DiagramDescriptionIdProvider; | ||
| import org.eclipse.syson.services.diagrams.api.IGivenDiagramDescription; | ||
| import org.eclipse.syson.services.diagrams.api.IGivenDiagramSubscription; | ||
| import org.eclipse.syson.standard.diagrams.view.SDVDescriptionNameGenerator; | ||
| import org.eclipse.syson.sysml.FramedConcernMembership; | ||
| import org.eclipse.syson.sysml.SysmlPackage; | ||
| import org.eclipse.syson.sysml.helper.LabelConstants; | ||
| import org.eclipse.syson.util.IDescriptionNameGenerator; | ||
| import org.eclipse.syson.util.SysONRepresentationDescriptionIdentifiers; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| import reactor.core.publisher.Flux; | ||
| import reactor.test.StepVerifier; | ||
|
|
||
| /** | ||
| * {@link org.eclipse.syson.sysml.FramedConcernMembership} related test in General View. | ||
| * | ||
| * @author gcoutable | ||
| */ | ||
| @Transactional | ||
| @GivenSysONServer({ GeneralViewWithTopNodesTestProjectData.SCRIPT_PATH }) | ||
| @SuppressWarnings("checkstyle:MultipleStringLiterals") | ||
| @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) | ||
| public class GVFramedConcernTests extends AbstractIntegrationTests { | ||
|
|
||
| @Autowired | ||
| private IGivenInitialServerState givenInitialServerState; | ||
|
|
||
| @Autowired | ||
| private IGivenDiagramSubscription givenDiagramSubscription; | ||
|
|
||
| @Autowired | ||
| private IGivenDiagramDescription givenDiagramDescription; | ||
|
|
||
| @Autowired | ||
| private IDiagramIdProvider diagramIdProvider; | ||
|
|
||
| @Autowired | ||
| private DiagramComparator diagramComparator; | ||
|
|
||
| @Autowired | ||
| private SemanticRunnableFactory semanticRunnableFactory; | ||
|
|
||
| @Autowired | ||
| private IObjectSearchService objectSearchService; | ||
|
|
||
| @Autowired | ||
| private EdgeCreationTester edgeCreationTester; | ||
|
|
||
| private final IDescriptionNameGenerator descriptionNameGenerator = new SDVDescriptionNameGenerator(); | ||
|
|
||
| private SemanticCheckerService semanticCheckerService; | ||
|
|
||
| private Flux<DiagramRefreshedEventPayload> givenSubscriptionToDiagram() { | ||
| var diagramEventInput = new DiagramEventInput(UUID.randomUUID(), GeneralViewWithTopNodesTestProjectData.EDITING_CONTEXT_ID, GeneralViewWithTopNodesTestProjectData.GraphicalIds.DIAGRAM_ID); | ||
| return this.givenDiagramSubscription.subscribe(diagramEventInput); | ||
| } | ||
|
|
||
| @BeforeEach | ||
| public void setUp() { | ||
| this.givenInitialServerState.initialize(); | ||
| this.semanticCheckerService = new SemanticCheckerService(this.semanticRunnableFactory, this.objectSearchService, GeneralViewWithTopNodesTestProjectData.EDITING_CONTEXT_ID, | ||
| GeneralViewWithTopNodesTestProjectData.SemanticIds.PACKAGE_1_ID); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCreateFramedConcernWithEdgeBetweenRequirementUsageAndConcernUsage() { | ||
| this.createFramedConcernWithEdge(SysmlPackage.eINSTANCE.getRequirementUsage(), GeneralViewWithTopNodesTestProjectData.GraphicalIds.REQUIREMENT_USAGE_ID, "requirement"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCreateFramedConcernWithEdgeBetweenRequirementDefinitionAndConcernUsage() { | ||
| this.createFramedConcernWithEdge(SysmlPackage.eINSTANCE.getRequirementDefinition(), GeneralViewWithTopNodesTestProjectData.GraphicalIds.REQUIREMENT_DEFINITION_ID, "RequirementDefinition"); | ||
| } | ||
|
|
||
| private void createFramedConcernWithEdge(EClass parentEClass, String graphicalSourceNodeId, String parentLabel) { | ||
| var flux = this.givenSubscriptionToDiagram(); | ||
|
|
||
| var diagramDescription = this.givenDiagramDescription.getDiagramDescription(GeneralViewWithTopNodesTestProjectData.EDITING_CONTEXT_ID, | ||
| SysONRepresentationDescriptionIdentifiers.GENERAL_VIEW_DIAGRAM_DESCRIPTION_ID); | ||
| var diagramDescriptionIdProvider = new DiagramDescriptionIdProvider(diagramDescription, this.diagramIdProvider); | ||
|
|
||
| var edgeCreationToolId = diagramDescriptionIdProvider.getEdgeCreationToolId( | ||
| this.descriptionNameGenerator.getNodeName(parentEClass), | ||
| "New framed Concern"); | ||
|
|
||
| AtomicReference<Diagram> diagram = new AtomicReference<>(); | ||
| Consumer<Object> initialDiagramContentConsumer = assertRefreshedDiagramThat(diagram::set); | ||
|
|
||
| Runnable createEdgeRunnable = () -> this.edgeCreationTester.createEdgeUsingNodeId(GeneralViewWithTopNodesTestProjectData.EDITING_CONTEXT_ID, | ||
| diagram, | ||
| graphicalSourceNodeId, | ||
| GeneralViewWithTopNodesTestProjectData.GraphicalIds.CONCERN_USAGE_ID, | ||
| edgeCreationToolId); | ||
|
|
||
| Consumer<Object> diagramContentConsumerAfterNewEdge = assertRefreshedDiagramThat(newDiagram -> { | ||
| var newEdges = this.diagramComparator.newEdges(diagram.get(), newDiagram); | ||
| var newVisibleEdges = newEdges.stream().filter(edge -> edge.getState() != ViewModifier.Hidden).toList(); | ||
|
|
||
| assertThat(newVisibleEdges).hasSize(1).first(EDGE) | ||
| .hasSourceId(graphicalSourceNodeId) | ||
| .hasTargetId(GeneralViewWithTopNodesTestProjectData.GraphicalIds.CONCERN_USAGE_ID) | ||
| .extracting(Edge::getCenterLabel) | ||
| .extracting(Label::text) | ||
| .hasToString(LabelConstants.OPEN_QUOTE + LabelConstants.FRAME + LabelConstants.CLOSE_QUOTE); | ||
|
|
||
| assertThat(newVisibleEdges).hasSize(1).first(EDGE) | ||
| .extracting(Edge::getStyle, EDGE_STYLE) | ||
| .hasSourceArrow(ArrowStyle.None) | ||
| .hasTargetArrow(ArrowStyle.InputArrow); | ||
| }); | ||
|
|
||
| Consumer<Object> additionalCheck = object -> { | ||
| assertThat(object).isInstanceOf(List.class) | ||
| .asInstanceOf(type(List.class)) | ||
| .satisfies(framedConcerns -> { | ||
| assertThat((List<?>) framedConcerns).size().isEqualTo(1); | ||
| assertThat(framedConcerns.getFirst()) | ||
| .isInstanceOf(FramedConcernMembership.class) | ||
| .asInstanceOf(type(FramedConcernMembership.class)) | ||
| .satisfies(framedConcernMembership -> { | ||
| var ownedConcern = framedConcernMembership.getOwnedConcern(); | ||
| var ownedSubsetting = ownedConcern.getOwnedSubsetting(); | ||
| assertThat(ownedSubsetting).isNotEmpty(); | ||
| assertThat(ownedSubsetting.getFirst().getSubsettedFeature()).isEqualTo(framedConcernMembership.getReferencedConcern()); | ||
| }); | ||
| }); | ||
| }; | ||
|
|
||
| Runnable semanticCheck = this.semanticCheckerService.checkEditingContext(this.semanticCheckerService.getElementInParentSemanticChecker(parentLabel, SysmlPackage.eINSTANCE.getElement_OwnedRelationship(), SysmlPackage.eINSTANCE.getFramedConcernMembership(), additionalCheck)); | ||
|
|
||
| StepVerifier.create(flux) | ||
| .consumeNextWith(initialDiagramContentConsumer) | ||
| .then(createEdgeRunnable) | ||
| .consumeNextWith(diagramContentConsumerAfterNewEdge) | ||
| .then(semanticCheck) | ||
| .thenCancel() | ||
| .verify(Duration.ofSeconds(10)); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing javadoc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done