Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

Remove unnecessary validation that required child entity names to be globally unique #793

Merged
vishwacsena merged 4 commits into from
May 19, 2020
Merged

Remove unnecessary validation that required child entity names to be globally unique #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f226444
Fix to remove validation.
May 17, 2020
528e4b8
Merge branch 'master' into vishwac/791
vishwacsena May 19, 2020
923bb9e
Merge branch 'master' into vishwac/791
vishwacsena May 19, 2020
b7097df
Merge branch 'master' into vishwac/791
vishwacsena May 19, 2020
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: 0 additions & 2 deletions packages/lu/src/parser/lufile/parseFileContents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,8 +1182,6 @@ const handleNDepthEntity = function(parsedContent, entityName, entityRoles, enti
let childEntityName = groupsFound.groups.entityName.replace(/^['"]/g, '').replace(/['"]$/g, '');
let childEntityType = groupsFound.groups.instanceOf.trim();
let childFeatures = groupsFound.groups.features ? groupsFound.groups.features.trim().split(/[,;]/g).map(item => item.trim()) : undefined;
// Verify that the entity name is unique
verifyUniqueEntityName(parsedContent, childEntityName, childEntityType, line, true);

// Get current tab level
let tabLevel = Math.ceil(groupsFound.groups.leadingSpaces !== undefined ? groupsFound.groups.leadingSpaces.length / SPACEASTABS : 0) || (groupsFound.groups.leadingTabs !== undefined ? groupsFound.groups.leadingTabs.length : 0);
Expand Down
12 changes: 0 additions & 12 deletions packages/lu/test/parser/lufile/parseFileContents.nDepthEntity.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,6 @@ describe('V2 NDepth definitions using @ notation', function () {
.catch(err => done())
});

it('Child entity names must be unique', function (done) {
let luFile = `
@ml xyz
@ml xyz1 =
- @ ml xyz

`;
parseFile.parseFile(luFile)
.then(res => done(res))
.catch(err => done())
});
Copy link

@chrimc62 chrimc62 May 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be better to keep the test and switch expectations?


it('Simple child entity is handled correctly', function (done) {
let luFile = `
@ml xyz1 =
Expand Down