Skip to content

Commit 673249b

Browse files
rolfbjarnerolfbjarne
authored
[tests] Use 'ExecuteTask' to execute a task instead of 'Assert.IsTrue (task.Execute ())' (#24550)
Use 'ExecuteTask' to execute a task instead of 'Assert.IsTrue (task.Execute ())', because 'ExecuteTask' has much better failure reporting.
1 parent 6bcf0b3 commit 673249b

12 files changed

+46
-61
lines changed

‎tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/CollectBundleResourcesTaskTests.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,9 @@ public void LogicalNameOutsideAppBundle ()
2929
item.SetMetadata ("LocalDefiningProjectFullPath", Path.Combine (tmpdir, "A", "SDK.csproj"));
3030
item.SetMetadata ("LocalMSBuildProjectFullPath", Path.Combine (projDir, "Project.csproj"));
3131
task.BundleResources = [item];
32-
var rv = task.Execute ();
33-
34-
Assert.That (Engine.Logger.ErrorEvents.Count, Is.EqualTo (0), "Errors");
35-
32+
ExecuteTask (task);
3633
Assert.That (Engine.Logger.WarningsEvents.Count, Is.EqualTo (1), "Warnings");
3734
Assert.That (Engine.Logger.WarningsEvents [0].Message, Is.EqualTo ("The path '../B/image.png' would result in a file outside of the app bundle and cannot be used."), "Warning Message");
38-
39-
Assert.That (rv, Is.True, "Execute");
4035
} finally {
4136
Environment.CurrentDirectory = currentDirectory;
4237
}

‎tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/CollectITunesArtworkTaskTests.cs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public void UnknownImageFormat ()
1616
var task = CreateTask<CollectITunesArtwork> ();
1717
task.ITunesArtwork = new TaskItem [] { new TaskItem (Assembly.GetExecutingAssembly ().Location) };
1818

19-
Assert.IsFalse (task.Execute (), "Execute failure");
20-
Assert.AreEqual (1, Engine.Logger.ErrorEvents.Count, "ErrorCount");
19+
ExecuteTask (task, 1);
2120
Assert.That (Engine.Logger.ErrorEvents [0].Message, Does.Match ("Error loading '.*/Xamarin.MacDev.Tasks.Tests.dll': Unknown image format."), "ErrorMessage");
2221
}
2322

@@ -27,8 +26,7 @@ public void InexistentFile ()
2726
var task = CreateTask<CollectITunesArtwork> ();
2827
task.ITunesArtwork = new TaskItem [] { new TaskItem ("this-file-does-not-exist.tiff") };
2928

30-
Assert.IsFalse (task.Execute (), "Execute failure");
31-
Assert.AreEqual (1, Engine.Logger.ErrorEvents.Count, "ErrorCount");
29+
ExecuteTask (task, 1);
3230
Assert.That (Engine.Logger.ErrorEvents [0].Message, Does.Match ("'.*/this-file-does-not-exist.tiff' not found."), "ErrorMessage");
3331
}
3432

@@ -40,8 +38,7 @@ public void InvalidSize (string extension)
4038
var task = CreateTask<CollectITunesArtwork> ();
4139
task.ITunesArtwork = new TaskItem [] { new TaskItem (Path.Combine (AppPath, "Resources", "iTunesArtwork-invalid-size." + extension)) };
4240

43-
Assert.IsFalse (task.Execute (), "Execute failure");
44-
Assert.AreEqual (1, Engine.Logger.ErrorEvents.Count, "ErrorCount");
41+
ExecuteTask (task, 1);
4542
Assert.That (Engine.Logger.ErrorEvents [0].Message, Does.Match ($"Invalid iTunesArtwork dimensions [(]124x124[)] for '.*/iTunesArtwork-invalid-size.{extension}'."), "ErrorMessage");
4643
}
4744

@@ -56,8 +53,7 @@ public void MultipleSameSize (string size, string dimension)
5653
new TaskItem (Path.Combine (AppPath, "Resources", $"iTunesArtwork{size}.png")),
5754
};
5855

59-
Assert.IsFalse (task.Execute (), "Execute failure");
60-
Assert.AreEqual (1, Engine.Logger.ErrorEvents.Count, "ErrorCount");
56+
ExecuteTask (task, 1);
6157
Assert.That (Engine.Logger.ErrorEvents [0].Message, Does.Match ($"Multiple iTunesArtwork files with the same dimensions detected [(]{dimension}[)] for '.*/Resources/iTunesArtwork{size}.png'."), "ErrorMessage");
6258
}
6359

@@ -72,8 +68,7 @@ public void Valid (string extension)
7268
new TaskItem (Path.Combine (AppPath, "Resources", $"iTunesArtwork@2x.{extension}")),
7369
};
7470

75-
Assert.IsTrue (task.Execute (), "Execute");
76-
Assert.AreEqual (0, Engine.Logger.ErrorEvents.Count, "ErrorCount");
71+
ExecuteTask (task);
7772
Assert.AreEqual (2, task.ITunesArtworkWithLogicalNames.Length, "ITunesArtworkWithLogicalNames.Count");
7873
for (var i = 0; i < task.ITunesArtworkWithLogicalNames.Length; i++) {
7974
Assert.AreEqual (Path.GetFileNameWithoutExtension (task.ITunesArtwork [i].GetMetadata ("FullPath")), task.ITunesArtworkWithLogicalNames [i].GetMetadata ("LogicalName"), $"LogicalName #{i}");

‎tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/ComputeCodesignItemsTaskTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ public void Compute (ApplePlatform platform)
344344
task.GenerateDSymItems = generateDSymItems.ToArray ();
345345
task.NativeStripItems = nativeStripItems.ToArray ();
346346
task.TargetFrameworkMoniker = TargetFramework.GetTargetFramework (platform).ToString ();
347-
Assert.IsTrue (task.Execute (), "Execute");
347+
ExecuteTask (task);
348348
Assert.AreEqual (0, Engine.Logger.WarningsEvents.Count, "Warning Count");
349349

350350
VerifyCodesigningResults (infos, task.OutputCodesignItems, platform);
@@ -412,7 +412,7 @@ public void Symlinks (ApplePlatform platform)
412412
task.CodesignBundle = codesignBundle.ToArray ();
413413
task.CodesignStampPath = "codesign-stamp-path/";
414414
task.TargetFrameworkMoniker = TargetFramework.GetTargetFramework (platform).ToString ();
415-
Assert.IsTrue (task.Execute (), "Execute");
415+
ExecuteTask (task);
416416
Assert.AreEqual (0, Engine.Logger.WarningsEvents.Count, "Warning Count");
417417

418418
VerifyCodesigningResults (infos, task.OutputCodesignItems, platform);
@@ -493,7 +493,7 @@ public void SkipDirectories (ApplePlatform platform)
493493
task.CodesignBundle = codesignBundle.ToArray ();
494494
task.CodesignStampPath = "codesign-stamp-path/";
495495
task.TargetFrameworkMoniker = TargetFramework.GetTargetFramework (platform).ToString ();
496-
Assert.IsTrue (task.Execute (), "Execute");
496+
ExecuteTask (task);
497497
Assert.AreEqual (0, Engine.Logger.WarningsEvents.Count, "Warning Count");
498498

499499
VerifyCodesigningResults (infos, task.OutputCodesignItems, platform);
@@ -556,7 +556,7 @@ public void Duplicated (ApplePlatform platform)
556556
task.CodesignItems = codesignItems.ToArray ();
557557
task.CodesignStampPath = "codesign-stamp-path/";
558558
task.TargetFrameworkMoniker = TargetFramework.GetTargetFramework (platform).ToString ();
559-
Assert.IsTrue (task.Execute (), "Execute");
559+
ExecuteTask (task);
560560
Assert.AreEqual (0, Engine.Logger.WarningsEvents.Count, "Warning Count");
561561

562562
VerifyCodesigningResults (infos, task.OutputCodesignItems, platform);
@@ -630,7 +630,7 @@ public void DuplicatedWithDifferentMetadata (ApplePlatform platform)
630630
task.CodesignItems = codesignItems.ToArray ();
631631
task.CodesignStampPath = "codesign-stamp-path/";
632632
task.TargetFrameworkMoniker = TargetFramework.GetTargetFramework (platform).ToString ();
633-
Assert.IsTrue (task.Execute (), "Execute");
633+
ExecuteTask (task);
634634
Assert.AreEqual (3, Engine.Logger.WarningsEvents.Count, "Warning Count");
635635
Assert.AreEqual ("Code signing has been requested multiple times for 'Bundle.app/Contents/MonoBundle/createdump', with different metadata. The metadata 'OnlyIn1=true' has been set for one item, but not the other.", Engine.Logger.WarningsEvents [0].Message, "Message #0");
636636
Assert.AreEqual ("Code signing has been requested multiple times for 'Bundle.app/Contents/MonoBundle/createdump', with different metadata. The metadata 'InOneAndTwoWithDifferentValues' has different values for each item (once it's '1', another time it's '2').", Engine.Logger.WarningsEvents [1].Message, "Message #1");

‎tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/CreateBindingResourceTaskTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ CreateBindingResourcePackage ExecuteTask (string compress, bool symlinks, out st
2626
var currentDir = Environment.CurrentDirectory;
2727
try {
2828
Environment.CurrentDirectory = tmpdir;
29-
Assert.IsTrue (task.Execute (), "Execute");
29+
ExecuteTask (task);
3030
} finally {
3131
Environment.CurrentDirectory = currentDir;
3232
}

‎tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/DetectSdkLocationsTaskTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void InvalidXamarinSdkRoot ()
1616
var task = CreateTask<DetectSdkLocations> ();
1717
task.XamarinSdkRoot = "XYZ";
1818
task.TargetFrameworkMoniker = TargetFramework.DotNet_iOS_String;
19-
task.Execute ();
19+
ExecuteTask (task, 1);
2020

2121
Assert.AreEqual ("XYZ", task.XamarinSdkRoot, "#1");
2222
}

‎tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/GetBundleNameTaskTests.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ public class GetBundleNameTaskTests : TestBase {
1111
public void GetBundleName_MissingName ()
1212
{
1313
var task = CreateTask<GenerateBundleName> ();
14-
Assert.IsFalse (task.Execute (), "#1");
15-
Assert.AreEqual (1, Engine.Logger.ErrorEvents.Count, "#2");
14+
ExecuteTask (task, 1);
1615
}
1716

1817
[Test]
@@ -21,9 +20,8 @@ public void GetBundleName ()
2120
var task = CreateTask<GenerateBundleName> ();
2221
task.ProjectName = "!@£///Hello_World%£";
2322

24-
Assert.IsTrue (task.Execute (), "#1");
23+
ExecuteTask (task);
2524
Assert.AreEqual ("Hello_World", task.BundleName, "#2");
26-
Assert.AreEqual (0, Engine.Logger.ErrorEvents.Count, "#3");
2725
}
2826
}
2927
}

‎tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/GetPropertyListValueTaskTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ void TestExecuteTask (string property, string expected)
1717
task.Property = property;
1818

1919
if (expected is null) {
20-
Assert.IsFalse (task.Execute (), "Task was expected to fail.");
20+
ExecuteTask (task, 1);
2121
return;
2222
}
2323

24-
Assert.IsTrue (task.Execute (), "Task was expected to execute successfully.");
24+
ExecuteTask (task);
2525

2626
Assert.AreEqual (expected, task.Value, "Task produced the incorrect plist output.");
2727
}

‎tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/LocalizationStringTest.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public void AllSupportedTranslations (string culture, string errorMessage)
4141
var task = CreateTask<CollectITunesArtwork> ();
4242
task.ITunesArtwork = new TaskItem [] { new TaskItem (Assembly.GetExecutingAssembly ().Location) };
4343

44-
Assert.IsFalse (task.Execute (), "Execute failure");
45-
Assert.AreEqual (1, Engine.Logger.ErrorEvents.Count, "ErrorCount");
44+
ExecuteTask (task, 1);
4645
bool isTranslated = Engine.Logger.ErrorEvents [0].Message.Contains (errorMessage);
4746
Assert.IsTrue (isTranslated, $"Should contain \"{errorMessage}\", but instead has value: \"{Engine.Logger.ErrorEvents [0].Message}\"");
4847
} finally {

‎tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/MergeAppBundleTaskTest.cs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void TestPEAssembly ()
129129

130130
var outputBundle = Path.Combine (Cache.CreateTemporaryDirectory (), "Merged.app");
131131
var task = CreateTask (outputBundle, bundles);
132-
Assert.IsTrue (task.Execute (), "Task execution");
132+
ExecuteTask (task);
133133

134134
// The bundle should have all the files
135135
Assert.AreEqual (complexFiles.Length, Directory.GetFileSystemEntries (outputBundle).Length, "Files in bundle");
@@ -151,8 +151,7 @@ public void TestDifferentOtherFiles ()
151151

152152
var outputBundle = Path.Combine (Cache.CreateTemporaryDirectory (), "Merged.app");
153153
var task = CreateTask (outputBundle, bundles);
154-
Assert.IsFalse (task.Execute (), "Task execution");
155-
Assert.AreEqual (3, Engine.Logger.ErrorEvents.Count, "Errors:\n\t" + string.Join ("\n\t", Engine.Logger.ErrorEvents.Select ((v) => v.Message).ToArray ()));
154+
ExecuteTask (task, 3);
156155
Assert.AreEqual ("Unable to merge the file 'Something.txt', it's different between the input app bundles.", Engine.Logger.ErrorEvents [0].Message, "Error message");
157156
Assert.That (Engine.Logger.ErrorEvents [1].Message, Does.Match ("App bundle file #1: .*/MergeMe.app/Something.txt"), "Error message 2");
158157
Assert.That (Engine.Logger.ErrorEvents [2].Message, Does.Match ("App bundle file #2: .*/MergeMe.app/Something.txt"), "Error message 3");
@@ -177,7 +176,7 @@ public void TestSymlinks ()
177176

178177
var outputBundle = Path.Combine (Cache.CreateTemporaryDirectory (), "Merged.app");
179178
var task = CreateTask (outputBundle, bundleA, bundleB);
180-
Assert.IsTrue (task.Execute (), "Task execution");
179+
ExecuteTask (task);
181180
Assert.IsTrue (PathUtils.IsSymlink (Path.Combine (outputBundle, "B.txt")), "IsSymlink");
182181
}
183182

@@ -205,8 +204,7 @@ public void TestSymlinksWithDifferentTargets ()
205204

206205
var outputBundle = Path.Combine (Cache.CreateTemporaryDirectory (), "Merged.app");
207206
var task = CreateTask (outputBundle, bundleA, bundleB);
208-
Assert.IsFalse (task.Execute (), "Task execution");
209-
Assert.AreEqual (3, Engine.Logger.ErrorEvents.Count, "Errors:\n\t" + string.Join ("\n\t", Engine.Logger.ErrorEvents.Select ((v) => v.Message).ToArray ()));
207+
ExecuteTask (task, 3);
210208
Assert.AreEqual ("Can't merge the symlink 'B.txt', it has different targets.", Engine.Logger.ErrorEvents [0].Message, "Error message");
211209
Assert.That (Engine.Logger.ErrorEvents [1].Message, Does.Match ("App bundle file #1: .*/MergeMe.app/B.txt"), "Error message 2");
212210
Assert.That (Engine.Logger.ErrorEvents [2].Message, Does.Match ("App bundle file #2: .*/MergeMe.app/B.txt"), "Error message 3");
@@ -239,7 +237,7 @@ public void TestDirectories ()
239237

240238
var outputBundle = Path.Combine (Cache.CreateTemporaryDirectory (), "Merged.app");
241239
var task = CreateTask (outputBundle, bundleA, bundleB);
242-
Assert.IsTrue (task.Execute (), "Task execution");
240+
ExecuteTask (task);
243241
Assert.That (Path.Combine (outputBundle, onlyA), Does.Exist, "onlyA");
244242
Assert.That (Path.Combine (outputBundle, onlyB), Does.Exist, "onlyB");
245243
Assert.That (Path.Combine (outputBundle, bothAB), Does.Exist, "bothAB");
@@ -261,7 +259,7 @@ public void TestSingleInput ()
261259
var bundle = CreateAppBundle (Path.GetDirectoryName (fileA), Path.GetFileName (fileA));
262260
var outputBundle = Path.Combine (Cache.CreateTemporaryDirectory (), "Merged.app");
263261
var task = CreateTask (outputBundle, bundle);
264-
Assert.IsTrue (task.Execute (), "Task execution");
262+
ExecuteTask (task);
265263

266264
// The bundle should only contain a single file.
267265
Assert.AreEqual (1, Directory.GetFileSystemEntries (outputBundle).Length, "Files in bundle");
@@ -294,7 +292,7 @@ public void TestDirectoriesAsSymlinks ()
294292

295293
var outputBundle = Path.Combine (Cache.CreateTemporaryDirectory (), "Merged.app");
296294
var task = CreateTask (outputBundle, bundleA, bundleB);
297-
Assert.IsTrue (task.Execute (), "Task execution");
295+
ExecuteTask (task);
298296
Assert.IsTrue (PathUtils.IsSymlink (Path.Combine (outputBundle, "B")), "IsSymlink");
299297
Assert.IsFalse (PathUtils.IsSymlink (Path.Combine (outputBundle, "A", "A.txt")), "IsSymlink");
300298
Assert.IsFalse (PathUtils.IsSymlink (Path.Combine (outputBundle, "B", "A.txt")), "IsSymlink");

‎tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/ParseBundlerArgumentsTests.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ class CustomParseBundlerArguments : ParseBundlerArguments { }
1515
public void NoExtraArgs ()
1616
{
1717
var task = CreateTask<CustomParseBundlerArguments> ();
18-
Assert.IsTrue (task.Execute (), "execute");
18+
ExecuteTask (task);
1919
Assert.AreEqual ("false", task.NoSymbolStrip, "nosymbolstrip");
2020
Assert.AreEqual ("false", task.NoDSymUtil, "nodsymutil");
2121

2222
task = CreateTask<CustomParseBundlerArguments> ();
2323
task.ExtraArgs = string.Empty;
24-
Assert.IsTrue (task.Execute (), "execute");
24+
ExecuteTask (task);
2525
Assert.AreEqual ("false", task.NoSymbolStrip, "nosymbolstrip");
2626
Assert.AreEqual ("false", task.NoDSymUtil, "nodsymutil");
2727
}
@@ -47,15 +47,15 @@ public void NoSymbolStrip ()
4747
foreach (var variation in false_variations) {
4848
var task = CreateTask<CustomParseBundlerArguments> ();
4949
task.ExtraArgs = variation;
50-
Assert.IsTrue (task.Execute (), "execute: " + variation);
50+
ExecuteTask (task, message: "execute: " + variation);
5151
Assert.AreEqual ("false", task.NoSymbolStrip, "nosymbolstrip: " + variation);
5252
Assert.AreEqual ("false", task.NoDSymUtil, "nodsymutil: " + variation);
5353
}
5454

5555
foreach (var variation in true_variations) {
5656
var task = CreateTask<CustomParseBundlerArguments> ();
5757
task.ExtraArgs = variation;
58-
Assert.IsTrue (task.Execute (), "execute: " + variation);
58+
ExecuteTask (task, message: "execute: " + variation);
5959
Assert.AreEqual ("true", task.NoSymbolStrip, "nosymbolstrip: " + variation);
6060
Assert.AreEqual ("false", task.NoDSymUtil, "nodsymutil: " + variation);
6161
}
@@ -85,15 +85,15 @@ public void NoDSymUtil ()
8585
foreach (var variation in false_variations) {
8686
var task = CreateTask<CustomParseBundlerArguments> ();
8787
task.ExtraArgs = variation;
88-
Assert.IsTrue (task.Execute (), "execute: " + variation);
88+
ExecuteTask (task, message: "execute: " + variation);
8989
Assert.AreEqual ("false", task.NoSymbolStrip, "nosymbolstrip: " + variation);
9090
Assert.AreEqual ("false", task.NoDSymUtil, "nodsymutil: " + variation);
9191
}
9292

9393
foreach (var variation in true_variations) {
9494
var task = CreateTask<CustomParseBundlerArguments> ();
9595
task.ExtraArgs = variation;
96-
Assert.IsTrue (task.Execute (), "execute: " + variation);
96+
ExecuteTask (task, message: "execute: " + variation);
9797
Assert.AreEqual ("false", task.NoSymbolStrip, "nosymbolstrip: " + variation);
9898
Assert.AreEqual ("true", task.NoDSymUtil, "nodsymutil: " + variation);
9999
}
@@ -116,7 +116,7 @@ public void MarshalManagedExceptionMode (string input, string output, string exi
116116
var task = CreateTask<CustomParseBundlerArguments> ();
117117
task.MarshalManagedExceptionMode = existingValue;
118118
task.ExtraArgs = input;
119-
Assert.IsTrue (task.Execute (), input);
119+
ExecuteTask (task, message: input);
120120
Assert.AreEqual (output, task.MarshalManagedExceptionMode, output);
121121
}
122122

@@ -137,7 +137,7 @@ public void MarshalObjetiveCExceptionMode (string input, string output, string e
137137
var task = CreateTask<CustomParseBundlerArguments> ();
138138
task.MarshalObjectiveCExceptionMode = existingValue;
139139
task.ExtraArgs = input;
140-
Assert.IsTrue (task.Execute (), input);
140+
ExecuteTask (task, message: input);
141141
Assert.AreEqual (output, task.MarshalObjectiveCExceptionMode, output);
142142
}
143143

@@ -155,7 +155,7 @@ public void Optimize (string input, string output)
155155
{
156156
var task = CreateTask<CustomParseBundlerArguments> ();
157157
task.ExtraArgs = input;
158-
Assert.IsTrue (task.Execute (), input);
158+
ExecuteTask (task, message: input);
159159
Assert.AreEqual (output, task.Optimize, output);
160160
}
161161

@@ -171,7 +171,7 @@ public void Registrar (string input, string output)
171171
{
172172
var task = CreateTask<CustomParseBundlerArguments> ();
173173
task.ExtraArgs = input;
174-
Assert.IsTrue (task.Execute (), input);
174+
ExecuteTask (task, message: input);
175175
Assert.AreEqual (output, task.Registrar, output);
176176
}
177177

@@ -197,7 +197,7 @@ void XmlDefinitionsTest (string input, string existing, string output)
197197
if (existing is not null)
198198
task.XmlDefinitions = existing.Split (new char [] { ';' }, StringSplitOptions.RemoveEmptyEntries).Select (v => new TaskItem (v)).ToArray ();
199199
task.ExtraArgs = input;
200-
Assert.IsTrue (task.Execute (), input);
200+
ExecuteTask (task, message: input);
201201
Assert.AreEqual (output, string.Join (";", task.XmlDefinitions.Select (v => v.ItemSpec).ToArray ()), output);
202202
}
203203

@@ -218,7 +218,7 @@ public void CustomBundleName (string input, string output)
218218
{
219219
var task = CreateTask<CustomParseBundlerArguments> ();
220220
task.ExtraArgs = input;
221-
Assert.IsTrue (task.Execute (), input);
221+
ExecuteTask (task, message: input);
222222
Assert.AreEqual (output, task.CustomBundleName, output);
223223
}
224224

@@ -235,7 +235,7 @@ public void CustomLinkFlags (string input, string [] output)
235235
{
236236
var task = CreateTask<CustomParseBundlerArguments> ();
237237
task.ExtraArgs = input;
238-
Assert.IsTrue (task.Execute (), input);
238+
ExecuteTask (task, message: input);
239239
CollectionAssert.AreEquivalent (output, task.CustomLinkFlags.Select (v => v.ItemSpec).ToArray (), string.Join (" ", output));
240240
}
241241

@@ -249,7 +249,7 @@ public void Verbosity (string input, string output)
249249
{
250250
var task = CreateTask<CustomParseBundlerArguments> ();
251251
task.ExtraArgs = input;
252-
Assert.IsTrue (task.Execute (), input);
252+
ExecuteTask (task, message: input);
253253
Assert.AreEqual (output, task.Verbosity, "Equality");
254254
}
255255

@@ -263,7 +263,7 @@ public void NoWarn (string input, string output)
263263
{
264264
var task = CreateTask<CustomParseBundlerArguments> ();
265265
task.ExtraArgs = input;
266-
Assert.IsTrue (task.Execute (), input);
266+
ExecuteTask (task, message: input);
267267
Assert.AreEqual (output, task.NoWarn, output);
268268
}
269269

@@ -277,7 +277,7 @@ public void WarnAsError (string input, string output)
277277
{
278278
var task = CreateTask<CustomParseBundlerArguments> ();
279279
task.ExtraArgs = input;
280-
Assert.IsTrue (task.Execute (), input);
280+
ExecuteTask (task, message: input);
281281
Assert.AreEqual (output, task.WarnAsError, output);
282282
}
283283
}

0 commit comments

Comments
 (0)