[java-source-utils] Fix regresion from 77c9c5f

Context: 77c9c5f

Commit 77c9c5f introduced a regression in `tools/java-source-utils`,
wherein the unit tests would fail, e.g.

	org.junit.ComparisonFailure: ../../../com/xamarin/JavaType.java Javadoc XML expected:<...um">
	      <javadoc>[<![CDATA[JNI sig: Lcom/xamarin/JavaEnum;]]></javadoc>
	…
	      </m...> but was:<...um">
	      <javadoc>[
	        <![CDATA[JNI sig: Lcom/xamarin/JavaEnum;]]>

Part of the problem is that this failure was *overlooked*;
it's very common for PR builds to fail because mono SIGSEGVs, and we
don't always take the time to restart failed PR builds to ensure that
they're green (oops).  The Windows builds, meanwhile, were green.
Consequently, when commit 77c9c5f introduced a test failure in the
`java-source-utils` unit tests, but we didn't see the failure.
This "lack of seeing" is in part because we've become inured to test
failures (mono SIGSEGVs), but also because the `java-source-utils`
unit tests:

 1. Are *only* run on the `mac_build` job, and

 2. The results of the `java-source-utils` unit tests are not
    shown in DevOps' **Tests** tab.

    The only way to see the failure is to read the full
    **Mac - Mono** > **Run Tests** output, and know what you're
    looking for.

Fix these two more fundamental issues:

 1. Update `tools/java-source-utils/build.gradle` so that when
    `gradle test` is run, JUnit XML-formatted test result files
    are created.

 2. Update `core-tests.yaml` so that the `java-source-utils` unit
    tests are executed.

 3. Publish the XML files created between (1) and (2).

This should ensure that future `java-source-utils` failures are
appropriately seen and not ignored.

I then ran a PR build without fixing anything, verifying that the
**Tests** tab now shows the expected unit tests failures.

Fix the `java-source-utils` unit test expected output, so that the
`java-source-utils` unit tests pass once again…on macOS.  They don't
current pass on Windows, for currently unknown reasons (but probably
line ending-related).  We will enable Windows support later.

Author: jonpryor

build-tools/automation/azure-pipelines.yaml

@@ -70,12 +70,7 @@ jobs:
       msbuildArguments: /p:TestAssembly="bin\Test$(Build.Configuration)\generator-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.JavaCallableWrappers-Tests.dll;bin\Test$(Build.Configuration)\logcat-parse-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.Bytecode-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.Generator-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.SourceWriter-Tests.dll"
     condition: succeededOrFailed()
 
-  - task: PublishTestResults@2
-    displayName: Publish Test Results
-    inputs:
-      testResultsFormat: NUnit
-      testResultsFiles: TestResult-*.xml
-    condition: succeededOrFailed()
+  - template: templates\publish-test-results.yaml
 
 - job: windows_dotnet_build
   displayName: Windows - .NET Core
@@ -145,12 +140,7 @@ jobs:
       exit $r
     displayName: Run Tests
 
-  - task: PublishTestResults@2
-    displayName: Publish Test Results
-    inputs:
-      testResultsFormat: NUnit
-      testResultsFiles: TestResult-*.xml
-    condition: succeededOrFailed()
+  - template: templates\publish-test-results.yaml
 
   - task: CopyFiles@2
     displayName: 'Copy Files to: Artifact Staging Directory'
@@ -189,5 +179,6 @@ jobs:
   - template: templates\core-tests.yaml
     parameters:
       runNativeTests: true
+      runJavaTests: true
 
   - template: templates\fail-on-issue.yaml

build-tools/automation/templates/core-tests.yaml

@@ -1,6 +1,7 @@
 parameters:
   condition: succeeded()
   runNativeTests: false
+  runJavaTests: false
 
 steps:
 - task: DotNetCoreCLI@2
@@ -106,3 +107,18 @@ steps:
     command: test
     arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop-PerformanceTests.dll
   continueOnError: true
+
+- task: DotNetCoreCLI@2
+  displayName: 'Tests: java-source-utils'
+  condition: eq('${{ parameters.runJavaTests }}', 'true')
+  inputs:
+    command: build
+    arguments: tools/java-source-utils/java-source-utils.csproj /t:RunTests
+  continueOnError: true
+
+- task: PublishTestResults@2
+  displayName: Publish JUnit Test Results
+  inputs:
+    testResultsFormat: JUnit
+    testResultsFiles: 'tools/java-source-utils/build/test-results/**/TEST-*.xml'
+  condition: succeededOrFailed()

build-tools/automation/templates/publish-test-results.yaml

@@ -0,0 +1,14 @@
+steps:
+- task: PublishTestResults@2
+  displayName: Publish NUnit Test Results
+  inputs:
+    testResultsFormat: NUnit
+    testResultsFiles: TestResult-*.xml
+  condition: succeededOrFailed()
+
+- task: PublishTestResults@2
+  displayName: Publish JUnit Test Results
+  inputs:
+    testResultsFormat: JUnit
+    testResultsFiles: '**/TEST-*.xml'
+  condition: succeededOrFailed()

build-tools/scripts/RunNUnitTests.targets

@@ -29,5 +29,10 @@
         WorkingDirectory="$(_TopDir)"
         ContinueOnError="ErrorAndContinue"
     />
+    <MSBuild
+        Condition=" !$([MSBuild]::IsOSPlatform ('windows')) "
+        Projects="$(MSBuildThisFileDirectory)..\..\tools\java-source-utils\java-source-utils.csproj"
+        Targets="RunTests"
+    />
   </Target>
 </Project>

tools/java-source-utils/build.gradle

@@ -54,3 +54,9 @@ jar {
     }
     archiveName 'java-source-utils.jar'
 }
+
+test {
+    reports {
+        junitXml.enabled = true
+    }
+}

tools/java-source-utils/src/test/resources/UnresolvedTypes.txt

@@ -4,7 +4,7 @@ public class UnresolvedTypes {
 	/**
 	 * Method using unresolvable types.  As such, we make do.
 	 *
-	 * JNI Sig: method.(L.*example.name.UnresolvedParameterType;)L.*UnresolvedReturnType;
+	 * JNI Sig: method.([L.*example.name.UnresolvedParameterType;)L.*UnresolvedReturnType;
 	 */
 	public static UnresolvedReturnType<String, Integer> method(example.name.UnresolvedParameterType<Class>... parameter) {
 	}

tools/java-source-utils/src/test/resources/UnresolvedTypes.xml

@@ -2,11 +2,11 @@
 <api api-source="java-source-utils">
   <package jni-name="example" name="example">
     <class jni-signature="Lexample/UnresolvedTypes;" name="UnresolvedTypes">
-      <method jni-return="L.*UnresolvedReturnType;" jni-signature="(L.*example.name.UnresolvedParameterType;)L.*UnresolvedReturnType;" name="method" return=".*UnresolvedReturnType">
+      <method jni-return="L.*UnresolvedReturnType;" jni-signature="([L.*example.name.UnresolvedParameterType;)L.*UnresolvedReturnType;" name="method" return=".*UnresolvedReturnType">
         <parameter jni-type="[L.*example.name.UnresolvedParameterType;" name="parameter" type=".*example.name.UnresolvedParameterType..."/>
         <javadoc><![CDATA[Method using unresolvable types.  As such, we make do.
 
-JNI Sig: method.(L.*example.name.UnresolvedParameterType;)L.*UnresolvedReturnType;]]></javadoc>
+JNI Sig: method.([L.*example.name.UnresolvedParameterType;)L.*UnresolvedReturnType;]]></javadoc>
       </method>
     </class>
   </package>

tools/java-source-utils/src/test/resources/com/microsoft/android/JavaType.params.txt

@@ -10,7 +10,7 @@ package com.xamarin
     func(java.lang.String[] values)
     <T> instanceActionWithGenerics(T value1, E value2)
     <T, TExtendsNumber, TThrowable> staticActionWithGenerics(T value1, TExtendsNumber value2, java.util.List<?> unboundedList, java.util.List<? extends java.lang.Number> extendsList, java.util.List<? super java.lang.Throwable> superList)
-    sum(int first, int remaining)
+    sum(int first, int... remaining)
   class JavaType.ASC<E>
   class JavaType.PSC<E>
   class JavaType.RNC<E,E2>

tools/java-source-utils/src/test/resources/com/microsoft/android/JavaType.xml

@@ -127,9 +127,9 @@
         <parameter jni-type="Ljava/util/List;" name="superList" type="java.util.List&lt;? super java.lang.Throwable&gt;"/>
         <javadoc><![CDATA[JNI sig: staticActionWithGenerics.(Ljava/lang/Object;Ljava/lang/Number;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V]]></javadoc>
       </method>
-      <method jni-return="I" jni-signature="(II)I" name="sum" return="int">
+      <method jni-return="I" jni-signature="(I[I)I" name="sum" return="int">
         <parameter jni-type="I" name="first" type="int"/>
-        <parameter jni-type="I" name="remaining" type="int"/>
+        <parameter jni-type="[I" name="remaining" type="int..."/>
         <javadoc><![CDATA[JNI sig: sum.(I[I)I]]></javadoc>
       </method>
     </class>