Fixed resource file not being set when making localized calls in Gradle (#1848)

* Fixed resource file not being set when making localized calls in Gradle build. (#1843)
Added no-warning assertions to some Maven and Gradle tests. (#1847)
(cherry picked from commit f5b958c)
(cherry picked from commit 597033c)

Bumped version numbers

* Roll back Gradle patch number.
(Avoids losing work done after m101 cutoff)

Author: HSAR

Tasks/Gradle/gradletask.ts

@@ -7,6 +7,9 @@ import path = require('path');
 // Lowercased file names are to lessen the likelihood of xplat issues
 import sqGradle = require('./gradlesonar');
 
+// Set up localization resource file
+tl.setResourcePath(path.join( __dirname, 'task.json'));
+
 var wrapperScript = tl.getPathInput('wrapperScript', true, true);
 if (fs.existsSync(wrapperScript)) {
     // (The exists check above is not necessary, but we need to avoid this call when we are running L0 tests.)

Tasks/Gradle/task.json

@@ -12,7 +12,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 40
+        "Patch": 41
     },
     "demands": [
         "java"

Tasks/Gradle/task.loc.json

@@ -12,7 +12,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 40
+    "Patch": 41
   },
   "demands": [
     "java"

Tasks/Maven/mavencodeanalysis.ts

@@ -11,9 +11,6 @@ import pmd = require('./mavenpmd');
 import {AnalysisResult} from './analysisresult';
 import {ModuleAnalysis} from './moduleanalysis';
 
-// Set up for localization
-tl.setResourcePath(path.join( __dirname, 'task.json'));
-
 // Cache build variables are cached globally as they cannot change during the same build.
 var sourcesDir:string;
 var stagingDir:string;

Tasks/Maven/maventask.ts

@@ -11,6 +11,9 @@ import {SonarQubeEndpoint} from 'sonarqube-common/sonarqube-common';
 // Lowercased file names are to lessen the likelihood of xplat issues
 import codeAnalysis = require('./mavencodeanalysis');
 
+// Set up localization resource file
+tl.setResourcePath(path.join( __dirname, 'task.json'));
+
 var mavenPOMFile: string = tl.getPathInput('mavenPOMFile', true, true);
 var javaHomeSelection: string = tl.getInput('javaHomeSelection', true);
 var mavenVersionSelection: string = tl.getInput('mavenVersionSelection', true);

Tasks/Maven/task.json

@@ -16,7 +16,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 51
+        "Patch": 52
     },
     "minimumAgentVersion": "1.89.0",
     "instanceNameFormat": "Maven $(mavenPOMFile)",

Tasks/Maven/task.loc.json

@@ -16,7 +16,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 51
+    "Patch": 52
   },
   "minimumAgentVersion": "1.89.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tests/L0/Gradle/_suite.ts

@@ -628,6 +628,7 @@ describe('gradle Suite', function() {
                 assert(tr.invokedToolCount == 1, 'should have only run gradle 1 time');
                 assert(tr.resultWasSet, 'task should have set a result');
                 assert(tr.stderr.length == 0, 'should not have written to stderr');
+                assert(tr.stdout.indexOf('task.issue type=warning;') < 0, 'should not have produced any warnings');
                 assert(tr.ran('gradlew build'), 'it should have run only the default settings');
                 done();
             })
@@ -658,6 +659,7 @@ describe('gradle Suite', function() {
                 assert(tr.invokedToolCount == 1, 'should have only run gradle 1 time');
                 assert(tr.resultWasSet, 'task should have set a result');
                 assert(tr.stderr.length == 0, 'should not have written to stderr');
+                assert(tr.stdout.indexOf('task.issue type=warning;') < 0, 'should not have produced any warnings');
                 assert(tr.ran('gradlew build -I /gradle/sonar.gradle sonarqube -Dsonar.host.url=http://sonarqube/end/point -Dsonar.login=uname -Dsonar.password=pword -Dsonar.projectName=test_sqProjectName -Dsonar.projectKey=test_sqProjectKey -Dsonar.projectVersion=test_sqProjectVersion'),
                     'should have run the gradle wrapper with the appropriate SonarQube arguments');
                 done();
@@ -693,6 +695,7 @@ describe('gradle Suite', function() {
                 assert(tr.invokedToolCount == 1, 'should have only run gradle 1 time');
                 assert(tr.resultWasSet, 'task should have set a result');
                 assert(tr.stderr.length == 0, 'should not have written to stderr');
+                assert(tr.stdout.indexOf('task.issue type=warning;') < 0, 'should not have produced any warnings');
                 assert(tr.ran('gradlew build -I /gradle/sonar.gradle sonarqube -Dsonar.host.url=http://sonarqube/end/point -Dsonar.login=uname -Dsonar.password=pword -Dsonar.jdbc.url=jdbc:test:tcp://localhost:8080/sonar -Dsonar.jdbc.username=testDbUsername -Dsonar.jdbc.password=testDbPassword -Dsonar.projectName=test_sqProjectName -Dsonar.projectKey=test_sqProjectKey -Dsonar.projectVersion=test_sqProjectVersion'),
                     'should have run the gradle wrapper with the appropriate SonarQube arguments');
                 done();

Tests/L0/Maven/_suite.ts

@@ -1003,6 +1003,8 @@ describe('Maven Suite', function() {
                 // Assert
                 assert(taskRunner.resultWasSet, 'should have set a result');
                 assert(taskRunner.stdout.length > 0, 'should have written to stdout');
+                assert(taskRunner.stderr.length == 0, 'should not have written to stderr');
+                assert(taskRunner.stdout.indexOf('task.issue type=warning;') < 0, 'should not have produced any warnings');
                 assert(taskRunner.succeeded, 'task should have succeeded');
 
                 assert(taskRunner.ran('/home/bin/maven/bin/mvn -f pom.xml package pmd:pmd'),
@@ -1072,6 +1074,8 @@ describe('Maven Suite', function() {
                 // Assert
                 assert(taskRunner.resultWasSet, 'should have set a result');
                 assert(taskRunner.stdout.length > 0, 'should have written to stdout');
+                assert(taskRunner.stderr.length == 0, 'should not have written to stderr');
+                assert(taskRunner.stdout.indexOf('task.issue type=warning;') < 0, 'should not have produced any warnings');
                 assert(taskRunner.succeeded, 'task should have succeeded');
 
                 assert(taskRunner.ran('/home/bin/maven/bin/mvn -f pom.xml package pmd:pmd'),
@@ -1129,6 +1133,8 @@ describe('Maven Suite', function() {
                 // Assert
                 assert(taskRunner.resultWasSet, 'should have set a result');
                 assert(taskRunner.stdout.length > 0, 'should have written to stdout');
+                assert(taskRunner.stderr.length == 0, 'should not have written to stderr');
+                assert(taskRunner.stdout.indexOf('task.issue type=warning;') < 0, 'should not have produced any warnings');
                 assert(taskRunner.succeeded, 'task should have succeeded');
 
                 assert(taskRunner.ran('/home/bin/maven/bin/mvn -f pom.xml package'),
@@ -1186,6 +1192,9 @@ describe('Maven Suite', function() {
                 assert(taskRunner.succeeded, 'task should not have failed');
                 assert(taskRunner.resultWasSet, 'should have set a result');
                 assert(taskRunner.stdout.length > 0, 'should have written to stdout');
+                assert(taskRunner.stderr.length == 0, 'should not have written to stderr');
+                assert(taskRunner.stdout.indexOf('task.issue type=warning;') < 0, 'should not have produced any warnings');
+                assert(taskRunner.succeeded, 'task should have succeeded');
 
                 assert(taskRunner.ran('/home/bin/maven/bin/mvn -f pom.xml package pmd:pmd'),
                     'should have run maven with the correct arguments');