test: add tests for size limit checks

Author: Hweinstock

packages/core/src/codewhisperer/util/zipUtil.ts

@@ -71,13 +71,13 @@ export class ZipUtil {
         return CodeWhispererConstants.projectScanPayloadSizeLimitBytes
     }
 
-    public reachSizeLimit(size: number, scope: CodeWhispererConstants.CodeAnalysisScope): boolean {
+    public aboveByteLimit(size: number, scope: CodeWhispererConstants.CodeAnalysisScope): boolean {
         return CodeWhispererConstants.isFileAnalysisScope(scope)
             ? size > this.getFileScanPayloadSizeLimitInBytes()
             : size > this.getProjectScanPayloadSizeLimitInBytes()
     }
 
-    public willReachSizeLimit(current: number, adding: number): boolean {
+    public willReachProjectByteLimit(current: number, adding: number): boolean {
         const willReachLimit = current + adding > this.getProjectScanPayloadSizeLimitInBytes()
         return willReachLimit
     }
@@ -112,7 +112,7 @@ export class ZipUtil {
         this._totalSize += (await fs.stat(uri.fsPath)).size
         this._totalLines += content.split(ZipConstants.newlineRegex).length
 
-        if (this.reachSizeLimit(this._totalSize, scope)) {
+        if (this.aboveByteLimit(this._totalSize, scope)) {
             throw new FileSizeExceededError()
         }
         const zipFilePath = this.getZipDirPath(FeatureUseCase.CODE_SCAN) + CodeWhispererConstants.codeScanZipExt
@@ -305,8 +305,8 @@ export class ZipUtil {
         const fileSize = Buffer.from(fileContent).length
 
         if (
-            this.reachSizeLimit(this._totalSize, CodeWhispererConstants.CodeAnalysisScope.PROJECT) ||
-            this.willReachSizeLimit(this._totalSize, fileSize)
+            this.aboveByteLimit(this._totalSize, CodeWhispererConstants.CodeAnalysisScope.PROJECT) ||
+            this.willReachProjectByteLimit(this._totalSize, fileSize)
         ) {
             throw new ProjectSizeExceededError()
         }
@@ -322,8 +322,8 @@ export class ZipUtil {
         const fileSize = (await fs.stat(uri.fsPath)).size
 
         if (
-            this.reachSizeLimit(this._totalSize, CodeWhispererConstants.CodeAnalysisScope.PROJECT) ||
-            this.willReachSizeLimit(this._totalSize, fileSize)
+            this.aboveByteLimit(this._totalSize, CodeWhispererConstants.CodeAnalysisScope.PROJECT) ||
+            this.willReachProjectByteLimit(this._totalSize, fileSize)
         ) {
             throw new ProjectSizeExceededError()
         }

packages/core/src/test/codewhisperer/zipUtil.test.ts

@@ -33,6 +33,68 @@ describe('zipUtil', function () {
             sinon.restore()
         })
 
+        it('returns the proper size limit for zip', function () {
+            assert.strictEqual(
+                zipUtil.aboveByteLimit(
+                    CodeWhispererConstants.fileScanPayloadSizeLimitBytes + 1,
+                    CodeAnalysisScope.FILE_ON_DEMAND
+                ),
+                true
+            )
+
+            assert.strictEqual(
+                zipUtil.aboveByteLimit(
+                    CodeWhispererConstants.fileScanPayloadSizeLimitBytes + 1,
+                    CodeAnalysisScope.FILE_AUTO
+                ),
+                true
+            )
+
+            assert.strictEqual(
+                zipUtil.aboveByteLimit(
+                    CodeWhispererConstants.projectScanPayloadSizeLimitBytes + 1,
+                    CodeAnalysisScope.PROJECT
+                ),
+                true
+            )
+
+            assert.strictEqual(
+                zipUtil.aboveByteLimit(
+                    CodeWhispererConstants.fileScanPayloadSizeLimitBytes - 1,
+                    CodeAnalysisScope.FILE_ON_DEMAND
+                ),
+                false
+            )
+
+            assert.strictEqual(
+                zipUtil.aboveByteLimit(
+                    CodeWhispererConstants.fileScanPayloadSizeLimitBytes - 1,
+                    CodeAnalysisScope.FILE_AUTO
+                ),
+                false
+            )
+
+            assert.strictEqual(
+                zipUtil.aboveByteLimit(
+                    CodeWhispererConstants.projectScanPayloadSizeLimitBytes - 1,
+                    CodeAnalysisScope.PROJECT
+                ),
+                false
+            )
+        })
+
+        it('determines if adding file will exceed project byte limit', function () {
+            assert.strictEqual(
+                zipUtil.willReachProjectByteLimit(CodeWhispererConstants.projectScanPayloadSizeLimitBytes, 1),
+                true
+            )
+
+            assert.strictEqual(
+                zipUtil.willReachProjectByteLimit(CodeWhispererConstants.projectScanPayloadSizeLimitBytes - 10, 9),
+                false
+            )
+        })
+
         it('Should generate zip for file scan and return expected metadata', async function () {
             const zipMetadata = await zipUtil.generateZip(vscode.Uri.file(appCodePath), CodeAnalysisScope.FILE_AUTO)
             assert.strictEqual(zipMetadata.lines, 49)
@@ -45,7 +107,7 @@ describe('zipUtil', function () {
         })
 
         it('Should throw error if payload size limit is reached for file scan', async function () {
-            sinon.stub(zipUtil, 'reachSizeLimit').returns(true)
+            sinon.stub(zipUtil, 'aboveByteLimit').returns(true)
 
             await assert.rejects(
                 () => zipUtil.generateZip(vscode.Uri.file(appCodePath), CodeAnalysisScope.FILE_AUTO),
@@ -65,7 +127,7 @@ describe('zipUtil', function () {
         })
 
         it('Should throw error if payload size limit is reached for project scan', async function () {
-            sinon.stub(zipUtil, 'reachSizeLimit').returns(true)
+            sinon.stub(zipUtil, 'aboveByteLimit').returns(true)
 
             await assert.rejects(
                 () => zipUtil.generateZip(vscode.Uri.file(appCodePath), CodeAnalysisScope.PROJECT),
@@ -74,7 +136,7 @@ describe('zipUtil', function () {
         })
 
         it('Should throw error if payload size limit will be reached for project scan', async function () {
-            sinon.stub(zipUtil, 'willReachSizeLimit').returns(true)
+            sinon.stub(zipUtil, 'aboveByteLimit').returns(true)
 
             await assert.rejects(
                 () => zipUtil.generateZip(vscode.Uri.file(appCodePath), CodeAnalysisScope.PROJECT),