Skip to content

Commit 9879dbb

Browse files
committed
fix test
1 parent 06045a1 commit 9879dbb

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/Xamarin.Android.Build.Tasks/Tasks/JavaToolTask.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ bool LogFromException (string exception, string error) {
140140

141141
bool ProcessOutput (string singleLine, AssemblyIdentityMap assemblyMap)
142142
{
143-
Log.LogDebugMessage ($"DEBUG! Processing {singleLine}");
144143
var match = CodeErrorRegEx.Match (singleLine);
145144
var exceptionMatch = ExceptionRegEx.Match (singleLine);
146145
var lp = lpRegex.Match (singleLine);

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,12 +1028,16 @@ public void WearProjectJavaBuildFailure ()
10281028
new Package { Id = "Xamarin.AndroidX.PercentLayout", Version = "1.0.0.14" },
10291029
new Package { Id = "Xamarin.AndroidX.Legacy.Support.Core.UI", Version = "1.0.0.14" },
10301030
},
1031+
SupportedOSPlatformVersion = "23",
10311032
};
10321033
var builder = CreateDotNetBuilder (proj);
10331034
Assert.IsFalse (builder.Build (), $"{proj.ProjectName} should fail.");
10341035
var text = $"java.lang.RuntimeException";
1035-
Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, text), "java.lang.RuntimeException");
1036-
1036+
Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, text), $"Output did not contain '{text}'");
1037+
text = $"is defined multiple times";
1038+
Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, text), $"Output did not contain '{text}'");
1039+
text = $"is from `androidx.core.core.aar`";
1040+
Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, text), $"Output did not contain '{text}'");
10371041
}
10381042

10391043
[Test]

0 commit comments

Comments
 (0)