Skip to content
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.

Sign up for GitHub

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

fix(menu/subscriberinfo): fix lnInst attribute for lnClass LLN0 #749

Merged
merged 1 commit into from
May 16, 2022
Merged

fix(menu/subscriberinfo): fix lnInst attribute for lnClass LLN0 #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/menu/SubscriberInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function addIEDName(extRef: Element, gseControl: Element): Element | null {
ldInst: lDevice.getAttribute('inst') ?? '',
prefix: anyln.getAttribute('prefix') ?? '',
lnClass: anyln.getAttribute('lnClass') ?? '',
lnInst: anyln.getAttribute('inst') ?? '',
lnInst: anyln.getAttribute('inst') || null,
}
);
iedName.innerHTML = ied.getAttribute('name')!;
Expand Down
6 changes: 5 additions & 1 deletion test/testfiles/subscriberinfo2007.scd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,10 @@
</DataSet>
<GSEControl type="GOOSE" appID="0002" fixedOffs="false" confRev="1" name="GCB" datSet="GooseDataSet1">
</GSEControl>
<Inputs>
<ExtRef iedName="IED1" ldInst="Disconnectors" prefix="DC" lnClass="XSWI" lnInst="1" doName="Pos" daName="stVal"/>
<ExtRef iedName="IED1" ldInst="Disconnectors" prefix="DC" lnClass="XSWI" lnInst="1" doName="Pos" daName="q"/>
</Inputs>
</LN0>
<LN lnClass="LPHD" inst="1" lnType="Dummy.LPHD1"/>
<LN lnClass="XCBR" inst="1" lnType="Dummy.XCBR1">
Expand Down Expand Up @@ -654,4 +658,4 @@
<EnumVal ord="8">process</EnumVal>
</EnumType>
</DataTypeTemplates>
</SCL>
</SCL>
58 changes: 40 additions & 18 deletions test/unit/editors/subscriberinfo.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { expect } from '@open-wc/testing';
import { createMissingIEDNameSubscriberInfo } from '../../../src/menu/SubscriberInfo.js';
import { Create, isCreate, SimpleAction } from '../../../src/foundation.js';

describe('SubscriberInfo', () => {
describe('menu plugin adding subscriber info', () => {
describe('for Edition2 and higher files', () => {
let doc: Document;
let actions: SimpleAction[];
Expand All @@ -15,11 +15,11 @@ describe('SubscriberInfo', () => {
actions = createMissingIEDNameSubscriberInfo(doc);
});

it('creates two SimpleActions', () => {
expect(actions.length).to.equal(3);
it('does create one action per necessary IEDName creation', () => {
expect(actions.length).to.equal(4);
});

it('the first writes the correct IEDName element', () => {
it('creates correct IEDName element referencing LN0 element', () => {
expect(actions[0]).to.satisfy(isCreate);
expect(
(<Element>(<Create>actions[0]).new.element).getAttribute('apRef')
Expand All @@ -32,32 +32,34 @@ describe('SubscriberInfo', () => {
).to.equal('');
expect(
(<Element>(<Create>actions[0]).new.element).getAttribute('lnClass')
).to.equal('XSWI');
).to.equal('LLN0');
expect(
(<Element>(<Create>actions[0]).new.element).getAttribute('lnInst')
).to.equal('1');
).to.equal(null);
expect((<Create>actions[0]).new.element.textContent).to.equal('IED2');
});
it('the second writes the correct IEDName element', () => {

it('creates correct IEDName element referencing LN element', () => {
expect(actions[1]).to.satisfy(isCreate);
expect(
(<Element>(<Create>actions[1]).new.element).getAttribute('apRef')
).to.equal('P1');
expect(
(<Element>(<Create>actions[1]).new.element).getAttribute('ldInst')
).to.equal('Disconnectors');
).to.equal('CBSW');
expect(
(<Element>(<Create>actions[1]).new.element).getAttribute('prefix')
).to.equal('DC');
).to.equal('');
expect(
(<Element>(<Create>actions[1]).new.element).getAttribute('lnClass')
).to.equal('CSWI');
).to.equal('XSWI');
expect(
(<Element>(<Create>actions[1]).new.element).getAttribute('lnInst')
).to.equal('1');
expect((<Create>actions[1]).new.element.textContent).to.equal('IED1');
expect((<Create>actions[1]).new.element.textContent).to.equal('IED2');
});
it('the third writes the correct IEDName element', () => {

it('creates correct IEDName element referencing LN element', () => {
expect(actions[2]).to.satisfy(isCreate);
expect(
(<Element>(<Create>actions[2]).new.element).getAttribute('apRef')
Expand All @@ -67,15 +69,35 @@ describe('SubscriberInfo', () => {
).to.equal('Disconnectors');
expect(
(<Element>(<Create>actions[2]).new.element).getAttribute('prefix')
).to.equal('');
).to.equal('DC');
expect(
(<Element>(<Create>actions[2]).new.element).getAttribute('lnClass')
).to.equal('CSWI');
expect(
(<Element>(<Create>actions[2]).new.element).getAttribute('lnInst')
).to.equal('2');
).to.equal('1');
expect((<Create>actions[2]).new.element.textContent).to.equal('IED1');
});

it('creates correct IEDName element referencing LN element', () => {
expect(actions[3]).to.satisfy(isCreate);
expect(
(<Element>(<Create>actions[3]).new.element).getAttribute('apRef')
).to.equal('P1');
expect(
(<Element>(<Create>actions[3]).new.element).getAttribute('ldInst')
).to.equal('Disconnectors');
expect(
(<Element>(<Create>actions[3]).new.element).getAttribute('prefix')
).to.equal('');
expect(
(<Element>(<Create>actions[3]).new.element).getAttribute('lnClass')
).to.equal('CSWI');
expect(
(<Element>(<Create>actions[3]).new.element).getAttribute('lnInst')
).to.equal('2');
expect((<Create>actions[3]).new.element.textContent).to.equal('IED1');
});
});

describe('for Edition1 files', () => {
Expand All @@ -89,21 +111,21 @@ describe('SubscriberInfo', () => {
actions = createMissingIEDNameSubscriberInfo(doc);
});

it('creates two SimpleActions', () => {
it('does create one action per necessary IEDName creation', () => {
expect(actions.length).to.equal(2);
});

it('the first writing correct IEDName element', () => {
it('creates correct IEDName element', () => {
expect(actions[0]).to.satisfy(isCreate);
expect((<Create>actions[0]).new.element.textContent).to.equal('IED1');
});

it('the second writing correct IEDName element', () => {
it('creates correct IEDName element', () => {
expect(actions[1]).to.satisfy(isCreate);
expect((<Create>actions[1]).new.element.textContent).to.equal('IED1');
});

it('not writing Edition2 attributes into the IEDName element', () => {
it('does not add Edition2 attributes into the IEDName element', () => {
actions.forEach(action => {
expect((<Element>(<Create>action).new.element).getAttribute('apRef')).to
.be.null;
Expand Down