Skip to content

Commit 83bdddb

Browse files
authored
Clean up DotNetIgnore Unit Tests (#8163)
We have recently begun to remove suport for Xamarin.Android Classic. Many of the Unit Tests labeled with the "DotNetIgnore" Category were flagged as such because they did not work under .Net Android. This commit goes through and removes tests which are not relevant in the .Net Android context. It also modifies some of these tests which are relevant to work under .Net Android.
1 parent 3a89e8d commit 83bdddb

File tree

10 files changed

+14
-933
lines changed

10 files changed

+14
-933
lines changed

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

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,40 +1102,25 @@ public void BuildAppWithManagedResourceParserAndLibraries ()
11021102
}
11031103

11041104
[Test]
1105-
[Category ("DotNetIgnore")] // n/a in .NET 5, not possible to use $(TFV) of v8.0
1106-
public void CheckMaxResWarningIsEmittedAsAWarning([Values (false, true)] bool useAapt2)
1105+
public void CheckMaxResWarningIsEmittedAsAWarning()
11071106
{
1108-
AssertAaptSupported (useAapt2);
11091107
var path = Path.Combine ("temp", TestName);
11101108
var proj = new XamarinAndroidApplicationProject () {
1111-
TargetFrameworkVersion = "v8.0",
1112-
TargetSdkVersion = "26",
1113-
MinSdkVersion = null,
1114-
UseLatestPlatformSdk = false,
11151109
IsRelease = true,
11161110
OtherBuildItems = {
1117-
new BuildItem.Folder ("Resources\\values-v27\\") {
1111+
new BuildItem.Folder ("Resources\\values-v33\\") {
11181112
},
11191113
},
11201114
};
1121-
proj.AndroidUseAapt2 = useAapt2;
1122-
proj.AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\values-v27\\Strings.xml") {
1115+
proj.AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\values-v33\\Strings.xml") {
11231116
TextContent = () => @"<?xml version=""1.0"" encoding=""utf-8""?>
11241117
<resources>
11251118
<string name=""test"" >Test</string>
11261119
</resources>",
11271120
});
11281121
using (var builder = CreateApkBuilder (path)) {
1129-
if (!builder.TargetFrameworkExists (proj.TargetFrameworkVersion)) {
1130-
Assert.Ignore ($"Skipping Test. TargetFrameworkVersion {proj.TargetFrameworkVersion} was not available.");
1131-
}
11321122
Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
1133-
if (useAapt2) {
1134-
StringAssertEx.DoesNotContain ("APT0000", builder.LastBuildOutput, "Build output should not contain an APT0000 warning");
1135-
} else {
1136-
var expected = "warning APT1146: max res 26, skipping values-v27";
1137-
StringAssertEx.Contains (expected, builder.LastBuildOutput, "Build output should contain an APT1146 warning about 'max res 26, skipping values-v27'");
1138-
}
1123+
StringAssertEx.DoesNotContain ("APT0000", builder.LastBuildOutput, "Build output should not contain an APT0000 warning");
11391124
}
11401125
}
11411126

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

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -442,30 +442,6 @@ public void RemoveEventHandlerResolution ()
442442
}
443443
}
444444

445-
[Test]
446-
[Category ("DotNetIgnore")]
447-
public void JavaDocJar ()
448-
{
449-
var binding = new XamarinAndroidBindingProject () {
450-
AndroidClassParser = "class-parse",
451-
};
452-
binding.SetProperty ("DocumentationFile", "UnnamedProject.xml");
453-
using (var bindingBuilder = CreateDllBuilder ()) {
454-
binding.Jars.Add (new AndroidItem.EmbeddedJar ("javasourcejartest.jar") {
455-
BinaryContent = () => ResourceData.JavaSourceJarTestJar,
456-
});
457-
binding.OtherBuildItems.Add (new BuildItem ("JavaDocJar", "javasourcejartest-javadoc.jar") {
458-
BinaryContent = () => ResourceData.JavaSourceJarTestJavadocJar,
459-
});
460-
Assert.IsTrue (bindingBuilder.Build (binding), "binding build should have succeeded");
461-
462-
var cs_file = bindingBuilder.Output.GetIntermediaryPath (
463-
Path.Combine ("generated", "src", "Com.Xamarin.Android.Test.Msbuildtest.JavaSourceJarTest.cs"));
464-
FileAssert.Exists (cs_file);
465-
StringAssert.Contains ("Greet (string name, global::Java.Util.Date date)", File.ReadAllText (cs_file));
466-
}
467-
}
468-
469445
[Test]
470446
public void JavaSourceJar ()
471447
{
@@ -622,26 +598,6 @@ public void NothingToBind (string classParser)
622598
}
623599
}
624600

625-
[Test]
626-
[Category ("DotNetIgnore")] //TODO: @(LibraryProjectProperties) not supported yet in .NET 5+
627-
public void BugzillaBug11964 ()
628-
{
629-
var proj = new XamarinAndroidBindingProject ();
630-
631-
proj.Sources.Add (new BuildItem ("LibraryProjectProperties", "project.properties") {
632-
TextContent = () => ""
633-
});
634-
635-
using (var builder = CreateDllBuilder ()) {
636-
builder.ThrowOnBuildFailure = false;
637-
Assert.IsFalse (builder.Build (proj), "Build should have failed.");
638-
string error = builder.LastBuildOutput
639-
.SkipWhile (x => !x.StartsWith ("Build FAILED.", StringComparison.Ordinal))
640-
.FirstOrDefault (x => x.Contains ("error XA1019:"));
641-
Assert.IsNotNull (error, "Build should have failed with XA1019.");
642-
}
643-
}
644-
645601
[Test]
646602
public void BindingWithAndroidJavaSource ()
647603
{

0 commit comments

Comments
 (0)