Skip to content

Commit 35b248f

Browse files
dellis1972dellis1972
committed
Clean up the ResolveSdksTaskTests a bit
1 parent d2460d3 commit 35b248f

File tree

1 file changed

+18
-51
lines changed

1 file changed

+18
-51
lines changed

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ResolveSdksTaskTests.cs

Lines changed: 18 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@ namespace Xamarin.Android.Build.Tests {
1414
[TestFixture]
1515
[Parallelizable (ParallelScope.Self)]
1616
public class ResolveSdksTaskTests : BaseTest {
17-
#pragma warning disable 414
17+
#pragma warning disable 414
18+
19+
static ApiInfo [] apiInfoSelection = new ApiInfo [] {
20+
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
21+
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
22+
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
23+
};
24+
1825
static object [] UseLatestAndroidSdkTestCases = new object [] {
1926
new object[] {
2027
/* buildtools */ "26.0.3",
2128
/* jdk */ "1.8.0",
22-
/* apis*/ new ApiInfo[] {
23-
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
24-
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
25-
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
26-
},
29+
/* apis*/ apiInfoSelection,
2730
/* useLatestAndroidSdk */ true,
2831
/* targetFrameworkVersion */ "v8.99",
2932
/* expectedTaskResult */ true,
@@ -34,11 +37,7 @@ public class ResolveSdksTaskTests : BaseTest {
3437
new object[] {
3538
/* buildtools */ "26.0.3",
3639
/* jdk */ "1.8.0",
37-
/* apis*/ new ApiInfo[] {
38-
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
39-
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
40-
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
41-
},
40+
/* apis*/ apiInfoSelection,
4241
/* useLatestAndroidSdk */ true,
4342
/* targetFrameworkVersion */ "v8.0",
4443
/* expectedTaskResult */ true,
@@ -49,11 +48,7 @@ public class ResolveSdksTaskTests : BaseTest {
4948
new object[] {
5049
/* buildtools */ "26.0.3",
5150
/* jdk */ "1.8.0",
52-
/* apis*/ new ApiInfo[] {
53-
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
54-
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
55-
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
56-
},
51+
/* apis*/ apiInfoSelection,
5752
/* useLatestAndroidSdk */ true,
5853
/* targetFrameworkVersion */ "v8.1",
5954
/* expectedTaskResult */ true,
@@ -64,11 +59,7 @@ public class ResolveSdksTaskTests : BaseTest {
6459
new object[] {
6560
/* buildtools */ "26.0.3",
6661
/* jdk */ "1.8.0",
67-
/* apis*/ new ApiInfo[] {
68-
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
69-
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
70-
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
71-
},
62+
/* apis*/ apiInfoSelection,
7263
/* useLatestAndroidSdk */ true,
7364
/* targetFrameworkVersion */ "v6.0",
7465
/* expectedTaskResult */ true,
@@ -79,11 +70,7 @@ public class ResolveSdksTaskTests : BaseTest {
7970
new object[] {
8071
/* buildtools */ "26.0.3",
8172
/* jdk */ "1.8.0",
82-
/* apis*/ new ApiInfo[] {
83-
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
84-
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
85-
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
86-
},
73+
/* apis*/ apiInfoSelection,
8774
/* useLatestAndroidSdk */ true,
8875
/* targetFrameworkVersion */ null,
8976
/* expectedTaskResult */ true,
@@ -94,11 +81,7 @@ public class ResolveSdksTaskTests : BaseTest {
9481
new object[] {
9582
/* buildtools */ "26.0.3",
9683
/* jdk */ "1.8.0",
97-
/* apis*/ new ApiInfo[] {
98-
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
99-
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
100-
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
101-
},
84+
/* apis*/ apiInfoSelection,
10285
/* useLatestAndroidSdk */ false,
10386
/* targetFrameworkVersion */ "v8.99",
10487
/* expectedTaskResult */ true,
@@ -109,11 +92,7 @@ public class ResolveSdksTaskTests : BaseTest {
10992
new object[] {
11093
/* buildtools */ "26.0.3",
11194
/* jdk */ "1.8.0",
112-
/* apis*/ new ApiInfo[] {
113-
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
114-
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
115-
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
116-
},
95+
/* apis*/ apiInfoSelection,
11796
/* useLatestAndroidSdk */ false,
11897
/* targetFrameworkVersion */ "v8.1",
11998
/* expectedTaskResult */ true,
@@ -124,11 +103,7 @@ public class ResolveSdksTaskTests : BaseTest {
124103
new object[] {
125104
/* buildtools */ "26.0.3",
126105
/* jdk */ "1.8.0",
127-
/* apis*/ new ApiInfo[] {
128-
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
129-
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
130-
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
131-
},
106+
/* apis*/ apiInfoSelection,
132107
/* useLatestAndroidSdk */ false,
133108
/* targetFrameworkVersion */ "v8.0",
134109
/* expectedTaskResult */ true,
@@ -139,11 +114,7 @@ public class ResolveSdksTaskTests : BaseTest {
139114
new object[] {
140115
/* buildtools */ "26.0.3",
141116
/* jdk */ "1.8.0",
142-
/* apis*/ new ApiInfo[] {
143-
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
144-
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
145-
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
146-
},
117+
/* apis*/ apiInfoSelection,
147118
/* useLatestAndroidSdk */ false,
148119
/* targetFrameworkVersion */ null,
149120
/* expectedTaskResult */ true,
@@ -154,11 +125,7 @@ public class ResolveSdksTaskTests : BaseTest {
154125
new object[] {
155126
/* buildtools */ "26.0.3",
156127
/* jdk */ "1.8.0",
157-
/* apis*/ new ApiInfo[] {
158-
new ApiInfo () { Id = "26", Level = 26, Name = "Oreo", FrameworkVersion = "v8.0", Stable = true },
159-
new ApiInfo () { Id = "27", Level = 27, Name = "Oreo", FrameworkVersion = "v8.1", Stable = true },
160-
new ApiInfo () { Id = "P", Level = 28, Name = "P", FrameworkVersion = "v8.99", Stable = false },
161-
},
128+
/* apis*/ apiInfoSelection,
162129
/* useLatestAndroidSdk */ false,
163130
/* targetFrameworkVersion */ "v6.0",
164131
/* expectedTaskResult */ false,

0 commit comments

Comments
 (0)