Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,26 @@ export const hasConcreteSubclass: IFunction = (
}
}

const declMap = new Map<string, Declaration>();
for (const decl of allDeclarations) {
if (decl && !decl.isAbstract && decl.superType && typeof decl.superType.name === 'string') {
abstractNames.delete(decl.superType.name);
if (decl && typeof decl.name === 'string') {
declMap.set(decl.name, decl);
}
}

for (const decl of allDeclarations) {
if (decl && !decl.isAbstract) {
let current: Declaration | undefined = decl;
const visited = new Set<string>();
while (current?.superType && typeof current.superType.name === 'string') {
const superTypeName = current.superType.name;
if (visited.has(superTypeName)) {
break;
}
visited.add(superTypeName);
abstractNames.delete(superTypeName);
current = declMap.get(superTypeName);
}
}
}
if (abstractNames.size > 0) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace org.example@1.0.0

abstract concept Vehicle {
o String make
}

abstract concept LandVehicle extends Vehicle {
o String terrain
}

abstract concept WaterVehicle extends Vehicle {
o Double maxKts
}

concept Car extends LandVehicle {
o Integer numberOfDoors
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace org.example@1.0.0

abstract concept Vehicle {
o String make
}

abstract concept MotorVehicle extends Vehicle {
o String engineType
}

concept Car extends MotorVehicle {
o Integer numberOfDoors
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,24 @@ describe('Abstract Must Be Subclassed Rule', () => {
const messageText = results.map(r => r.message).join(' ');
expect(messageText).toContain('must have concrete subclasses');
});

test('should not report violations when abstract declarations have indirect concrete subclasses via multi-level inheritance', async () => {
const results = await testRules({
rules: {
'abstract-must-subclassed': abstractMustSubclassed,
}
}, 'abstract-must-subclassed-multilevel-valid.cto');
expect(results).toHaveLength(0);
});

test('should only report un-subclassed abstract declarations in branching multi-level inheritance', async () => {
const results = await testRules({
rules: {
'abstract-must-subclassed': abstractMustSubclassed,
}
}, 'abstract-must-subclassed-multilevel-invalid.cto');
expect(results).toHaveLength(1);
expect(results[0].message).toContain('\'WaterVehicle\'');
});
});

Loading