Skip to content

Commit 9bb07c9

Browse files
dellis1972dellis1972
committed
Add Tests
1 parent 2ae1822 commit 9bb07c9

File tree

1 file changed

+68
-2
lines changed

1 file changed

+68
-2
lines changed

‎tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs‎

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,29 +135,51 @@ public void ClassLibraryMainLauncherRuns ([Values (true, false)] bool preloadAss
135135
/* embedAssemblies */ true,
136136
/* fastDevType */ "Assemblies",
137137
/* activityStarts */ true,
138+
/* packageFormat */ "apk",
138139
},
139140
new object[] {
140141
/* embedAssemblies */ false,
141142
/* fastDevType */ "Assemblies",
142143
/* activityStarts */ true,
144+
/* packageFormat */ "apk",
143145
},
144146
new object[] {
145147
/* embedAssemblies */ true,
146148
/* fastDevType */ "Assemblies:Dexes",
147149
/* activityStarts */ true,
150+
/* packageFormat */ "apk",
148151
},
149152
new object[] {
150153
/* embedAssemblies */ false,
151154
/* fastDevType */ "Assemblies:Dexes",
152155
/* activityStarts */ false,
156+
/* packageFormat */ "apk",
157+
},
158+
new object[] {
159+
/* embedAssemblies */ true,
160+
/* fastDevType */ "Assemblies",
161+
/* activityStarts */ true,
162+
/* packageFormat */ "aab",
163+
},
164+
new object[] {
165+
/* embedAssemblies */ false,
166+
/* fastDevType */ "Assemblies",
167+
/* activityStarts */ true,
168+
/* packageFormat */ "aab",
169+
},
170+
new object[] {
171+
/* embedAssemblies */ true,
172+
/* fastDevType */ "Assemblies:Dexes",
173+
/* activityStarts */ true,
174+
/* packageFormat */ "aab",
153175
},
154176
};
155177
#pragma warning restore 414
156178

157179
[Test, Category ("Debugger")]
158180
[TestCaseSource (nameof (DebuggerCustomAppTestCases))]
159181
[Retry(5)]
160-
public void CustomApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, string fastDevType, bool activityStarts)
182+
public void CustomApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, string fastDevType, bool activityStarts, string packageFormat)
161183
{
162184
AssertCommercialBuild ();
163185
SwitchUser ();
@@ -174,6 +196,7 @@ public void CustomApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, st
174196
};
175197
proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86", "x86_64");
176198
proj.SetProperty ("EmbedAssembliesIntoApk", embedAssemblies.ToString ());
199+
proj.SetProperty ("AndroidPackageFormat", packageFormat);
177200
proj.SetDefaultTargetDevice ();
178201
proj.Sources.Add (new BuildItem.Source ("MyApplication.cs") {
179202
TextContent = () => proj.ProcessSourceTemplate (@"using System;
@@ -280,50 +303,92 @@ public override void OnCreate ()
280303
/* fastDevType */ "Assemblies",
281304
/* allowDeltaInstall */ false,
282305
/* user */ null,
306+
/* packageFormat */ "apk",
283307
},
284308
new object[] {
285309
/* embedAssemblies */ false,
286310
/* fastDevType */ "Assemblies",
287311
/* allowDeltaInstall */ false,
288312
/* user */ null,
313+
/* packageFormat */ "apk",
289314
},
290315
new object[] {
291316
/* embedAssemblies */ false,
292317
/* fastDevType */ "Assemblies",
293318
/* allowDeltaInstall */ true,
294319
/* user */ null,
320+
/* packageFormat */ "apk",
295321
},
296322
new object[] {
297323
/* embedAssemblies */ false,
298324
/* fastDevType */ "Assemblies:Dexes",
299325
/* allowDeltaInstall */ false,
300326
/* user */ null,
327+
/* packageFormat */ "apk",
301328
},
302329
new object[] {
303330
/* embedAssemblies */ false,
304331
/* fastDevType */ "Assemblies:Dexes",
305332
/* allowDeltaInstall */ true,
306333
/* user */ null,
334+
/* packageFormat */ "apk",
335+
},
336+
new object[] {
337+
/* embedAssemblies */ true,
338+
/* fastDevType */ "Assemblies",
339+
/* allowDeltaInstall */ false,
340+
/* user */ DeviceTest.GuestUserName,
341+
/* packageFormat */ "apk",
342+
},
343+
new object[] {
344+
/* embedAssemblies */ false,
345+
/* fastDevType */ "Assemblies",
346+
/* allowDeltaInstall */ false,
347+
/* user */ DeviceTest.GuestUserName,
348+
/* packageFormat */ "apk",
349+
},
350+
new object[] {
351+
/* embedAssemblies */ true,
352+
/* fastDevType */ "Assemblies",
353+
/* allowDeltaInstall */ false,
354+
/* user */ null,
355+
/* packageFormat */ "aab",
356+
},
357+
new object[] {
358+
/* embedAssemblies */ false,
359+
/* fastDevType */ "Assemblies",
360+
/* allowDeltaInstall */ false,
361+
/* user */ null,
362+
/* packageFormat */ "aab",
363+
},
364+
new object[] {
365+
/* embedAssemblies */ false,
366+
/* fastDevType */ "Assemblies",
367+
/* allowDeltaInstall */ true,
368+
/* user */ null,
369+
/* packageFormat */ "aab",
307370
},
308371
new object[] {
309372
/* embedAssemblies */ true,
310373
/* fastDevType */ "Assemblies",
311374
/* allowDeltaInstall */ false,
312375
/* user */ DeviceTest.GuestUserName,
376+
/* packageFormat */ "aab",
313377
},
314378
new object[] {
315379
/* embedAssemblies */ false,
316380
/* fastDevType */ "Assemblies",
317381
/* allowDeltaInstall */ false,
318382
/* user */ DeviceTest.GuestUserName,
383+
/* packageFormat */ "aab",
319384
},
320385
};
321386
#pragma warning restore 414
322387

323388
[Test, Category ("Debugger")]
324389
[TestCaseSource (nameof(DebuggerTestCases))]
325390
[Retry (5)]
326-
public void ApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, string fastDevType, bool allowDeltaInstall, string username)
391+
public void ApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, string fastDevType, bool allowDeltaInstall, string username, string packageFormat)
327392
{
328393
AssertCommercialBuild ();
329394
SwitchUser ();
@@ -366,6 +431,7 @@ public Foo ()
366431
EmbedAssembliesIntoApk = embedAssemblies,
367432
AndroidFastDeploymentType = fastDevType
368433
};
434+
app.SetProperty ("AndroidPackageFormat", packageFormat);
369435
app.MainPage = app.MainPage.Replace ("InitializeComponent ();", "InitializeComponent (); new Foo ();");
370436
app.AddReference (lib);
371437
app.SetAndroidSupportedAbis ("armeabi-v7a", "x86", "x86_64");

0 commit comments

Comments
 (0)