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

Update SquirrelAwareDetector tests

Browse Source
This commit is contained in:
Caelan Sayler
2022-01-01 20:38:05 +00:00
parent b328456718
commit cb50fc8728
9 changed files with 20 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/ContentTypeTests.cs
View File

@@ -9,7 +9,7 @@ using Squirrel.NuGet;
using Squirrel.Tests.TestHelpers;
using Xunit;
namespace Squirrel.Tests.Core
namespace Squirrel.Tests
{
public class ContentTypeTests
{

2
test/DeltaPackageTests.cs
View File

@@ -8,7 +8,7 @@ using Squirrel.SimpleSplat;
using Squirrel.Tests.TestHelpers;
using Xunit;
namespace Squirrel.Tests.Core
namespace Squirrel.Tests
{
public class ApplyDeltaPackageTests : IEnableLogger
{

2
test/ReleaseEntryTests.cs
View File

@@ -6,7 +6,7 @@ using Squirrel.Tests.TestHelpers;
using Xunit;
using Squirrel.NuGet;
namespace Squirrel.Tests.Core
namespace Squirrel.Tests
{
public class ReleaseEntryTests
{

2
test/ReleasePackageTests.cs
View File

@@ -12,7 +12,7 @@ using Squirrel.SimpleSplat;
using Xunit;
using Squirrel.NuGet;
namespace Squirrel.Tests.Core
namespace Squirrel.Tests
{
public class CreateReleasePackageTests : IEnableLogger
{

67
test/SquirrelAwareExecutableDetectorTests.cs
View File

@@ -14,14 +14,6 @@ namespace Squirrel.Tests
{
public class SquirrelAwareExecutableDetectorTests
{
#if DEBUG
private const string NativeBuildRootRelativePath = @"..\build\Debug\Win32\";
private const string ManagedBuildRootRelativePath = @"..\build\Debug\net5.0\";
#else
private const string NativeBuildRootRelativePath = @"..\build\Release\Win32\";
private const string ManagedBuildRootRelativePath = @"..\build\Release\net5.0\";
#endif
[Fact]
public void AtomShellShouldBeSquirrelAware()
{
@@ -31,16 +23,6 @@ namespace Squirrel.Tests
Assert.True(SquirrelAwareExecutableDetector.GetSquirrelAwareVersion(target) == 1);
}
[Fact]
public void SquirrelAwareViaVersionBlock()
{
var target = IntegrationTestHelper.GetPath(NativeBuildRootRelativePath, "Setup.exe");
Assert.True(File.Exists(target));
var ret = SquirrelAwareExecutableDetector.GetSquirrelAwareVersion(target);
Assert.Equal(1, ret.Value);
}
[Fact]
public void SquirrelAwareViaLanguageNeutralVersionBlock()
{
@@ -51,46 +33,6 @@ namespace Squirrel.Tests
Assert.Equal(1, ret.Value);
}
[Fact]
public void SquirrelAwareViaNetCoreAssemblyAttribute()
{
var target = IntegrationTestHelper.GetPath("fixtures", "SquirrelAwareNetCoreApp.exe");
Assert.True(File.Exists(target));
var ret = SquirrelAwareExecutableDetector.GetSquirrelAwareVersion(target);
Assert.Equal(1, ret.Value);
}
[Fact]
public void SquirrelAwareViaAssemblyAttribute()
{
var target = Assembly.GetExecutingAssembly().Location;
Assert.True(File.Exists(target));
var ret = SquirrelAwareExecutableDetector.GetSquirrelAwareVersion(target);
Assert.Equal(1, ret.Value);
}
[Fact]
public void NotSquirrelAware()
{
var target = IntegrationTestHelper.GetPath(ManagedBuildRootRelativePath, "Update.exe");
Assert.True(File.Exists(target));
var ret = SquirrelAwareExecutableDetector.GetSquirrelAwareVersion(target);
Assert.Null(ret);
}
[Fact]
public void SquirrelAwareTestAppShouldBeSquirrelAware()
{
var target = IntegrationTestHelper.GetPath("fixtures", "SquirrelAwareApp.exe");
Assert.True(File.Exists(target));
Assert.NotNull(SquirrelAwareExecutableDetector.GetSquirrelAwareVersion(target));
}
[Fact]
public void NotSquirrelAwareTestAppShouldNotBeSquirrelAware()
{
@@ -100,5 +42,14 @@ namespace Squirrel.Tests
Assert.Null(SquirrelAwareExecutableDetector.GetSquirrelAwareVersion(target));
}
[Fact]
public void SquirrelAwareViaManifest()
{
var target = IntegrationTestHelper.GetPath("fixtures", "PublishSingleFileAwareApp.exe");
Assert.True(File.Exists(target));
var ret = SquirrelAwareExecutableDetector.GetSquirrelAwareVersion(target);
Assert.Equal(1, ret);
}
}
}

20
test/TestHelpers/IntegrationTestHelper.cs
View File

@@ -76,12 +76,13 @@ namespace Squirrel.Tests.TestHelpers
{
var targetDir = default(string);
var nuget = IntegrationTestHelper.GetPath("..", ".nuget", "nuget.exe");
nuspecFile = nuspecFile ?? "SquirrelInstalledApp.nuspec";
using (var clearTemp = Utility.WithTempDirectory(out targetDir)) {
var nuspec = File.ReadAllText(IntegrationTestHelper.GetPath("fixtures", nuspecFile), Encoding.UTF8);
File.WriteAllText(Path.Combine(targetDir, nuspecFile), nuspec.Replace("0.1.0", version), Encoding.UTF8);
var nuspecPath = Path.Combine(targetDir, nuspecFile);
File.WriteAllText(nuspecPath, nuspec.Replace("0.1.0", version), Encoding.UTF8);
File.Copy(
IntegrationTestHelper.GetPath("fixtures", "SquirrelAwareApp.exe"),
@@ -90,20 +91,7 @@ namespace Squirrel.Tests.TestHelpers
IntegrationTestHelper.GetPath("fixtures", "NotSquirrelAwareApp.exe"),
Path.Combine(targetDir, "NotSquirrelAwareApp.exe"));
var psi = new ProcessStartInfo(nuget, "pack " + Path.Combine(targetDir, nuspecFile)) {
RedirectStandardError = true,
RedirectStandardOutput = true,
UseShellExecute = false,
CreateNoWindow = true,
WorkingDirectory = targetDir,
WindowStyle = ProcessWindowStyle.Hidden,
};
var pi = Process.Start(psi);
pi.WaitForExit();
var output = pi.StandardOutput.ReadToEnd();
var err = pi.StandardError.ReadToEnd();
Console.WriteLine(output); Console.WriteLine(err);
HelperExe.NugetPack(nuspecPath, targetDir, targetDir).GetAwaiter().GetResult();
var di = new DirectoryInfo(targetDir);
var pkg = di.EnumerateFiles("*.nupkg").First();

2
test/UpdateManagerTests.cs
View File

@@ -111,7 +111,7 @@ namespace Squirrel.Tests
}
}
[Fact(Skip = "This test is currently failing in CI")]
[Fact]
public async Task SpecialCharactersInitialInstallTest()
{
string tempDir;

4
test/UtilityTests.cs
View File

@@ -10,7 +10,7 @@ using Squirrel.Tests.TestHelpers;
using Xunit;
using Squirrel.Shell;
namespace Squirrel.Tests.Core
namespace Squirrel.Tests
{
public class UtilityTests : IEnableLogger
{
@@ -125,7 +125,7 @@ namespace Squirrel.Tests.Core
Assert.Equal(sha1FromExternalTool, sha1, StringComparer.OrdinalIgnoreCase);
}
[Fact(Skip="This test takes forever")]
[Fact]
public void CanDeleteDeepRecursiveDirectoryStructure()
{
string tempDir;

BIN
test/fixtures/PublishSingleFileAwareApp.exe vendored Normal file
View File

Binary file not shown.