Enhance existing test assertions

wimpyprogrammer · wimpyprogrammer · commit bd20642ad158 · 2020-09-26T00:53:17.000-05:00
Centralize list of supported characters.
diff --git a/src/constants/index.ts b/src/constants/index.ts
@@ -0,0 +1,17 @@
+const whitespace = ` \t\r\n`.split('');
+
+const digits = '0123456789'.split('');
+
+const basicLowercase = 'abcdefghijklmnopqrstuvwxyz'.split('');
+const basicUppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
+const basicSpecial = '~`!@#$%^&*()-_=+<,>.?/[]{}|\\:;"\''.split('');
+
+const all = ([] as string[]).concat(
+	whitespace,
+	digits,
+	basicLowercase,
+	basicUppercase,
+	basicSpecial
+);
+
+export const Chars = { all };
diff --git a/src/expanders/character-class-pattern.ts b/src/expanders/character-class-pattern.ts
@@ -1,4 +1,5 @@
 import { CharacterClass } from 'regexp-tree/ast';
+import { Chars } from '../constants';
 import Expander from '../Expander';
 import Expansion from '../Expansion';
 import sortRandom from '../sorts/fisher-yates-random';
@@ -18,16 +19,7 @@ function getReferencedCodePoints(
 	return [expression.codePoint];
 }
 
-const allCharOptions =
-	' \t\r\n' +
-	'abcdefghijklmnopqrstuvwxyz' +
-	'ABCDEFGHIJKLMNOPQRSTUVWXYZ' +
-	'0123456789' +
-	'~`!@#$%^&*()-_=+<,>.?/[]{}|\\:;"\'';
-
-const allCodePointOptions = allCharOptions
-	.split('')
-	.map(char => char.charCodeAt(0));
+const allCodePointOptions = Chars.all.map(char => char.charCodeAt(0));
 
 /**
  * Expand an expression which represents a single character from a
diff --git a/src/pattern.spec.ts b/src/pattern.spec.ts
@@ -1,4 +1,5 @@
 import { when } from 'jest-when';
+import { Chars } from './constants';
 import Expansion from './Expansion';
 import { fill } from './helpers/utils';
 import * as patternLib from './pattern';
@@ -363,7 +364,7 @@ describe('expand', () => {
 		}
 
 		const result = expandAll('[^abc]');
-		expect(result.length).toBeGreaterThan(1);
+		expect(result).toHaveLength(95);
 		result.forEach(testExpansion);
 	});
 
@@ -374,7 +375,7 @@ describe('expand', () => {
 		}
 
 		const result = expandAll('[^246]');
-		expect(result.length).toBeGreaterThan(1);
+		expect(result).toHaveLength(95);
 		result.forEach(testExpansion);
 	});
 
@@ -385,7 +386,7 @@ describe('expand', () => {
 		}
 
 		const result = expandAll('[^a-p]');
-		expect(result.length).toBeGreaterThan(1);
+		expect(result).toHaveLength(82);
 		result.forEach(testExpansion);
 	});
 
@@ -396,7 +397,7 @@ describe('expand', () => {
 		}
 
 		const result = expandAll('[^0-8]');
-		expect(result.length).toBeGreaterThan(1);
+		expect(result).toHaveLength(89);
 		result.forEach(testExpansion);
 	});
 
@@ -407,7 +408,7 @@ describe('expand', () => {
 		}
 
 		const result = expandAll('[^aeiou0-5A-T]');
-		expect(result.length).toBeGreaterThan(1);
+		expect(result).toHaveLength(67);
 		result.forEach(testExpansion);
 	});
 
@@ -438,10 +439,14 @@ describe('expand', () => {
 	it.each([/./, /\w/, /\W/, /\d/, /\D/, /\s/, /\S/])(
 		'expands the single character class %p',
 		(charClass: RegExp) => {
+			function testExpansion(expansion: string) {
+				expect(expansion).toHaveLength(1);
+				expect(expansion).toMatch(charClass);
+			}
+
 			const result = expandAll(charClass);
 			expect(result.length).toBeGreaterThan(1);
-			expect(result[0]).toHaveLength(1);
-			expect(result[0]).toMatch(charClass);
+			result.forEach(testExpansion);
 		}
 	);
 
@@ -562,6 +567,17 @@ describe('expand', () => {
 		}
 	);
 
+	it.each([/(.|\r)/s, /[\s\S]/])(
+		'includes all supported characters in %p',
+		regex => {
+			const result = expandAll(regex);
+
+			Chars.all.forEach(char => {
+				expect(result).toContain(char);
+			});
+		}
+	);
+
 	it('expands repeated character class', () => {
 		const allTwoDigitNumbers = fill(0, 99).map(num =>
 			num.toString().padStart(2, '0')
