Clean up the ResolveSdksTaskTests a bit

dotnet · Feb 21, 2018 · 7b63603 · 7b63603
1 parent 576a0c8
commit 7b63603
Showing 1 changed file with 18 additions and 51 deletions.
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ResolveSdksTaskTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ResolveSdksTaskTests.cs
@@ -14,16 +14,19 @@ namespace Xamarin.Android.Build.Tests {
 	[TestFixture]
 	[Parallelizable (ParallelScope.Self)]
 	public class ResolveSdksTaskTests : BaseTest {
-		#pragma warning disable 414
+#pragma warning disable 414
+
+		static ApiInfo [] apiInfoSelection = new ApiInfo [] {
+			new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
+			new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
+			new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
+		};
+
 		static object [] UseLatestAndroidSdkTestCases = new object [] {
 			new object[] {
 				/* buildtools */   "26.0.3",
 				/* jdk */ "1.8.0",
-				/* apis*/ new ApiInfo[] {
-					new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
-					new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
-					new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
-				},
+				/* apis*/ apiInfoSelection,
 				/* useLatestAndroidSdk */ true,
 				/* targetFrameworkVersion */ "v8.99",
 				/* expectedTaskResult */ true,
@@ -34,11 +37,7 @@ public class ResolveSdksTaskTests : BaseTest {
 			new object[] {
 				/* buildtools */   "26.0.3",
 				/* jdk */ "1.8.0",
-				/* apis*/ new ApiInfo[] {
-					new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
-					new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
-					new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
-				},
+				/* apis*/ apiInfoSelection,
 				/* useLatestAndroidSdk */ true,
 				/* targetFrameworkVersion */ "v8.0",
 				/* expectedTaskResult */ true,
@@ -49,11 +48,7 @@ public class ResolveSdksTaskTests : BaseTest {
 			new object[] {
 				/* buildtools */   "26.0.3",
 				/* jdk */ "1.8.0",
-				/* apis*/ new ApiInfo[] {
-					new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
-					new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
-					new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
-				},
+				/* apis*/ apiInfoSelection,
 				/* useLatestAndroidSdk */ true,
 				/* targetFrameworkVersion */ "v8.1",
 				/* expectedTaskResult */ true,
@@ -64,11 +59,7 @@ public class ResolveSdksTaskTests : BaseTest {
 			new object[] {
 				/* buildtools */   "26.0.3",
 				/* jdk */ "1.8.0",
-				/* apis*/ new ApiInfo[] {
-					new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
-					new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
-					new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
-				},
+				/* apis*/ apiInfoSelection,
 				/* useLatestAndroidSdk */ true,
 				/* targetFrameworkVersion */ "v6.0",
 				/* expectedTaskResult */ true,
@@ -79,11 +70,7 @@ public class ResolveSdksTaskTests : BaseTest {
 			new object[] {
 				/* buildtools */   "26.0.3",
 				/* jdk */ "1.8.0",
-				/* apis*/ new ApiInfo[] {
-					new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
-					new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
-					new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
-				},
+				/* apis*/ apiInfoSelection,
 				/* useLatestAndroidSdk */ true,
 				/* targetFrameworkVersion */ null,
 				/* expectedTaskResult */ true,
@@ -94,11 +81,7 @@ public class ResolveSdksTaskTests : BaseTest {
 			new object[] {
 				/* buildtools */   "26.0.3",
 				/* jdk */ "1.8.0",
-				/* apis*/ new ApiInfo[] {
-					new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
-					new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
-					new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
-				},
+				/* apis*/ apiInfoSelection,
 				/* useLatestAndroidSdk */ false,
 				/* targetFrameworkVersion */ "v8.99",
 				/* expectedTaskResult */ true,
@@ -109,11 +92,7 @@ public class ResolveSdksTaskTests : BaseTest {
 			new object[] {
 				/* buildtools */   "26.0.3",
 				/* jdk */ "1.8.0",
-				/* apis*/ new ApiInfo[] {
-					new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
-					new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
-					new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
-				},
+				/* apis*/ apiInfoSelection,
 				/* useLatestAndroidSdk */ false,
 				/* targetFrameworkVersion */ "v8.1",
 				/* expectedTaskResult */ true,
@@ -124,11 +103,7 @@ public class ResolveSdksTaskTests : BaseTest {
 			new object[] {
 				/* buildtools */   "26.0.3",
 				/* jdk */ "1.8.0",
-				/* apis*/ new ApiInfo[] {
-					new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
-					new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
-					new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
-				},
+				/* apis*/ apiInfoSelection,
 				/* useLatestAndroidSdk */ false,
 				/* targetFrameworkVersion */ "v8.0",
 				/* expectedTaskResult */ true,
@@ -139,11 +114,7 @@ public class ResolveSdksTaskTests : BaseTest {
 			new object[] {
 				/* buildtools */   "26.0.3",
 				/* jdk */ "1.8.0",
-				/* apis*/ new ApiInfo[] {
-					new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
-					new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
-					new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
-				},
+				/* apis*/ apiInfoSelection,
 				/* useLatestAndroidSdk */ false,
 				/* targetFrameworkVersion */ null,
 				/* expectedTaskResult */ true,
@@ -154,11 +125,7 @@ public class ResolveSdksTaskTests : BaseTest {
 			new object[] {
 				/* buildtools */   "26.0.3",
 				/* jdk */ "1.8.0",
-				/* apis*/ new ApiInfo[] {
-					new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0",  Stable = true  },
-					new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1",  Stable = true  },
-					new ApiInfo () { Id = "P",  Level = 28, Name = "P",    FrameworkVersion = "v8.99", Stable = false },
-				},
+				/* apis*/ apiInfoSelection,
 				/* useLatestAndroidSdk */ false,
 				/* targetFrameworkVersion */ "v6.0",
 				/* expectedTaskResult */ false,