From e2c734e31e1d0d3dace0f7f33104cd4c6246b9df Mon Sep 17 00:00:00 2001 From: Paul Betts Date: Thu, 21 Aug 2014 16:38:41 -0700 Subject: [PATCH] Fix up the Test style --- test/ContentTypeTests.cs | 7 ++----- test/ReleasePackageTests.cs | 17 +++++------------ test/UpdateManagerTests.cs | 9 +++------ test/UtilityTests.cs | 5 +++-- 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/test/ContentTypeTests.cs b/test/ContentTypeTests.cs index 4bb43844..0866e128 100644 --- a/test/ContentTypeTests.cs +++ b/test/ContentTypeTests.cs @@ -26,8 +26,7 @@ namespace Squirrel.Tests.Core var existingTypes = GetContentTypes(expected); - try - { + try { File.Copy(inputFile, tempFile); var actual = new XmlDocument(); @@ -38,9 +37,7 @@ namespace Squirrel.Tests.Core var actualTypes = GetContentTypes(actual); Assert.Equal(existingTypes, actualTypes); - } - finally - { + } finally { File.Delete(tempFile); } } diff --git a/test/ReleasePackageTests.cs b/test/ReleasePackageTests.cs index d7c7419a..8beedcba 100644 --- a/test/ReleasePackageTests.cs +++ b/test/ReleasePackageTests.cs @@ -205,8 +205,7 @@ namespace Squirrel.Tests.Core var assemblyName = AssemblyName.GetAssemblyName(outputFile); Assert.Equal(1, assemblyName.Version.Major); Assert.Equal(5, assemblyName.Version.Minor); - } - finally { + } finally { File.Delete(outputPackage); File.Delete(outputFile); } @@ -242,8 +241,7 @@ namespace Squirrel.Tests.Core var fixture = new ReleasePackage(inputPackage); (new DirectoryInfo(sourceDir)).Exists.ShouldBeTrue(); - try - { + try { fixture.CreateReleasePackage(outputPackage, sourceDir); this.Log().Info("Resulting package is at {0}", outputPackage); @@ -264,9 +262,7 @@ namespace Squirrel.Tests.Core Assert.Contains("dir\\item-in-subdirectory.txt", contentFilePaths); Assert.Equal(1, pkg.GetLibFiles().Count()); - } - finally - { + } finally { File.Delete(outputPackage); } } @@ -281,8 +277,7 @@ namespace Squirrel.Tests.Core var rightPackage = "Caliburn.Micro.1.5.2.nupkg"; var rightPackagePath = IntegrationTestHelper.GetPath("fixtures", rightPackage); - try - { + try { var sourceDir = IntegrationTestHelper.GetPath("fixtures", "packages"); (new DirectoryInfo(sourceDir)).Exists.ShouldBeTrue(); @@ -298,9 +293,7 @@ namespace Squirrel.Tests.Core .FirstOrDefault(f => f.TargetFramework == FrameworkTargetVersion.Net45); Assert.NotNull(dependency); - } - finally - { + } finally { File.Delete(outputPackage); } } diff --git a/test/UpdateManagerTests.cs b/test/UpdateManagerTests.cs index f85dc88e..ea8ed589 100644 --- a/test/UpdateManagerTests.cs +++ b/test/UpdateManagerTests.cs @@ -85,8 +85,7 @@ namespace Squirrel.Tests "Squirrel.Core.1.0.0.0-full.nupkg", "Squirrel.Core.1.1.0.0-delta.nupkg", "Squirrel.Core.1.1.0.0-full.nupkg", - }.ForEach(x => - { + }.ForEach(x => { var path = IntegrationTestHelper.GetPath("fixtures", x); File.Copy(path, Path.Combine(localPackages, x)); File.Copy(path, Path.Combine(remotePackages, x)); @@ -125,8 +124,7 @@ namespace Squirrel.Tests "Squirrel.Core.1.0.0.0-full.nupkg", "Squirrel.Core.1.1.0.0-delta.nupkg", "Squirrel.Core.1.1.0.0-full.nupkg", - }.ForEach(x => - { + }.ForEach(x => { var path = IntegrationTestHelper.GetPath("fixtures", x); File.Copy(path, Path.Combine(localPackages, x)); }); @@ -134,8 +132,7 @@ namespace Squirrel.Tests new[] { "Squirrel.Core.1.0.0.0-full.nupkg", "Squirrel.Core.1.1.0.0-full.nupkg", - }.ForEach(x => - { + }.ForEach(x => { var path = IntegrationTestHelper.GetPath("fixtures", x); File.Copy(path, Path.Combine(remotePackages, x)); }); diff --git a/test/UtilityTests.cs b/test/UtilityTests.cs index 7587c1be..5c678deb 100644 --- a/test/UtilityTests.cs +++ b/test/UtilityTests.cs @@ -30,7 +30,6 @@ namespace Squirrel.Tests.Core { string tempDir; using (Utility.WithTempDirectory(out tempDir)) { - for (var i = 0; i < 50; i++) { var directory = Path.Combine(tempDir, newId()); CreateSampleDirectory(directory); @@ -64,6 +63,7 @@ namespace Squirrel.Tests.Core static void CreateSampleDirectory(string directory) { + Random prng = new Random(); while (true) { Directory.CreateDirectory(directory); @@ -73,12 +73,13 @@ namespace Squirrel.Tests.Core File.WriteAllText(file, Guid.NewGuid().ToString()); } - if (new Random().NextDouble() > 0.5) { + if (prng.NextDouble() > 0.5) { var childDirectory = Path.Combine(directory, newId()); if (childDirectory.Length > 248) return; directory = childDirectory; continue; } + break; } }