fix path

microsoft · Oct 7, 2021 · c462a18 · c462a18
1 parent 12d30fc
commit c462a18
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 233 deletions.
diff --git a/Tasks/JavaToolInstallerV0/Tests/L0.ts b/Tasks/JavaToolInstallerV0/Tests/L0.ts
@@ -37,7 +37,7 @@ describe('JavaToolInstaller L0 Suite', function () {
 
         testRunner.run();
 
-        assert(testRunner.stdOutContained('jdkArchiveName: DestinationDirectory\\JDKname.tar.gz'), 'JDK archive should unpack in the right destination directory');
+        assert(testRunner.stdOutContained('jdkFileName: DestinationDirectory\\JDKname.tar.gz'), 'JDK archive should unpack in the right destination directory');
         assert(testRunner.succeeded, 'task should have succeeded.');       
     });
 

diff --git a/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorage.ts b/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorage.ts
@@ -35,6 +35,7 @@ process.env['ENDPOINT_DATA_ARM1_subscriptionId'] = 'dummySubscriptionId';
 
 const a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     "stats": {
+        "DestinationDirectory/JDKname.tar.gz": true,
         "DestinationDirectory\\JDKname.tar.gz": true,
     },
     "find": {
@@ -108,7 +109,7 @@ mfsClone.lstatSync = function(variable: string) {
 };
 
 mfsClone.existsSync = function (variable: string) {
-    if (variable === "DestinationDirectory\\econdlevelJDK2") {
+    if (variable === "DestinationDirectory/econdlevelJDK2" || variable === "DestinationDirectory\\econdlevelJDK2" ) {
         return false;
     } else return true;
 }

diff --git a/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorageSubFolder.ts b/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorageSubFolder.ts
@@ -37,6 +37,7 @@ process.env['ENDPOINT_DATA_ARM1_subscriptionId'] = 'dummySubscriptionId';
 const a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     "stats": {
         "DestinationDirectory\\JDKname.tar.gz": true,
+        "DestinationDirectory/JDKname.tar.gz": true,
     },
     "find": {
         "DestinationDirectory": ["rootJDK/", "rootJDK/secondlevelJDK2"],
@@ -109,7 +110,7 @@ mfsClone.lstatSync = function(variable: string) {
 };
 
 mfsClone.existsSync = function (variable: string) {
-    if (variable === "DestinationDirectory\\econdlevelJDK2") {
+    if (variable === "DestinationDirectory/econdlevelJDK2" || variable === "DestinationDirectory\\econdlevelJDK2" ) {
         return false;
     } else return true;
 }

diff --git a/Tasks/JavaToolInstallerV0/Tests/package-lock.json b/Tasks/JavaToolInstallerV0/Tests/package-lock.json