[TEST] Convert 'expectModelContainsMessageFlow' in Jest extension 'to…

…BeMessageFlow' (#744)
process-analytics · Oct 14, 2020 · ce3f62d · ce3f62d
1 parent 5091204
commit ce3f62d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/test/e2e/ExpectModelUtils.ts b/test/e2e/ExpectModelUtils.ts
@@ -18,7 +18,7 @@ import { FlowKind } from '../../src/model/bpmn/internal/edge/FlowKind';
 import { MessageVisibleKind } from '../../src/model/bpmn/internal/edge/MessageVisibleKind';
 import { SequenceFlowKind } from '../../src/model/bpmn/internal/edge/SequenceFlowKind';
 import BpmnVisualization from '../../src/component/BpmnVisualization';
-import { toBeCell, withGeometry, withFont, toBeEdge, toBeSequenceFlow } from './matchers';
+import { toBeCell, withGeometry, withFont, toBeEdge, toBeSequenceFlow, toBeMessageFlow } from './matchers';
 
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
@@ -29,6 +29,7 @@ declare global {
       withFont(font: ExpectedFont): R;
       toBeEdge(modelElement: ExpectedEdgeModelElement): R;
       toBeSequenceFlow(modelElement: ExpectedSequenceFlowModelElement): R;
+      toBeMessageFlow(modelElement: ExpectedEdgeModelElement): R;
     }
   }
 }
@@ -39,6 +40,7 @@ expect.extend({
   withFont,
   toBeEdge,
   toBeSequenceFlow,
+  toBeMessageFlow,
 });
 
 export interface ExpectedFont {
@@ -131,10 +133,6 @@ export function expectModelContainsShape(cellId: string, modelElement: ExpectedS
   return cell;
 }
 
-export function expectModelContainsMessageFlow(cellId: string, modelElement: ExpectedEdgeModelElement): void {
-  expect(cellId).toBeEdge({ ...modelElement, kind: FlowKind.MESSAGE_FLOW, startArrow: mxConstants.ARROW_OVAL, endArrow: 'blockThin' });
-}
-
 export function expectModelContainsAssociationFlow(cellId: string, modelElement: ExpectedEdgeModelElement): void {
   expect(cellId).toBeEdge({ ...modelElement, kind: FlowKind.ASSOCIATION_FLOW });
 }

diff --git a/test/e2e/matchers/index.ts b/test/e2e/matchers/index.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { toBeEdge, toBeSequenceFlow } from './toBeEdge';
+export { toBeEdge, toBeSequenceFlow, toBeMessageFlow } from './toBeEdge';
 export { toBeCell } from './toBeCell';
 export { withGeometry } from './withGeometry';
 export { withFont } from './withFont';
diff --git a/test/e2e/matchers/toBeEdge/index.ts b/test/e2e/matchers/toBeEdge/index.ts
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ExpectedEdgeModelElement, ExpectedSequenceFlowModelElement } from '../../ExpectModelUtils';
 import { buildExpectedCell, buildReceivedCell, getCell, EXPECTED_LABEL, RECEIVED_LABEL } from '../matcherUtils';
 import MatcherContext = jest.MatcherContext;
 import CustomMatcherResult = jest.CustomMatcherResult;
 import { FlowKind } from '../../../../src/model/bpmn/internal/edge/FlowKind';
+import { ExpectedEdgeModelElement, ExpectedSequenceFlowModelElement } from '../../ExpectModelUtils';
 
 function buildEdgeMatcher(matcherName: string, matcherContext: MatcherContext, received: string, expected: ExpectedEdgeModelElement): CustomMatcherResult {
   const options = {
@@ -65,3 +65,7 @@ export function toBeEdge(this: MatcherContext, received: string, expected: Expec
 export function toBeSequenceFlow(this: MatcherContext, received: string, expected: ExpectedSequenceFlowModelElement): CustomMatcherResult {
   return buildEdgeMatcher('toBeSequenceFlow', this, received, { ...expected, kind: FlowKind.SEQUENCE_FLOW, endArrow: 'blockThin' });
 }
+
+export function toBeMessageFlow(this: MatcherContext, received: string, expected: ExpectedEdgeModelElement): CustomMatcherResult {
+  return buildEdgeMatcher('toBeMessageFlow', this, received, { ...expected, kind: FlowKind.MESSAGE_FLOW, startArrow: mxConstants.ARROW_OVAL, endArrow: 'blockThin' });
+}
diff --git a/test/e2e/mxGraph.model.test.ts b/test/e2e/mxGraph.model.test.ts
@@ -30,7 +30,6 @@ import {
   expectModelContainsPool,
   expectModelContainsShape,
   expectModelContainsSubProcess,
-  expectModelContainsMessageFlow,
   expectModelNotContainCell,
   expectModelContainsCellWithGeometry,
   getDefaultParentId,
@@ -816,17 +815,17 @@ describe('mxGraph model', () => {
     });
 
     // message flow
-    expectModelContainsMessageFlow('message_flow_initiating_message_id', {
+    expect('message_flow_initiating_message_id').toBeMessageFlow({
       label: 'Message Flow with initiating message',
       messageVisibleKind: MessageVisibleKind.INITIATING,
       verticalAlign: 'bottom',
     });
-    expectModelContainsMessageFlow('message_flow_non_initiating_message_id', {
+    expect('message_flow_non_initiating_message_id').toBeMessageFlow({
       label: 'Message Flow with non-initiating message',
       messageVisibleKind: MessageVisibleKind.NON_INITIATING,
       verticalAlign: 'bottom',
     });
-    expectModelContainsMessageFlow('message_flow_no_visible_id', { label: 'Message Flow without message', messageVisibleKind: MessageVisibleKind.NONE, verticalAlign: 'bottom' });
+    expect('message_flow_no_visible_id').toBeMessageFlow({ label: 'Message Flow without message', messageVisibleKind: MessageVisibleKind.NONE, verticalAlign: 'bottom' });
 
     // association
     expectModelContainsAssociationFlow('association_id', { kind: FlowKind.ASSOCIATION_FLOW, parentId: 'participant_1_id', verticalAlign: 'bottom' });