Skip to content

Commit

Permalink
refactor test files
Browse files Browse the repository at this point in the history
  • Loading branch information
@bobbyu99
bobbyu99 committed Jan 24, 2025
1 parent 8abce32 commit f84ca3e
Show file tree
Hide file tree
Showing 4 changed files with 110 additions and 172 deletions.
4 changes: 2 additions & 2 deletions ...ges/amplify-graphql-validate-transformer/src/__tests__/duplicate-validation-types.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('Duplicate Validation Types', () => {
fieldType,
})),
),
)('rejects duplicate $type validation', ({ type, fieldType }) => {
)('rejects duplicate `$type` validation on `$fieldType` field', ({ type, fieldType }) => {
const schema = /* GraphQL */ `
type Post @model {
id: ID!
Expand Down Expand Up @@ -56,7 +56,7 @@ describe('Duplicate Validation Types', () => {
type: 'matches',
values: ['regex1', 'regex2'],
},
])('rejects duplicate $type validation on same field', ({ type, values }) => {
])('rejects duplicate `$type` validation on `String` field', ({ type, values }) => {
const schema = /* GraphQL */ `
type Post @model {
id: ID!
Expand Down
6 changes: 3 additions & 3 deletions packages/amplify-graphql-validate-transformer/src/__tests__/minmax-length.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('min/maxLength Validators', () => {
value,
})),
),
)('rejects $type value of "$value"', ({ type, value }) => {
)('rejects `$type` value of `$value`', ({ type, value }) => {
const schema = /* GraphQL */ `
type Post @model {
id: ID!
Expand Down Expand Up @@ -47,7 +47,7 @@ describe('min/maxLength Validators', () => {
test.each(
testCases.flatMap((testCase) =>
types.map((type) => ({
name: `accepts ${description} of '${testCase.value}'`,
name: `accepts ${type} ${description} of '${testCase.value}'`,
schema: /* GraphQL */ `
type Post @model {
id: ID!
Expand Down Expand Up @@ -76,6 +76,6 @@ describe('min/maxLength Validators', () => {
testValidValues('empty string', [{ value: '' }]);
testValidValues('whitespace with newlines', [{ value: ' \\n ' }]);
testValidValues('whitespace with tabs', [{ value: ' \\t ' }]);
testValidValues('escape characters', [{ value: ' \ ' }]);
testValidValues('escape characters', [{ value: ' ' }]);
});
});
261 changes: 98 additions & 163 deletions packages/amplify-graphql-validate-transformer/src/__tests__/numeric-validation-types.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,174 +3,109 @@ import { ModelTransformer } from '@aws-amplify/graphql-model-transformer';
import { ValidateTransformer } from '..';

describe('Numeric Validation Types', () => {
const numericValidationTypes = ['gt', 'lt', 'gte', 'lte'];
const fieldTypes = ['Int', 'Float'];

describe('Invalid usage', () => {
test.each([
{
name: 'rejects empty value',
schema: /* GraphQL */ `
type Post @model {
id: ID!
rating: Float! @validate(type: gt, value: "")
}
`,
error: "gt value must be a number. Received '' for field 'rating'",
},
{
name: 'rejects space value',
schema: /* GraphQL */ `
type Post @model {
id: ID!
score: Int! @validate(type: lt, value: " ")
}
`,
error: "lt value must be a number. Received ' ' for field 'score'",
},
{
name: 'rejects NaN value',
schema: /* GraphQL */ `
type Post @model {
id: ID!
counts: [Float]! @validate(type: gte, value: "NaN")
}
`,
error: "gte value must be a number. Received 'NaN' for field 'counts'",
},
{
name: 'rejects null value',
schema: /* GraphQL */ `
type Post @model {
id: ID!
numbers: [Int]! @validate(type: lte, value: "null")
}
`,
error: "lte value must be a number. Received 'null' for field 'numbers'",
},
{
name: 'rejects undefined value',
schema: /* GraphQL */ `
type Post @model {
id: ID!
rating: Float! @validate(type: gt, value: "undefined")
}
`,
error: "gt value must be a number. Received 'undefined' for field 'rating'",
},
])('$name', ({ schema, error }) => {
const transformer = new ValidateTransformer();
expect(() => {
testTransform({
schema,
transformers: [new ModelTransformer(), transformer],
const testInvalidValues = (description: string, testCases: Array<{ value: string; description: string }>): void => {
describe(`${description}`, () => {
test.each(
testCases.flatMap((testCase) =>
numericValidationTypes.flatMap((validationType) =>
fieldTypes.map((fieldType) => ({
validationType,
fieldType,
value: testCase.value,
description: testCase.description,
})),
),
),
)('rejects `$validationType` validation with $description on `$fieldType` field', ({ validationType, fieldType, value }) => {
const schema = /* GraphQL */ `
type Post @model {
id: ID!
field: ${fieldType}! @validate(type: ${validationType}, value: "${value}")
}
`;
const error = `${validationType} value must be a number. Received '${value}' for field 'field'`;

const transformer = new ValidateTransformer();
expect(() => {
testTransform({
schema,
transformers: [new ModelTransformer(), transformer],
});
}).toThrow(error);
});
}).toThrow(error);
});
});
};

testInvalidValues('Empty and special values', [
{ value: '', description: 'empty string' },
{ value: ' ', description: 'string with single space' },
{ value: 'NaN', description: 'Not a Number (NaN)' },
{ value: 'null', description: 'null string' },
{ value: 'undefined', description: 'undefined string' },
]);
});

describe('Valid usage', () => {
test.each([
{
name: 'accepts 0',
schema: /* GraphQL */ `
type Post @model {
id: ID!
rating: Float! @validate(type: gt, value: "0")
score: Int! @validate(type: lt, value: "0")
counts: [Float]! @validate(type: gte, value: "0")
numbers: [Int]! @validate(type: lte, value: "0")
}
`,
},
{
name: 'accepts positive integers',
schema: /* GraphQL */ `
type Post @model {
id: ID!
rating: Float! @validate(type: gt, value: "1")
score: Int! @validate(type: lt, value: "20")
counts: [Float]! @validate(type: gte, value: "432")
numbers: [Int]! @validate(type: lte, value: "6")
}
`,
},
{
name: 'accepts positive floats',
schema: /* GraphQL */ `
type Post @model {
id: ID!
rating: Float! @validate(type: gt, value: "1.325")
score: Int! @validate(type: lt, value: "20.5")
counts: [Float]! @validate(type: gte, value: "432.123")
numbers: [Int]! @validate(type: lte, value: "6.731628")
}
`,
},
{
name: 'accepts negative integers',
schema: /* GraphQL */ `
type Post @model {
id: ID!
rating: Float! @validate(type: gt, value: "-1")
score: Int! @validate(type: lt, value: "-20")
counts: [Float]! @validate(type: gte, value: "-432")
numbers: [Int]! @validate(type: lte, value: "-6")
}
`,
},
{
name: 'accepts negative floats',
schema: /* GraphQL */ `
type Post @model {
id: ID!
rating: Float! @validate(type: gt, value: "-1.325")
score: Int! @validate(type: lt, value: "-20.5")
counts: [Float]! @validate(type: gte, value: "-432.123")
numbers: [Int]! @validate(type: lte, value: "-6.731628")
}
`,
},
{
name: 'accepts -Infinity value',
schema: /* GraphQL */ `
type Post @model {
id: ID!
rating: Float! @validate(type: gt, value: "-Infinity")
score: Int! @validate(type: lt, value: "-Infinity")
counts: [Float]! @validate(type: gte, value: "-Infinity")
numbers: [Int]! @validate(type: lte, value: "-Infinity")
}
`,
},
{
name: 'accepts Infinity value',
schema: /* GraphQL */ `
type Post @model {
id: ID!
rating: Float! @validate(type: lt, value: "Infinity")
score: Int! @validate(type: gt, value: "Infinity")
counts: [Float]! @validate(type: lte, value: "Infinity")
numbers: [Int]! @validate(type: gte, value: "Infinity")
}
`,
},
{
name: 'accepts extremely large value beyond 64-bit range',
schema: /* GraphQL */ `
type Post @model {
id: ID!
rating: Float! @validate(type: lte, value: "999999999999999999999999999999")
score: Int! @validate(type: gte, value: "999999999999999999999999999999")
counts: [Float]! @validate(type: lte, value: "999999999999999999999999999999")
numbers: [Int]! @validate(type: gte, value: "999999999999999999999999999999")
}
`,
},
])('$name', ({ schema }) => {
const out = testTransform({
schema,
transformers: [new ModelTransformer(), new ValidateTransformer()],
const testValidValues = (description: string, testCases: Array<{ value: string; isList?: boolean }>): void => {
test.each(
testCases.flatMap((testCase) =>
numericValidationTypes.flatMap((validationType) =>
fieldTypes.map((fieldType) => ({
name: `accepts ${validationType} validation with ${description} ${testCase.value} on ${
testCase.isList ? 'list of ' : ''
}${fieldType} field`,
schema: /* GraphQL */ `
type Post @model {
id: ID!
field: ${testCase.isList ? `[${fieldType}]` : fieldType}! @validate(type: ${validationType}, value: "${testCase.value}")
}
`,
})),
),
),
)('$name', ({ schema }) => {
const out = testTransform({
schema,
transformers: [new ModelTransformer(), new ValidateTransformer()],
});
expect(out).toBeDefined();
expect(out.schema).toMatchSnapshot();
});
expect(out).toBeDefined();
expect(out.schema).toMatchSnapshot();
});
};

testValidValues('zero', [{ value: '0' }]);
testValidValues('positive integer', [{ value: '1' }, { value: '20' }, { value: '432' }]);
testValidValues('positive float', [{ value: '1.325' }, { value: '20.5' }, { value: '432.123' }]);
testValidValues('negative integer', [{ value: '-1' }, { value: '-20' }, { value: '-432' }]);
testValidValues('negative float', [{ value: '-1.325' }, { value: '-20.5' }, { value: '-432.123' }]);
testValidValues('infinity', [{ value: 'Infinity' }, { value: '-Infinity' }]);
testValidValues('extremely large number', [{ value: '999999999999999999999999999999' }]);

testValidValues('zero on list field', [{ value: '0', isList: true }]);
testValidValues('positive integer on list field', [
{ value: '1', isList: true },
{ value: '20', isList: true },
]);
testValidValues('positive float on list field', [
{ value: '1.325', isList: true },
{ value: '20.5', isList: true },
]);
testValidValues('negative integer on list field', [
{ value: '-1', isList: true },
{ value: '-20', isList: true },
]);
testValidValues('negative float on list field', [
{ value: '-1.325', isList: true },
{ value: '-20.5', isList: true },
]);
testValidValues('infinity on list field', [
{ value: 'Infinity', isList: true },
{ value: '-Infinity', isList: true },
]);
testValidValues('extremely large number on list field', [{ value: '999999999999999999999999999999', isList: true }]);
});
});
11 changes: 7 additions & 4 deletions ...fy-graphql-validate-transformer/src/__tests__/validation-field-type-compatibility.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('Type Compatibility', () => {

const fieldTypes: FieldType[] = [
{ type: 'String', fieldName: 'title', value: 'test' },
{ type: 'ID', fieldName: 'id', value: 'test-id' },
{ type: 'ID', fieldName: 'anotherId', value: 'test-id' },
{ type: 'Boolean', fieldName: 'isPublished', value: 'true' },
{ type: 'Int', fieldName: 'count', value: '5' },
{ type: 'Float', fieldName: 'rating', value: '5.0' },
Expand Down Expand Up @@ -59,7 +59,7 @@ describe('Type Compatibility', () => {
fieldType,
})),
),
)('rejects `$validationType` validation on $fieldType.type field', ({ validationType, fieldType }) => {
)('rejects `$validationType` validation on `$fieldType.type` field', ({ validationType, fieldType }) => {
const schema = createTestSchema(fieldType, validationType, fieldType.value);
const transformer = new ValidateTransformer();
expect(() => {
Expand Down Expand Up @@ -91,9 +91,12 @@ describe('Type Compatibility', () => {
});

describe('Valid usage', () => {
const testValidFieldTypes = (_: string, testCases: Array<{ validationType: string; fieldType: string; value: string }>): void => {
const testValidFieldTypes = (
_: string,
testCases: Array<{ validationType: string; fieldType: string; value: string }>,
): void => {
test.each(testCases)(
'accepts $validationType validation on $fieldType field with value $value',
'accepts `$validationType` validation on `$fieldType` field with value `$value`',
({ validationType, fieldType, value }) => {
const schema = /* GraphQL */ `
type Post @model {
Expand Down

0 comments on commit f84ca3e

Please sign in to comment.