Merge with VsTestV2 recent fixes

microsoft · Aug 20, 2022 · cd1eb06 · cd1eb06
1 parent ee1ea61
commit cd1eb06
Show file tree

Hide file tree

Showing 8 changed files with 679 additions and 679 deletions.
diff --git a/Tasks/VsTestV3/Tests/L0.ts b/Tasks/VsTestV3/Tests/L0.ts
@@ -28,14 +28,14 @@ describe('VsTest Suite', function() {
         const inputDataContractInterfaceFileContents = fs.readFileSync('../Tasks/VsTestV3/inputdatacontract.ts', 'utf8').toString();
         const listOfInterfaces = inputDataContractInterfaceFileContents.replace(/export interface (.*) \{([\s][^{}]*)+\}(\s)*/g, '$1 ').trim().split(' ');
 
-        const interfacesDictionary : { [key: string] : any } = <{ [key: string] : any} >{};
+        const interfacesDictionary: { [key: string]: any } = <{ [key: string]: any }>{};
 
         listOfInterfaces.forEach(interfaceName => {
             const regex = new RegExp(interfaceName + ' \\{\\s([\\s][^\\{\\}]*)+\\}');
             const interfaceContents = inputDataContractInterfaceFileContents.match(regex)[1];
 
             const interfaceProperties = interfaceContents.replace(/(\w+) \: (\w+([\[\]])*)\;/g, '$1 $2').split('\n');
-            const interfacePropertiesDictionary : { [key: string] : string } = <{ [key: string] : string }>{};
+            const interfacePropertiesDictionary: { [key: string]: string } = <{ [key: string]: string }>{};
             interfaceProperties.forEach(property => {
                 property = property.trim();
                 interfacePropertiesDictionary[property.split(' ')[0]] = property.split(' ')[1];
@@ -47,12 +47,12 @@ describe('VsTest Suite', function() {
         console.log('#######################################################################################################################');
         console.log('Ensure that the interfaces file is well formatted without extra newlines or whitespaces as the parser this test uses depends on the correct formatting of the inputdatacontract.ts file');
         console.log('#######################################################################################################################');
-        
+
         checkParity(inputDataContractParityToolOutput, interfacesDictionary, interfacesDictionary.InputDataContract);
 
         function checkParity(dataContractObject: any, interfacesDictionary: any, subInterface: any) {
 
-            if (dataContractObject === null || dataContractObject === undefined ) {
+            if (dataContractObject === null || dataContractObject === undefined) {
                 return;
             }
 
@@ -81,4 +81,4 @@ describe('VsTest Suite', function() {
 
         done();
     });
-});
+});
diff --git a/Tasks/VsTestV3/make.json b/Tasks/VsTestV3/make.json
@@ -6,7 +6,7 @@
                 "dest": "./"
             },
             {
-                "url": "https://testexecution.blob.core.windows.net/testexecution/12117206/TestAgent.zip",
+                "url": "https://testexecution.blob.core.windows.net/testexecution/17144597/TestAgent.zip",
                 "dest": "./Modules"
             },
             {

diff --git a/Tasks/VsTestV3/nondistributedtest.ts b/Tasks/VsTestV3/nondistributedtest.ts
@@ -142,4 +142,4 @@ export class NonDistributedTest {
 
     private inputDataContract: InputDataContract;
     private sourceFilter: string[] = tl.getDelimitedInput('testAssemblyVer2', '\n', true);
-}
+} 
diff --git a/Tasks/VsTestV3/outputstream.ts b/Tasks/VsTestV3/outputstream.ts
@@ -75,4 +75,4 @@ export class StringErrorWritable extends stream.Writable {
 
         return line.substring(startIndex, endIndex);
     }
-}
+} 
diff --git a/Tasks/VsTestV3/package-lock.json b/Tasks/VsTestV3/package-lock.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,4 +142,4 @@ export class NonDistributedTest { @@
         private inputDataContract: InputDataContract;
         private sourceFilter: string[] = tl.getDelimitedInput('testAssemblyVer2', '\n', true);
-    }
+    }