From a7690ee03b21126cc6f4c8ba50b74401ab4b3c13 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 26 Aug 2022 13:40:12 +0200 Subject: [PATCH] [tests] Add global imports to the .NET unit tests to simplify code. (#15770) --- tests/dotnet/UnitTests/AssetsTest.cs | 7 ------- tests/dotnet/UnitTests/BundleStructureTest.cs | 9 --------- tests/dotnet/UnitTests/GlobalImports.cs | 10 ++++++++++ tests/dotnet/UnitTests/IncrementalBuildTest.cs | 10 ---------- tests/dotnet/UnitTests/PackTest.cs | 8 -------- tests/dotnet/UnitTests/PartialAppManifestTest.cs | 7 ------- tests/dotnet/UnitTests/PostBuildTest.cs | 9 --------- tests/dotnet/UnitTests/ProjectTest.cs | 9 --------- tests/dotnet/UnitTests/PublishTrimmedTest.cs | 7 ------- tests/dotnet/UnitTests/TemplateProjectTest.cs | 9 --------- tests/dotnet/UnitTests/TemplateTest.cs | 8 -------- tests/dotnet/UnitTests/TestBaseClass.cs | 9 --------- 12 files changed, 10 insertions(+), 92 deletions(-) create mode 100644 tests/dotnet/UnitTests/GlobalImports.cs diff --git a/tests/dotnet/UnitTests/AssetsTest.cs b/tests/dotnet/UnitTests/AssetsTest.cs index 16c7df1f7b..93a95c8cb9 100644 --- a/tests/dotnet/UnitTests/AssetsTest.cs +++ b/tests/dotnet/UnitTests/AssetsTest.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; using System.Text.Json; -using NUnit.Framework; -using Xamarin.Utils; #nullable enable diff --git a/tests/dotnet/UnitTests/BundleStructureTest.cs b/tests/dotnet/UnitTests/BundleStructureTest.cs index 8b6c24b5f8..6d443d5bde 100644 --- a/tests/dotnet/UnitTests/BundleStructureTest.cs +++ b/tests/dotnet/UnitTests/BundleStructureTest.cs @@ -1,14 +1,5 @@ #nullable enable -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; - -using NUnit.Framework; - -using Xamarin.Utils; - namespace Xamarin.Tests { [TestFixture] public class BundleStructureTest : TestBaseClass { diff --git a/tests/dotnet/UnitTests/GlobalImports.cs b/tests/dotnet/UnitTests/GlobalImports.cs new file mode 100644 index 0000000000..443ecc6a86 --- /dev/null +++ b/tests/dotnet/UnitTests/GlobalImports.cs @@ -0,0 +1,10 @@ +global using System; +global using System.Collections.Generic; +global using System.IO; +global using System.Linq; +global using System.Text; + +global using NUnit.Framework; + +global using Xamarin.MacDev; +global using Xamarin.Utils; diff --git a/tests/dotnet/UnitTests/IncrementalBuildTest.cs b/tests/dotnet/UnitTests/IncrementalBuildTest.cs index d086d9cb20..c5b1ac816b 100644 --- a/tests/dotnet/UnitTests/IncrementalBuildTest.cs +++ b/tests/dotnet/UnitTests/IncrementalBuildTest.cs @@ -1,15 +1,5 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; - using Microsoft.Build.Logging.StructuredLogger; -using NUnit.Framework; - -using Xamarin.Utils; -using Xamarin.MacDev; - namespace Xamarin.Tests { public class IncrementalBuildTest : TestBaseClass { diff --git a/tests/dotnet/UnitTests/PackTest.cs b/tests/dotnet/UnitTests/PackTest.cs index 729f54bfc8..ca7702be5e 100644 --- a/tests/dotnet/UnitTests/PackTest.cs +++ b/tests/dotnet/UnitTests/PackTest.cs @@ -1,14 +1,6 @@ #nullable enable -using System; -using System.IO; using System.IO.Compression; -using System.Linq; - -using NUnit.Framework; - -using Xamarin.Utils; -using Xamarin.MacDev; namespace Xamarin.Tests { public class PackTest : TestBaseClass { diff --git a/tests/dotnet/UnitTests/PartialAppManifestTest.cs b/tests/dotnet/UnitTests/PartialAppManifestTest.cs index 3b97a31626..1e2049f307 100644 --- a/tests/dotnet/UnitTests/PartialAppManifestTest.cs +++ b/tests/dotnet/UnitTests/PartialAppManifestTest.cs @@ -1,10 +1,3 @@ -using System.Collections.Generic; - -using NUnit.Framework; - -using Xamarin.Utils; -using Xamarin.MacDev; - namespace Xamarin.Tests { public class PartialAppManifestTest : TestBaseClass { diff --git a/tests/dotnet/UnitTests/PostBuildTest.cs b/tests/dotnet/UnitTests/PostBuildTest.cs index 9fc1920c8b..b291cfe912 100644 --- a/tests/dotnet/UnitTests/PostBuildTest.cs +++ b/tests/dotnet/UnitTests/PostBuildTest.cs @@ -1,12 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.IO; - -using NUnit.Framework; - -using Xamarin.Utils; - using Microsoft.Build.Framework; using Microsoft.Build.Logging.StructuredLogger; using Mono.Cecil; diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs index 55758a7932..9c89268c7c 100644 --- a/tests/dotnet/UnitTests/ProjectTest.cs +++ b/tests/dotnet/UnitTests/ProjectTest.cs @@ -1,18 +1,9 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; using System.Diagnostics; using Mono.Cecil; -using NUnit.Framework; - -using Xamarin.Utils; using Xamarin.Tests; -using Xamarin.MacDev; #nullable enable diff --git a/tests/dotnet/UnitTests/PublishTrimmedTest.cs b/tests/dotnet/UnitTests/PublishTrimmedTest.cs index e23c7d9242..8634b5cf6d 100644 --- a/tests/dotnet/UnitTests/PublishTrimmedTest.cs +++ b/tests/dotnet/UnitTests/PublishTrimmedTest.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using NUnit.Framework; - -using Xamarin.Utils; - namespace Xamarin.Tests { [TestFixture] public class PublishTrimmedTest : TestBaseClass { diff --git a/tests/dotnet/UnitTests/TemplateProjectTest.cs b/tests/dotnet/UnitTests/TemplateProjectTest.cs index c85c1a2e3b..f7fb6cb8ba 100644 --- a/tests/dotnet/UnitTests/TemplateProjectTest.cs +++ b/tests/dotnet/UnitTests/TemplateProjectTest.cs @@ -1,14 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.IO; -using System.Text; using System.Threading.Tasks; -using NUnit.Framework; - -using Xamarin.Utils; - using Microsoft.Build.Framework; using Microsoft.Build.Logging.StructuredLogger; diff --git a/tests/dotnet/UnitTests/TemplateTest.cs b/tests/dotnet/UnitTests/TemplateTest.cs index 562056d1eb..c7e13d5bf0 100644 --- a/tests/dotnet/UnitTests/TemplateTest.cs +++ b/tests/dotnet/UnitTests/TemplateTest.cs @@ -1,14 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Text.Json; using System.Text.Json.Serialization; -using NUnit.Framework; - -using Xamarin.Utils; - namespace Xamarin.Tests { [TestFixture] public class TemplateTest : TestBaseClass { diff --git a/tests/dotnet/UnitTests/TestBaseClass.cs b/tests/dotnet/UnitTests/TestBaseClass.cs index 83a2a72c7b..67096cc982 100644 --- a/tests/dotnet/UnitTests/TestBaseClass.cs +++ b/tests/dotnet/UnitTests/TestBaseClass.cs @@ -1,19 +1,10 @@ #nullable enable -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; using Mono.Cecil; -using NUnit.Framework; - -using Xamarin.Utils; using Xamarin.Tests; -using Xamarin.MacDev; namespace Xamarin.Tests { [TestFixture]