Subscriber Later Binding (GOOSE): Disconnect FCDA from ExtRef (openscd#1002)

juancho0202 · web-flow · commit 460c99e25cdd · 2022-09-13T10:16:41.000+02:00
* refactor: getExtrefLaterBindingList and getFCDALaterBindingList for reusability

* test: disconnect FCDA from ExtRef

* chore: renaming ext-ref list file

* fix: moving test helper methods to test-support.ts

* fix: typo in tests descriptions
diff --git a/src/editors/GooseSubscriberLaterBinding.ts b/src/editors/GooseSubscriberLaterBinding.ts
@@ -1,7 +1,7 @@
 import { LitElement, property, html, TemplateResult, css } from 'lit-element';
 
 import './subscription/later-binding/fcda-later-binding-list.js';
-import './subscription/later-binding/ext-ref-laterbinding-list.js';
+import './subscription/later-binding/ext-ref-later-binding-list.js';
 
 export default class GooseSubscribeLaterBindingPlugin extends LitElement {
   @property({ attribute: false })
diff --git a/src/editors/SMVSubscriberLaterBinding.ts b/src/editors/SMVSubscriberLaterBinding.ts
@@ -1,7 +1,7 @@
 import { css, html, LitElement, property, TemplateResult } from 'lit-element';
 
 import './subscription/later-binding/fcda-later-binding-list.js';
-import './subscription/later-binding/ext-ref-laterbinding-list.js';
+import './subscription/later-binding/ext-ref-later-binding-list.js';
 
 /** An editor [[`plugin`]] for Subscribe Later Binding (SMV). */
 export default class SMVSubscribeLaterBindingPlugin extends LitElement {
diff --git a/src/editors/subscription/later-binding/ext-ref-later-binding-list.ts b/src/editors/subscription/later-binding/ext-ref-later-binding-list.ts
diff --git a/test/integration/editors/GooseSubscriberLaterBinding.test.ts b/test/integration/editors/GooseSubscriberLaterBinding.test.ts
@@ -0,0 +1,64 @@
+import { expect, fixture, html } from '@open-wc/testing';
+import { Wizarding } from '../../../src/Wizarding.js';
+import { Editing } from '../../../src/Editing.js';
+
+import GooseSubscriberLaterBinding from '../../../src/editors/GooseSubscriberLaterBinding.js';
+import {
+  getExtrefLaterBindingList,
+  getFCDALaterBindingList,
+} from './test-support.js';
+
+describe('GOOSE Subscribe Later Binding Plugin', () => {
+  customElements.define(
+    'goose-subscriber-later-binding-plugin',
+    Wizarding(Editing(GooseSubscriberLaterBinding))
+  );
+
+  let element: GooseSubscriberLaterBinding;
+  let doc: XMLDocument;
+
+  beforeEach(async () => {
+    doc = await fetch('/test/testfiles/editors/LaterBindingGOOSE2007B4.scd')
+      .then(response => response.text())
+      .then(str => new DOMParser().parseFromString(str, 'application/xml'));
+
+    element = await fixture(
+      html`<goose-subscriber-later-binding-plugin
+        .doc="${doc}"
+      ></goose-subscriber-later-binding-plugin>`
+    );
+  });
+
+  it('when unsubscribing a subscribed ExtRef then the lists are changed', async () => {
+    const gooseListElement = getFCDALaterBindingList(element);
+    const extRefListElement = getExtrefLaterBindingList(element);
+
+    (<HTMLElement>(
+      gooseListElement.shadowRoot!.querySelector(
+        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)"]'
+      )
+    )).click();
+    await element.requestUpdate();
+    await extRefListElement.requestUpdate();
+
+    expect(
+      extRefListElement['getSubscribedExtRefElements']().length
+    ).to.be.equal(2);
+    expect(
+      extRefListElement['getAvailableExtRefElements']().length
+    ).to.be.equal(2);
+    (<HTMLElement>(
+      extRefListElement.shadowRoot!.querySelector(
+        'mwc-list-item[value="GOOSE_Subscriber>>Earth_Switch> CSWI 1>GOOSE:GOOSE2 QB2_Disconnector/ LLN0  GOOSE_Publisher QB2_Disconnector/ CSWI 1 Pos q@Pos;CSWI1/Pos/q"]'
+      )
+    )).click();
+    await element.requestUpdate();
+
+    expect(
+      extRefListElement['getSubscribedExtRefElements']().length
+    ).to.be.equal(1);
+    expect(
+      extRefListElement['getAvailableExtRefElements']().length
+    ).to.be.equal(3);
+  });
+});
diff --git a/test/integration/editors/SMVSubscriberLaterBinding.test.ts b/test/integration/editors/SMVSubscriberLaterBinding.test.ts
@@ -4,8 +4,10 @@ import { Wizarding } from '../../../src/Wizarding.js';
 import { Editing } from '../../../src/Editing.js';
 
 import SMVSubscribeLaterBindingPlugin from '../../../src/editors/SMVSubscriberLaterBinding.js';
-import { ExtRefLaterBindingList } from '../../../src/editors/subscription/later-binding/ext-ref-laterbinding-list.js';
-import { FCDALaterBindingList } from '../../../src/editors/subscription/later-binding/fcda-later-binding-list.js';
+import {
+  getExtrefLaterBindingList,
+  getFCDALaterBindingList,
+} from './test-support.js';
 
 describe('SMV Subscribe Later Binding plugin', () => {
   customElements.define(
@@ -28,9 +30,9 @@ describe('SMV Subscribe Later Binding plugin', () => {
     await element.requestUpdate();
   });
 
-  it('when subscribing an available ExtRef then the list are changed', async () => {
-    const svcListElement = getFCDALaterBindingList();
-    const extRefListElement = getExtrefLaterBindingList();
+  it('when subscribing an available ExtRef then the lists are changed', async () => {
+    const svcListElement = getFCDALaterBindingList(element);
+    const extRefListElement = getExtrefLaterBindingList(element);
 
     (<HTMLElement>(
       svcListElement.shadowRoot!.querySelector(
@@ -61,9 +63,9 @@ describe('SMV Subscribe Later Binding plugin', () => {
     ).to.be.equal(7);
   });
 
-  it('when unsubscribing a subscribed ExtRef then the list are changed', async () => {
-    const svcListElement = getFCDALaterBindingList();
-    const extRefListElement = getExtrefLaterBindingList();
+  it('when unsubscribing a subscribed ExtRef then the lists are changed', async () => {
+    const svcListElement = getFCDALaterBindingList(element);
+    const extRefListElement = getExtrefLaterBindingList(element);
 
     (<HTMLElement>(
       svcListElement.shadowRoot!.querySelector(
@@ -93,16 +95,4 @@ describe('SMV Subscribe Later Binding plugin', () => {
       extRefListElement['getAvailableExtRefElements']().length
     ).to.be.equal(9);
   });
-
-  function getFCDALaterBindingList(): FCDALaterBindingList {
-    return <FCDALaterBindingList>(
-      element.shadowRoot?.querySelector('fcda-later-binding-list')
-    );
-  }
-
-  function getExtrefLaterBindingList(): ExtRefLaterBindingList {
-    return <ExtRefLaterBindingList>(
-      element.shadowRoot?.querySelector('extref-later-binding-list')
-    );
-  }
 });
diff --git a/test/integration/editors/test-support.ts b/test/integration/editors/test-support.ts
@@ -0,0 +1,20 @@
+import { ExtRefLaterBindingList } from '../../../src/editors/subscription/later-binding/ext-ref-later-binding-list.js';
+import { FCDALaterBindingList } from '../../../src/editors/subscription/later-binding/fcda-later-binding-list.js';
+import GooseSubscribeLaterBindingPlugin from '../../../src/editors/GooseSubscriberLaterBinding.js';
+import SMVSubscriberLaterBindingPlugin from '../../../src/editors/SMVSubscriberLaterBinding.js';
+
+export function getFCDALaterBindingList(
+  element: SMVSubscriberLaterBindingPlugin | GooseSubscribeLaterBindingPlugin
+): FCDALaterBindingList {
+  return <FCDALaterBindingList>(
+    element.shadowRoot?.querySelector('fcda-later-binding-list')
+  );
+}
+
+export function getExtrefLaterBindingList(
+  element: SMVSubscriberLaterBindingPlugin | GooseSubscribeLaterBindingPlugin
+): ExtRefLaterBindingList {
+  return <ExtRefLaterBindingList>(
+    element.shadowRoot?.querySelector('extref-later-binding-list')
+  );
+}
diff --git a/test/unit/editors/subscription/later-binding/ext-ref-laterbinding-list.test.ts b/test/unit/editors/subscription/later-binding/ext-ref-laterbinding-list.test.ts
@@ -1,9 +1,9 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import '../../../../../src/editors/subscription/later-binding/ext-ref-laterbinding-list.js';
+import '../../../../../src/editors/subscription/later-binding/ext-ref-later-binding-list.js';
 
 import { newFcdaSelectEvent } from '../../../../../src/editors/subscription/later-binding/foundation.js';
-import { ExtRefLaterBindingList } from '../../../../../src/editors/subscription/later-binding/ext-ref-laterbinding-list.js';
+import { ExtRefLaterBindingList } from '../../../../../src/editors/subscription/later-binding/ext-ref-later-binding-list.js';
 
 describe('smv-list', () => {
   let parent: Element;
