diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 510b27fd2..ea02853b2 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/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
diff --git a/build-tools/automation/templates/core-tests.yaml b/build-tools/automation/templates/core-tests.yaml
index 5123234f6..9cc8e6990 100644
--- a/build-tools/automation/templates/core-tests.yaml
+++ b/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
diff --git a/build-tools/automation/templates/publish-test-results.yaml b/build-tools/automation/templates/publish-test-results.yaml
new file mode 100644
index 000000000..782c367e2
--- /dev/null
+++ b/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
diff --git a/build-tools/scripts/RunNUnitTests.targets b/build-tools/scripts/RunNUnitTests.targets
index 0aac10147..ab169fe54 100644
--- a/build-tools/scripts/RunNUnitTests.targets
+++ b/build-tools/scripts/RunNUnitTests.targets
@@ -29,5 +29,10 @@
WorkingDirectory="$(_TopDir)"
ContinueOnError="ErrorAndContinue"
/>
+
\ No newline at end of file
diff --git a/tools/java-source-utils/build.gradle b/tools/java-source-utils/build.gradle
index 32b040e61..4fff4b577 100644
--- a/tools/java-source-utils/build.gradle
+++ b/tools/java-source-utils/build.gradle
@@ -54,3 +54,9 @@ jar {
}
archiveName 'java-source-utils.jar'
}
+
+test {
+ reports {
+ junitXml.enabled = true
+ }
+}
diff --git a/tools/java-source-utils/src/test/resources/UnresolvedTypes.txt b/tools/java-source-utils/src/test/resources/UnresolvedTypes.txt
index 89ce7c48d..4988cc9b6 100644
--- a/tools/java-source-utils/src/test/resources/UnresolvedTypes.txt
+++ b/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 method(example.name.UnresolvedParameterType... parameter) {
}
diff --git a/tools/java-source-utils/src/test/resources/UnresolvedTypes.xml b/tools/java-source-utils/src/test/resources/UnresolvedTypes.xml
index 3fac8937a..89762f592 100644
--- a/tools/java-source-utils/src/test/resources/UnresolvedTypes.xml
+++ b/tools/java-source-utils/src/test/resources/UnresolvedTypes.xml
@@ -2,11 +2,11 @@
-
+
+JNI Sig: method.([L.*example.name.UnresolvedParameterType;)L.*UnresolvedReturnType;]]>
diff --git a/tools/java-source-utils/src/test/resources/com/microsoft/android/JavaType.params.txt b/tools/java-source-utils/src/test/resources/com/microsoft/android/JavaType.params.txt
index e49e266d0..6e529d545 100644
--- a/tools/java-source-utils/src/test/resources/com/microsoft/android/JavaType.params.txt
+++ b/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)
instanceActionWithGenerics(T value1, E value2)
staticActionWithGenerics(T value1, TExtendsNumber value2, java.util.List unboundedList, java.util.List extendsList, java.util.List superList)
- sum(int first, int remaining)
+ sum(int first, int... remaining)
class JavaType.ASC
class JavaType.PSC
class JavaType.RNC
diff --git a/tools/java-source-utils/src/test/resources/com/microsoft/android/JavaType.xml b/tools/java-source-utils/src/test/resources/com/microsoft/android/JavaType.xml
index ff472f1c1..873dc42be 100644
--- a/tools/java-source-utils/src/test/resources/com/microsoft/android/JavaType.xml
+++ b/tools/java-source-utils/src/test/resources/com/microsoft/android/JavaType.xml
@@ -127,9 +127,9 @@
-
+
-
+