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

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,19 @@ 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: -c $(Build.Configuration) tools/java-source-utils/java-source-utils.csproj -t:RunTests
+  continueOnError: true
+
+- task: PublishTestResults@2
+  displayName: Publish JUnit Test Results
+  condition: eq('${{ parameters.runJavaTests }}', 'true')
+  inputs:
+    testResultsFormat: JUnit
+    testResultsFiles: 'tools/java-source-utils/build/test-results/**/TEST-*.xml'
+  continueOnError: true

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

@@ -0,0 +1,16 @@
+steps:
+- task: PublishTestResults@2
+  displayName: Publish NUnit Test Results
+  condition: succeededOrFailed()
+  inputs:
+    testResultsFormat: NUnit
+    testResultsFiles: TestResult-*.xml
+  continueOnError: true
+
+- task: PublishTestResults@2
+  displayName: Publish JUnit Test Results
+  condition: ne('$(Agent.OS)', 'Windows')
+  inputs:
+    testResultsFormat: JUnit
+    testResultsFiles: '**/TEST-*.xml'
+  continueOnError: true

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>