Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

test code formatting

Browse Source
This commit is contained in:
Caelan Sayler
2022-03-18 12:07:14 +00:00
parent da50aa829a
commit f2560d945f
5 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/ApplyReleasesTests.cs
View File

@@ -227,8 +227,7 @@ namespace Squirrel.Tests
public void ThrowsWhenOnlyDeltaReleasesAreAvailable()
{
string tempDir;
using (Utility.WithTempDirectory(out tempDir))
{
using (Utility.WithTempDirectory(out tempDir)) {
var appDir = Directory.CreateDirectory(Path.Combine(tempDir, "theApp"));
var packages = Path.Combine(appDir.FullName, "packages");
Directory.CreateDirectory(packages);
@@ -352,8 +351,7 @@ namespace Squirrel.Tests
{
string tempDir;
using (Utility.WithTempDirectory(out tempDir))
{
using (Utility.WithTempDirectory(out tempDir)) {
string appDir = Path.Combine(tempDir, "theApp");
string packagesDir = Path.Combine(appDir, "packages");
Directory.CreateDirectory(packagesDir);
@@ -469,8 +467,8 @@ namespace Squirrel.Tests
var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(tempDir, "theApp", "packages", "Squirrel.Core.1.0.0.0-full.nupkg"));
var deltaEntry = ReleaseEntry.GenerateFromFile(Path.Combine(tempDir, "theApp", "packages", "Squirrel.Core.1.1.0.0-delta.nupkg"));
var resultObs = (Task<ReleaseEntry>)fixture.GetType().GetMethod("createFullPackagesFromDeltas", BindingFlags.NonPublic | BindingFlags.Instance)
.Invoke(fixture, new object[] { new[] {deltaEntry}, baseEntry, null });
var resultObs = (Task<ReleaseEntry>) fixture.GetType().GetMethod("createFullPackagesFromDeltas", BindingFlags.NonPublic | BindingFlags.Instance)
.Invoke(fixture, new object[] { new[] { deltaEntry }, baseEntry, null });
var result = await resultObs;
var zp = new ZipPackage(Path.Combine(tempDir, "theApp", "packages", result.Filename));
@@ -503,7 +501,7 @@ namespace Squirrel.Tests
Thread.Sleep(1000);
}
}
[Fact]
public void UnshimOurselvesSmokeTest()
{

2
test/DownloadReleasesTests.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

34
test/TestHelpers/AssertExtensions.cs
View File

@@ -120,24 +120,22 @@ namespace Squirrel.Tests.TestHelpers
static string ToSafeString(this char c)
{
if (Char.IsControl(c) || Char.IsWhiteSpace(c))
{
switch (c)
{
case '\r':
return @"\r";
case '\n':
return @"\n";
case '\t':
return @"\t";
case '\a':
return @"\a";
case '\v':
return @"\v";
case '\f':
return @"\f";
default:
return String.Format("\\u{0:X};", (int)c);
if (Char.IsControl(c) || Char.IsWhiteSpace(c)) {
switch (c) {
case '\r':
return @"\r";
case '\n':
return @"\n";
case '\t':
return @"\t";
case '\a':
return @"\a";
case '\v':
return @"\v";
case '\f':
return @"\f";
default:
return String.Format("\\u{0:X};", (int) c);
}
}
return c.ToString(CultureInfo.InvariantCulture);

8
test/TestHelpers/IntegrationTestHelper.cs
View File

@@ -19,7 +19,7 @@ namespace Squirrel.Tests.TestHelpers
public static string GetPath(params string[] paths)
{
var ret = GetIntegrationTestRootDirectory();
return (new FileInfo(paths.Aggregate (ret, Path.Combine))).FullName;
return (new FileInfo(paths.Aggregate(ret, Path.Combine))).FullName;
}
public static string GetIntegrationTestRootDirectory()
@@ -35,7 +35,7 @@ namespace Squirrel.Tests.TestHelpers
public static bool SkipTestOnXPAndVista()
{
int osVersion = Environment.OSVersion.Version.Major*100 + Environment.OSVersion.Version.Minor;
int osVersion = Environment.OSVersion.Version.Major * 100 + Environment.OSVersion.Version.Minor;
return (osVersion < 601);
}
@@ -85,10 +85,10 @@ namespace Squirrel.Tests.TestHelpers
File.WriteAllText(nuspecPath, nuspec.Replace("0.1.0", version), Encoding.UTF8);
File.Copy(
IntegrationTestHelper.GetPath("fixtures", "PublishSingleFileAwareApp.exe"),
IntegrationTestHelper.GetPath("fixtures", "PublishSingleFileAwareApp.exe"),
Path.Combine(targetDir, "SquirrelAwareApp.exe"));
File.Copy(
IntegrationTestHelper.GetPath("fixtures", "NotSquirrelAwareApp.exe"),
IntegrationTestHelper.GetPath("fixtures", "NotSquirrelAwareApp.exe"),
Path.Combine(targetDir, "NotSquirrelAwareApp.exe"));
new SquirrelCli.NugetConsole().Pack(nuspecPath, targetDir, targetDir);

28
test/UpdateManagerTests.cs
View File

@@ -36,7 +36,7 @@ namespace Squirrel.Tests
await mgr.CreateUninstallerRegistryEntry();
var regKey = await mgr.CreateUninstallerRegistryEntry();
Assert.False(String.IsNullOrWhiteSpace((string)regKey.GetValue("DisplayName")));
Assert.False(String.IsNullOrWhiteSpace((string) regKey.GetValue("DisplayName")));
mgr.RemoveUninstallerRegistryEntry();
}
@@ -116,8 +116,7 @@ namespace Squirrel.Tests
public async Task SpecialCharactersInitialInstallTest()
{
string tempDir;
using (Utility.WithTempDirectory(out tempDir))
{
using (Utility.WithTempDirectory(out tempDir)) {
var remotePackageDir = Directory.CreateDirectory(Path.Combine(tempDir, "remotePackages"));
var localAppDir = Path.Combine(tempDir, "theApp");
@@ -125,8 +124,7 @@ namespace Squirrel.Tests
"SpecialCharacters-0.1.0-full.nupkg",
}.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(remotePackageDir.FullName, x)));
using (var fixture = new UpdateManager(remotePackageDir.FullName, "theApp", tempDir))
{
using (var fixture = new UpdateManager(remotePackageDir.FullName, "theApp", tempDir)) {
await fixture.FullInstall();
}
@@ -146,8 +144,7 @@ namespace Squirrel.Tests
public async Task WhenBothFilesAreInSyncNoUpdatesAreApplied()
{
string tempDir;
using (Utility.WithTempDirectory(out tempDir))
{
using (Utility.WithTempDirectory(out tempDir)) {
var appDir = Path.Combine(tempDir, "theApp");
var localPackages = Path.Combine(appDir, "packages");
var remotePackages = Path.Combine(tempDir, "releases");
@@ -165,7 +162,7 @@ namespace Squirrel.Tests
});
var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
// sync both release files
await fixture.updateLocalReleasesFile();
ReleaseEntry.BuildReleasesFile(remotePackages);
@@ -185,8 +182,7 @@ namespace Squirrel.Tests
public async Task WhenRemoteReleasesDoNotHaveDeltasNoUpdatesAreApplied()
{
string tempDir;
using (Utility.WithTempDirectory(out tempDir))
{
using (Utility.WithTempDirectory(out tempDir)) {
var appDir = Path.Combine(tempDir, "theApp");
var localPackages = Path.Combine(appDir, "packages");
var remotePackages = Path.Combine(tempDir, "releases");
@@ -230,8 +226,7 @@ namespace Squirrel.Tests
public async Task WhenTwoRemoteUpdatesAreAvailableChoosesDeltaVersion()
{
string tempDir;
using (Utility.WithTempDirectory(out tempDir))
{
using (Utility.WithTempDirectory(out tempDir)) {
var appDir = Path.Combine(tempDir, "theApp");
var localPackages = Path.Combine(appDir, "packages");
var remotePackages = Path.Combine(tempDir, "releases");
@@ -375,8 +370,7 @@ namespace Squirrel.Tests
var progress = new List<int>();
// 3 % (3 stages), check for updates
foreach (var step in new [] { 0, 33, 66, 100 })
{
foreach (var step in new[] { 0, 33, 66, 100 }) {
progress.Add(UpdateManager.CalculateProgress(step, 0, 3));
Assert.InRange(progress.Last(), 0, 3);
@@ -385,8 +379,7 @@ namespace Squirrel.Tests
Assert.Equal(3, progress.Last());
// 3 - 30 %, download releases
for (var step = 0; step <= 100; step++)
{
for (var step = 0; step <= 100; step++) {
progress.Add(UpdateManager.CalculateProgress(step, 3, 30));
Assert.InRange(progress.Last(), 3, 30);
@@ -395,8 +388,7 @@ namespace Squirrel.Tests
Assert.Equal(30, progress.Last());
// 30 - 100 %, apply releases
for (var step = 0; step <= 100; step++)
{
for (var step = 0; step <= 100; step++) {
progress.Add(UpdateManager.CalculateProgress(step, 30, 100));
Assert.InRange(progress.Last(), 30, 100);