Add better errors and tests

microsoft · Jan 26, 2024 · 81fa32b · 81fa32b
1 parent 790fbbe
commit 81fa32b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/utils/src/utils/validationUtils.ts b/utils/src/utils/validationUtils.ts
@@ -12,8 +12,13 @@ export namespace validationUtils {
     }
 
     export function hasValidCharLength(value: string, rc?: RangeConstraints): boolean {
-        const lowerLimitIncl = (!rc?.lowerLimitIncl || rc.lowerLimitIncl < 1) ? 1 : rc.lowerLimitIncl;
+        const lowerLimitIncl = (!rc?.lowerLimitIncl) ? 1 : rc.lowerLimitIncl;
         const upperLimitIncl = (!rc?.upperLimitIncl || rc.upperLimitIncl > Number.MAX_SAFE_INTEGER) ? Number.MAX_SAFE_INTEGER : rc.upperLimitIncl;
+
+        if (lowerLimitIncl < 1 || upperLimitIncl < 1) {
+            throw new Error(vscode.l10n.t('Specified character lengths should be 1 character or greater.'));
+        }
+
         if (lowerLimitIncl > upperLimitIncl) {
             throw new Error(vscode.l10n.t('The minimum specified character length should not exceed the maximum specified character length.'));
         }

diff --git a/utils/test/validationUtils/hasValidCharLength.test.ts b/utils/test/validationUtils/hasValidCharLength.test.ts
@@ -36,5 +36,13 @@ export function hasValidCharLengthTest() {
         assert.equal(validationUtils.hasValidCharLength(value, constraints), false);
     }
 
-    assert.throws(() => validationUtils.hasValidCharLength('abcdefg', { lowerLimitIncl: 5, upperLimitIncl: -5 }));
+    const errorValues: CharLengthParams[] = [
+        { value: 'abcd', constraints: { lowerLimitIncl: -1, upperLimitIncl: 4 } },
+        { value: 'abcd', constraints: { lowerLimitIncl: 1, upperLimitIncl: -4 } },
+        { value: 'abcd', constraints: { lowerLimitIncl: 5, upperLimitIncl: 4 } },
+    ];
+
+    for (const { value, constraints } of errorValues) {
+        assert.throws(() => validationUtils.hasValidCharLength(value, constraints));
+    }
 }