From 6ce218177c2c1968ca01102754f7f77d8eaffcc0 Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Sat, 11 Feb 2023 08:16:51 -0800 Subject: [PATCH] Remove self-check code. This is replaced with Xunit tests. --- src/BsDiffTool/Program.cs | 102 ++++--------------------------------- src/BsPatchTool/Program.cs | 4 +- 2 files changed, 11 insertions(+), 95 deletions(-) diff --git a/src/BsDiffTool/Program.cs b/src/BsDiffTool/Program.cs index b2fdac0..afdb380 100644 --- a/src/BsDiffTool/Program.cs +++ b/src/BsDiffTool/Program.cs @@ -1,9 +1,8 @@ -using System.Diagnostics; using BsDiff; namespace BsDiffTool { - class Program + public sealed class Program { public static void Main(string[] args) { @@ -14,102 +13,19 @@ public static void Main(string[] args) return; } - // check for special command-line switch that performs a self-test - if (args[0] == "--check") - CheckImplementation(args[1], args[2]); - else - { - var oldFile = args[0]; - var newFile = args[1]; - var patchFile = args[2]; - - try - { - using (var output = new FileStream(patchFile, FileMode.Create)) - BinaryPatch.Create(File.ReadAllBytes(oldFile), File.ReadAllBytes(newFile), output); - } - catch (FileNotFoundException ex) - { - Console.Error.WriteLine("Could not open '{0}'.", ex.FileName); - } - } - } - - // Creates a patch for oldFile and newFile with the reference C implementation and this C# code, then verifies that - // the patch applies correctly. - private static void CheckImplementation(string oldFile, string newFile) - { - // to test, download bsdiff and bspatch for Windows, e.g., from http://sites.inka.de/tesla/others.html#bsdiff - const string bsdiffPath = @"C:\Util\bsdiff.exe"; - const string rbspatchPath = @"C:\Util\bspatch.exe"; - - var tempPath = Path.GetTempPath(); - var referencePatchFileName = Path.Combine(tempPath, "reference.patch"); - var portPatchFileName = Path.Combine(tempPath, "port.patch"); + var oldFile = args[0]; + var newFile = args[1]; + var patchFile = args[2]; - // run reference implementation - var referenceTime = Stopwatch.StartNew(); - using (var process = Process.Start(bsdiffPath, QuotePaths(oldFile, newFile, referencePatchFileName))) + try { - process.WaitForExit(); - referenceTime.Stop(); + using (var output = new FileStream(patchFile, FileMode.Create)) + BinaryPatch.Create(File.ReadAllBytes(oldFile), File.ReadAllBytes(newFile), output); } - - // run C# implementation - var portTime = Stopwatch.StartNew(); - using (var output = new FileStream(portPatchFileName, FileMode.Create)) - BinaryPatch.Create(File.ReadAllBytes(oldFile), File.ReadAllBytes(newFile), output); - portTime.Stop(); - - Console.WriteLine("Patches created in {0} (reference) and {1} (C# port).", referenceTime.Elapsed, portTime.Elapsed); - Console.WriteLine("File sizes (in bytes) are {0:n0} (reference) and {1:n0} (C# port).", new FileInfo(referencePatchFileName).Length, new FileInfo(portPatchFileName).Length); - - var outputFilePaths = new[] { "test-ref-ref.dat", "test-prt-ref.dat", "test-ref-prt.dat", "test-prt-prt.dat" } - .Select(fn => Path.Combine(tempPath, fn)) - .ToArray(); - - Console.Write("Applying reference patch with reference binary..."); - using (var process = Process.Start(rbspatchPath, QuotePaths(oldFile, outputFilePaths[0], referencePatchFileName))) - process.WaitForExit(); - Console.WriteLine("done."); - - Console.Write("Applying port patch with reference binary..."); - using (var process = Process.Start(rbspatchPath, QuotePaths(oldFile, outputFilePaths[1], portPatchFileName))) - process.WaitForExit(); - Console.WriteLine("done."); - - Console.Write("Applying reference patch with port binary..."); - using (var input = new FileStream(oldFile, FileMode.Open, FileAccess.Read, FileShare.Read)) - using (var output = new FileStream(outputFilePaths[2], FileMode.Create)) - BinaryPatch.Apply(input, () => new FileStream(referencePatchFileName, FileMode.Open, FileAccess.Read, FileShare.Read), output); - Console.WriteLine("done."); - - Console.Write("Applying port patch with port binary..."); - using (var input = new FileStream(oldFile, FileMode.Open, FileAccess.Read, FileShare.Read)) - using (var output = new FileStream(outputFilePaths[3], FileMode.Create)) - BinaryPatch.Apply(input, () => new FileStream(portPatchFileName, FileMode.Open, FileAccess.Read, FileShare.Read), output); - Console.WriteLine("done."); - - var errors = 0; - var expectedOutput = File.ReadAllBytes(newFile); - foreach (var filePath in outputFilePaths) + catch (FileNotFoundException ex) { - var actualOutput = File.ReadAllBytes(filePath); - if (!expectedOutput.SequenceEqual(actualOutput)) - { - Console.Error.WriteLine("Incorrect results in {0}.", Path.GetFileName(filePath)); - errors++; - } + Console.Error.WriteLine("Could not open '{0}'.", ex.FileName); } - - if (errors == 0) - Console.WriteLine("All patches are correct."); - } - - // Returns a single string that contains all paths quoted and joined with spaces. - private static string QuotePaths(params string[] paths) - { - return "\"" + string.Join("\" \"", paths) + "\""; } } } diff --git a/src/BsPatchTool/Program.cs b/src/BsPatchTool/Program.cs index 79966b9..57663bb 100644 --- a/src/BsPatchTool/Program.cs +++ b/src/BsPatchTool/Program.cs @@ -2,9 +2,9 @@ namespace BsPatchTool; -class Program +public sealed class Program { - static void Main(string[] args) + public static void Main(string[] args) { // check for correct usage if (args.Length != 3)