@eclipse-glsp/server 1.1.0-RC05 → 1.1.0-next.385269d.45

package/src/common/test/mock-util.ts

@@ -25,11 +25,13 @@ import {
     EdgeTypeHint,
     InitializeClientSessionParameters,
     MaybeArray,
+    MaybePromise,
     Point,
     RequestEditValidationAction,
     ShapeTypeHint,
     ValidationStatus
 } from '@eclipse-glsp/protocol';
+import { expect } from 'chai';
 import { Container } from 'inversify';
 import { MessageConnection } from 'vscode-jsonrpc';
 import { ActionDispatcher } from '../actions/action-dispatcher';
@@ -53,6 +55,25 @@ export async function delay(ms: number): Promise<void> {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
 
+/**
+ * Consumes a maybe async function and checks for error
+ * @param  method - The function to check
+ * @param  message - Optional message to match with error message
+ */
+export async function expectToThrowAsync(toEvaluate: () => MaybePromise<void>, message?: string): Promise<void> {
+    let err: Error | undefined = undefined;
+    try {
+        await toEvaluate();
+    } catch (error: any) {
+        err = error;
+    }
+    if (message) {
+        expect(err?.message).to.be.equal(message);
+    } else {
+        expect(err).to.be.an('Error');
+    }
+}
+
 export function createClientSession(
     id: string,
     diagramType: string,

package/src/common/utils/layout-util.ts

@@ -27,7 +27,7 @@ import { getOrThrow, GLSPServerError } from './glsp-server-error';
  * @param index  The model index.
  * @returns The changed element.
  */
-export function applyBounds(bounds: ElementAndBounds, index: GModelIndex): GBoundsAware | undefined {
+export function applyElementAndBounds(bounds: ElementAndBounds, index: GModelIndex): GBoundsAware | undefined {
     const element = getOrThrow(index.get(bounds.elementId), 'Model element not found! ID: ' + bounds.elementId);
     if (isGBoundsAware(element)) {
         if (bounds.newPosition !== undefined) {