Fixed broken tests.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

test/unit/compas-wizards/__snapshots__/scl.test.snap.js

@@ -17,6 +17,11 @@ snapshots["Wizards for SCL element (CoMPAS) edit scl looks like the latest snaps
       validationmessage="[textfield.required]"
     >
     </wizard-textfield>
+    <h3 style="color: var(--mdc-theme-on-surface);">
+      [compas.scl.labelsTitle]
+    </h3>
+    <compas-labels-field>
+    </compas-labels-field>
   </div>
   <mwc-button
     dialogaction="close"

test/unit/compas-wizards/scl.test.ts

@@ -4,38 +4,45 @@ import '../../mock-wizard.js';
 import { MockWizard } from '../../mock-wizard.js';
 
 import { WizardTextField } from '../../../src/wizard-textfield.js';
-import { WizardInputElement } from '../../../src/foundation.js';
+import {
+  Create,
+  isCreate,
+  isReplace,
+  Replace,
+  Wizard,
+  WizardInputElement,
+} from '../../../src/foundation.js';
 
 import {
-  executeWizardCreateAction,
-  executeWizardReplaceAction,
-  expectWizardNoUpdateAction,
+  executeWizardComplexAction,
   fetchDoc,
   setWizardTextFieldValue,
 } from '../wizards/test-support.js';
 import {
   editCompasSCLWizard,
-  updateSCL
-} from "../../../src/compas-wizards/scl.js";
+  updateSCL,
+} from '../../../src/compas-wizards/scl.js';
 
 describe('Wizards for SCL element (CoMPAS)', () => {
   let doc: XMLDocument;
   let scl: Element;
   let element: MockWizard;
+  let wizard: Wizard;
   let inputs: WizardInputElement[];
 
   async function createWizard(scl: Element): Promise<void> {
-    element = await fixture(html`
-      <mock-wizard></mock-wizard>`);
-    const wizard = editCompasSCLWizard(scl);
+    element = await fixture(html` <mock-wizard></mock-wizard>`);
+    wizard = editCompasSCLWizard(scl);
     element.workflow.push(() => wizard);
     await element.requestUpdate();
     inputs = Array.from(element.wizardUI.inputs);
   }
 
   describe('edit scl', () => {
     beforeEach(async () => {
-      doc = await fetchDoc('/test/testfiles/compas/compas-scl-private-update-existing.scd');
+      doc = await fetchDoc(
+        '/test/testfiles/compas/compas-scl-private-update-existing.scd'
+      );
       scl = doc.querySelector('SCL')!;
 
       await createWizard(scl);
@@ -48,7 +55,9 @@ describe('Wizards for SCL element (CoMPAS)', () => {
 
   describe('edit scl with existing SCL Name Element', () => {
     beforeEach(async () => {
-      doc = await fetchDoc('/test/testfiles/compas/compas-scl-private-update-existing.scd');
+      doc = await fetchDoc(
+        '/test/testfiles/compas/compas-scl-private-update-existing.scd'
+      );
       scl = doc.querySelector('SCL')!;
 
       await createWizard(scl);
@@ -57,21 +66,38 @@ describe('Wizards for SCL element (CoMPAS)', () => {
     it('update SCL Name should be updated in document', async function () {
       await setWizardTextFieldValue(<WizardTextField>inputs[0], 'updated');
 
-      const replaceAction = executeWizardReplaceAction(updateSCL(scl), inputs);
+      const complexAction = executeWizardComplexAction(
+        updateSCL(scl),
+        element.wizardUI,
+        inputs
+      );
+
+      expect(complexAction.actions.length).to.be.equal(2);
+      expect(complexAction.actions[0]).to.satisfy(isReplace);
+
+      const replaceAction = <Replace>complexAction.actions[0];
       expect(replaceAction.old.element.tagName).to.be.equal('compas:SclName');
-      expect(replaceAction.old.element).to.have.text('existing');
-      expect(replaceAction.new.element.tagName).to.be.equal('compas:SclName');
-      expect(replaceAction.new.element).to.have.text('updated');
+      expect(replaceAction.old.element.textContent).to.be.equal('existing');
+      expect(replaceAction.new.element.textContent).to.be.equal('updated');
     });
 
-    it('when no fields changed there will be no update action', async function () {
-      expectWizardNoUpdateAction(updateSCL(scl), inputs);
+    it('when no fields changed there will only be a Labels change', async function () {
+      const complexAction = executeWizardComplexAction(
+        updateSCL(scl),
+        element.wizardUI,
+        inputs
+      );
+
+      expect(complexAction.actions.length).to.be.equal(1);
+      expect(complexAction.actions[0]).to.satisfy(isCreate);
     });
   });
 
   describe('edit scl with missing SCL Name Element', () => {
     beforeEach(async () => {
-      doc = await fetchDoc('/test/testfiles/compas/compas-scl-private-missing-scl-name.scd');
+      doc = await fetchDoc(
+        '/test/testfiles/compas/compas-scl-private-missing-scl-name.scd'
+      );
       scl = doc.querySelector('SCL')!;
 
       await createWizard(scl);
@@ -80,16 +106,29 @@ describe('Wizards for SCL element (CoMPAS)', () => {
     it('update SCL Name should be updated in document', async function () {
       await setWizardTextFieldValue(<WizardTextField>inputs[0], 'updated');
 
-      const createAction = executeWizardCreateAction(updateSCL(scl), inputs);
+      const complexAction = executeWizardComplexAction(
+        updateSCL(scl),
+        element.wizardUI,
+        inputs
+      );
+
+      expect(complexAction.actions.length).to.be.equal(2);
+      expect(complexAction.actions[0]).to.satisfy(isCreate);
+
+      const createAction = <Create>complexAction.actions[0];
       expect((<Element>createAction.new.parent).tagName).to.be.equal('Private');
-      expect((<Element>createAction.new.element).tagName).to.be.equal('compas:SclName');
+      expect((<Element>createAction.new.element).tagName).to.be.equal(
+        'compas:SclName'
+      );
       expect(createAction.new.element).to.have.text('updated');
     });
   });
 
   describe('edit scl with missing Private Element', () => {
     beforeEach(async () => {
-      doc = await fetchDoc('/test/testfiles/compas/compas-scl-private-missing-private.scd');
+      doc = await fetchDoc(
+        '/test/testfiles/compas/compas-scl-private-missing-private.scd'
+      );
       scl = doc.querySelector('SCL')!;
 
       await createWizard(scl);
@@ -98,14 +137,23 @@ describe('Wizards for SCL element (CoMPAS)', () => {
     it('update SCL Name should be updated in document', async function () {
       await setWizardTextFieldValue(<WizardTextField>inputs[0], 'updated');
 
-      const createAction = executeWizardCreateAction(updateSCL(scl), inputs);
-      expect((<Element>createAction.new.parent).tagName).to.be.equal('SCL');
-      expect((<Element>createAction.new.element).tagName).to.be.equal('Private');
+      const complexAction = executeWizardComplexAction(
+        updateSCL(scl),
+        element.wizardUI,
+        inputs
+      );
+
+      expect(complexAction.actions.length).to.be.equal(2);
+      expect(complexAction.actions[0]).to.satisfy(isCreate);
 
-      const newSclNameElement = (<Element>createAction.new.element).querySelector('SclName');
-      expect(newSclNameElement).to.not.be.null;
-      expect(newSclNameElement!.tagName).to.be.equal('compas:SclName');
-      expect(newSclNameElement).to.have.text('updated');
+      // Because the private is created for the Labels outside the Actions it will be the same
+      // Create Action being returned, but the Private Element is added directly to the SCL Element.
+      const createAction = <Create>complexAction.actions[0];
+      expect((<Element>createAction.new.parent).tagName).to.be.equal('Private');
+      expect((<Element>createAction.new.element).tagName).to.be.equal(
+        'compas:SclName'
+      );
+      expect(createAction.new.element).to.have.text('updated');
     });
   });
 });

test/unit/editors/protocol104/wizards/address.test.ts

@@ -60,6 +60,7 @@ describe('Wizards for 104 Address Element', () => {
 
       const updateAction = executeWizardReplaceAction(
         updateAddressValue(doi, dai, address),
+        element.wizardUI,
         inputs
       );
       expect(updateAction.old.element).to.have.attribute('casdu', '1');
@@ -69,7 +70,11 @@ describe('Wizards for 104 Address Element', () => {
     });
 
     it('when no fields changed there will be no update action', async function () {
-      expectWizardNoUpdateAction(updateAddressValue(doi, dai, address), inputs);
+      expectWizardNoUpdateAction(
+        updateAddressValue(doi, dai, address),
+        element.wizardUI,
+        inputs
+      );
     });
 
     it('looks like the latest snapshot', async () => {
@@ -101,6 +106,7 @@ describe('Wizards for 104 Address Element', () => {
 
       const updateAction = executeWizardReplaceAction(
         updateAddressValue(doi, dai, address),
+        element.wizardUI,
         inputs
       );
       expect(updateAction.old.element).to.not.have.attribute('unitMultiplier');
@@ -125,6 +131,7 @@ describe('Wizards for 104 Address Element', () => {
 
       const updateAction = executeWizardReplaceAction(
         updateAddressValue(doi, dai, address),
+        element.wizardUI,
         inputs
       );
       expect(updateAction.old.element).to.not.have.attribute('scaleMultiplier');

test/unit/editors/singlelinediagram/wizards/bay.test.ts

@@ -36,6 +36,7 @@ describe('Wizards for SCL element Bay (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(bay),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('name', 'BusBar A');
@@ -50,6 +51,7 @@ describe('Wizards for SCL element Bay (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(bay),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.not.have.attribute('desc');
@@ -64,6 +66,7 @@ describe('Wizards for SCL element Bay (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(bay),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('sxy:x', '1');
@@ -75,6 +78,7 @@ describe('Wizards for SCL element Bay (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(bay),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('sxy:y', '1');
@@ -86,14 +90,19 @@ describe('Wizards for SCL element Bay (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(bay),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('sxy:y', '1');
     expect(updateAction.new.element).to.not.have.attribute('sxy:y');
   });
 
   it('when no fields changed there will be no update action', async function () {
-    expectWizardNoUpdateAction(updateNamingAndCoordinatesAction(bay), inputs);
+    expectWizardNoUpdateAction(
+      updateNamingAndCoordinatesAction(bay),
+      element.wizardUI,
+      inputs
+    );
   });
 
   it('looks like the latest snapshot', async () => {

test/unit/editors/singlelinediagram/wizards/conductingequipment.test.ts

@@ -36,6 +36,7 @@ describe('Wizards for SCL element Conducting Equipment (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(conductingEquipment),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('name', 'QB1');
@@ -50,6 +51,7 @@ describe('Wizards for SCL element Conducting Equipment (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(conductingEquipment),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.not.have.attribute('desc');
@@ -64,6 +66,7 @@ describe('Wizards for SCL element Conducting Equipment (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(conductingEquipment),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('sxy:x', '1');
@@ -75,6 +78,7 @@ describe('Wizards for SCL element Conducting Equipment (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(conductingEquipment),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('sxy:y', '1');
@@ -86,6 +90,7 @@ describe('Wizards for SCL element Conducting Equipment (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(conductingEquipment),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('sxy:y', '1');
@@ -95,6 +100,7 @@ describe('Wizards for SCL element Conducting Equipment (X/Y)', () => {
   it('when no fields changed there will be no update action', async function () {
     expectWizardNoUpdateAction(
       updateNamingAndCoordinatesAction(conductingEquipment),
+      element.wizardUI,
       inputs
     );
   });

test/unit/editors/singlelinediagram/wizards/powertransformer.test.ts

@@ -36,6 +36,7 @@ describe('Wizards for SCL element Power Transformer (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(powerTransformer),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('name', 'TA1');
@@ -50,6 +51,7 @@ describe('Wizards for SCL element Power Transformer (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(powerTransformer),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.not.have.attribute('desc');
@@ -64,6 +66,7 @@ describe('Wizards for SCL element Power Transformer (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(powerTransformer),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('sxy:x', '1');
@@ -75,6 +78,7 @@ describe('Wizards for SCL element Power Transformer (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(powerTransformer),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('sxy:y', '9');
@@ -86,6 +90,7 @@ describe('Wizards for SCL element Power Transformer (X/Y)', () => {
 
     const updateAction = executeWizardReplaceAction(
       updateNamingAndCoordinatesAction(powerTransformer),
+      element.wizardUI,
       inputs
     );
     expect(updateAction.old.element).to.have.attribute('sxy:y', '9');
@@ -95,6 +100,7 @@ describe('Wizards for SCL element Power Transformer (X/Y)', () => {
   it('when no fields changed there will be no update action', async function () {
     expectWizardNoUpdateAction(
       updateNamingAndCoordinatesAction(powerTransformer),
+      element.wizardUI,
       inputs
     );
   });