Skip to content

Improve tests #355

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

Merged
satyakigh merged 2 commits into from
Dec 9, 2025
Merged

Improve tests #355

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4777840
Improve tests
satyakigh Dec 9, 2025
ddf2975
Update method names
satyakigh Dec 9, 2025
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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ ubuntu-latest, macos-latest ]
os: [ ubuntu-latest, macos-latest, windows-latest ]
with:
ref: ${{ github.sha }}
runs-on: ${{ matrix.os }}
7 changes: 0 additions & 7 deletions tst/app/standalone.test.ts
View file
Open in desktop

This file was deleted.

75 changes: 19 additions & 56 deletions tst/unit/autocomplete/ResourceEntityCompletionProvider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ import { CompletionParams, CompletionItemKind, CompletionItem, InsertTextFormat
import { ResourceEntityCompletionProvider } from '../../../src/autocomplete/ResourceEntityCompletionProvider';
import { ResourceAttribute } from '../../../src/context/ContextType';
import { YamlNodeTypes } from '../../../src/context/syntaxtree/utils/TreeSitterTypes';
import { CombinedSchemas } from '../../../src/schema/CombinedSchemas';
import { ResourceSchema } from '../../../src/schema/ResourceSchema';
import { ExtensionName } from '../../../src/utils/ExtensionConfig';
import { createForEachResourceContext, createResourceContext } from '../../utils/MockContext';
import { createMockComponents } from '../../utils/MockServerComponents';
import { combinedSchemas } from '../../utils/SchemaUtils';
import { combinedSchemas, combineSchema, Schemas } from '../../utils/SchemaUtils';

describe('ResourceEntityCompletionProvider', () => {
const mockComponents = createMockComponents();
Expand All @@ -22,6 +21,18 @@ describe('ResourceEntityCompletionProvider', () => {
position: { line: 0, character: 0 },
};

// Create schemas once at describe level
const ec2Schema = new ResourceSchema(Schemas.EC2Instance.contents);
const ec2WithRequiredProps = combineSchema(ec2Schema, 'AWS::EC2::Instance', {
required: ['InstanceType', 'ImageId'],
});
const ec2WithNoRequiredProps = combineSchema(ec2Schema, 'AWS::EC2::Instance', {
required: [],
});
const schemasWithRequired = combinedSchemas([ec2WithRequiredProps]);
const schemasWithNoRequired = combinedSchemas([ec2WithNoRequiredProps]);
const emptySchemas = combinedSchemas([]);

beforeEach(() => {
mockComponents.schemaRetriever.getDefault.reset();
});
Expand Down Expand Up @@ -123,30 +134,6 @@ describe('ResourceEntityCompletionProvider', () => {
expect(deletionPolicyItem!.insertText).toBe('DeletionPolicy');
});

// Create a mock schema with required properties for testing
const setupSchemaWithRequiredProps = (requiredProps: string[] = []) => {
const mockSchema = {
typeName: 'AWS::EC2::Instance',
propertyKeys: new Set(['InstanceType', 'ImageId', 'KeyName', 'SecurityGroups']),
required: requiredProps,
isReadOnly: () => false,
isRequired: (prop: string) => requiredProps.includes(prop),
getByPath: () => ({ type: 'string' }),
resolveRef: () => ({ type: 'string' }),
} as unknown as ResourceSchema;

const mockSchemas = new Map<string, ResourceSchema>();
mockSchemas.set('AWS::EC2::Instance', mockSchema);

const combinedSchemas = new CombinedSchemas();
Object.defineProperty(combinedSchemas, 'schemas', {
get: () => mockSchemas,
});

mockComponents.schemaRetriever.getDefault.returns(combinedSchemas);
return { mockSchema, combinedSchemas };
};

test('should enhance Properties completion with snippet when resource type is available', () => {
// Setup context with a resource that has a Type
const mockContext = createResourceContext('MyInstance', {
Expand All @@ -158,7 +145,7 @@ describe('ResourceEntityCompletionProvider', () => {
});

// Setup schema with required properties
setupSchemaWithRequiredProps(['InstanceType', 'ImageId']);
mockComponents.schemaRetriever.getDefault.returns(schemasWithRequired);

// Get completions
const result = provider.getCompletions(mockContext, mockParams);
Expand Down Expand Up @@ -187,7 +174,7 @@ describe('ResourceEntityCompletionProvider', () => {
});

// Setup schema with required properties
setupSchemaWithRequiredProps(['InstanceType', 'ImageId']);
mockComponents.schemaRetriever.getDefault.returns(schemasWithRequired);

// Get completions
const result = provider.getCompletions(mockContext, mockParams);
Expand All @@ -214,7 +201,7 @@ describe('ResourceEntityCompletionProvider', () => {
});

// Setup schema with no required properties
setupSchemaWithRequiredProps([]);
mockComponents.schemaRetriever.getDefault.returns(schemasWithNoRequired);

// Get completions
const result = provider.getCompletions(mockContext, mockParams);
Expand Down Expand Up @@ -259,8 +246,7 @@ describe('ResourceEntityCompletionProvider', () => {
});

// Setup empty schemas
const testSchemas = combinedSchemas([]);
mockComponents.schemaRetriever.getDefault.returns(testSchemas);
mockComponents.schemaRetriever.getDefault.returns(emptySchemas);

// Get completions
const result = provider.getCompletions(mockContext, mockParams);
Expand Down Expand Up @@ -307,29 +293,7 @@ describe('ResourceEntityCompletionProvider', () => {
},
});

const setupSchemaWithRequiredProps = () => {
const mockSchema = {
typeName: 'AWS::EC2::Instance',
propertyKeys: new Set(['InstanceType', 'ImageId']),
required: ['InstanceType', 'ImageId'],
isReadOnly: () => false,
isRequired: (prop: string) => ['InstanceType', 'ImageId'].includes(prop),
getByPath: () => ({ type: 'string' }),
resolveRef: () => ({ type: 'string' }),
} as unknown as ResourceSchema;

const mockSchemas = new Map<string, ResourceSchema>();
mockSchemas.set('AWS::EC2::Instance', mockSchema);

const combinedSchemas = new CombinedSchemas();
Object.defineProperty(combinedSchemas, 'schemas', {
get: () => mockSchemas,
});

mockComponents.schemaRetriever.getDefault.returns(combinedSchemas);
};

setupSchemaWithRequiredProps();
mockComponents.schemaRetriever.getDefault.returns(schemasWithRequired);

const result = provider.getCompletions(mockContext, mockParams);

Expand Down Expand Up @@ -381,8 +345,7 @@ describe('ResourceEntityCompletionProvider', () => {
},
});

const testSchemas = combinedSchemas([]);
mockComponents.schemaRetriever.getDefault.returns(testSchemas);
mockComponents.schemaRetriever.getDefault.returns(emptySchemas);

const result = provider.getCompletions(mockContext, mockParams);

Expand Down
Loading
Loading