-
Notifications
You must be signed in to change notification settings - Fork 11
Update liblzma.dll to 5.2.3 from 5.2.1 #8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ied206
wants to merge
6
commits into
RomanBelkov:master
Choose a base branch
from
ied206:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4cfd424
Update liblzma.dll to 5.2.3 from 5.2.1
ied206 b4b152c
Unit test for XZ.NET
ied206 70fafc9
Remove unnecessary comments
ied206 ac927cf
Seperate tests of XZOutputStream
ied206 6093ffe
Merge branch 'develop'
ied206 8edcdad
Use 1 or 2 threads in compression tests
ied206 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| using System.Reflection; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.InteropServices; | ||
|
|
||
| [assembly: AssemblyTitle("XZ.Net.Tests")] | ||
| [assembly: AssemblyDescription("")] | ||
| [assembly: AssemblyConfiguration("")] | ||
| [assembly: AssemblyCompany("")] | ||
| [assembly: AssemblyProduct("XZ.Net.Tests")] | ||
| [assembly: AssemblyCopyright("Copyright © 2018")] | ||
| [assembly: AssemblyTrademark("")] | ||
| [assembly: AssemblyCulture("")] | ||
|
|
||
| [assembly: ComVisible(false)] | ||
|
|
||
| [assembly: Guid("d5018c9d-9a97-4655-bd12-6efc92db0217")] | ||
|
|
||
| // [assembly: AssemblyVersion("1.0.*")] | ||
| [assembly: AssemblyVersion("1.0.0.0")] | ||
| [assembly: AssemblyFileVersion("1.0.0.0")] |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
|
|
||
| namespace XZ.NET.Tests | ||
| { | ||
| [TestClass] | ||
| public class TestSetup | ||
| { | ||
| public static string BaseDir; | ||
| public static string SampleDir; | ||
|
|
||
| [AssemblyInitialize] | ||
| public static void Init(TestContext context) | ||
| { | ||
| BaseDir = Path.GetFullPath(Path.Combine(TestHelper.GetProgramAbsolutePath(), "..", "..")); | ||
| SampleDir = Path.Combine(BaseDir, "Samples"); | ||
| } | ||
|
|
||
| [AssemblyCleanup] | ||
| public static void Cleanup() | ||
| { | ||
| } | ||
| } | ||
|
|
||
| public class TestHelper | ||
| { | ||
| public static string GetProgramAbsolutePath() | ||
| { | ||
| string path = AppDomain.CurrentDomain.BaseDirectory; | ||
| if (Path.GetDirectoryName(path) != null) | ||
| path = path.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); | ||
| return path; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="..\XZ.NET\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\XZ.NET\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" /> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{D5018C9D-9A97-4655-BD12-6EFC92DB0217}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>XZ.NET.Tests</RootNamespace> | ||
| <AssemblyName>XZ.NET.Tests</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion> | ||
| <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> | ||
| <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath> | ||
| <IsCodedUITest>False</IsCodedUITest> | ||
| <TestProjectType>UnitTest</TestProjectType> | ||
| <NuGetPackageImportStamp> | ||
| </NuGetPackageImportStamp> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | ||
| <HintPath>..\XZ.NET\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | ||
| <HintPath>..\XZ.NET\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="TestSetup.cs" /> | ||
| <Compile Include="XZInputStream.Tests.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| <Compile Include="XZOutputStream.Tests.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="packages.config" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\XZ.NET\XZ.NET.csproj"> | ||
| <Project>{2A389B68-70DC-4853-81AE-56484F32E94D}</Project> | ||
| <Name>XZ.NET</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" /> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| <PropertyGroup> | ||
| <ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText> | ||
| </PropertyGroup> | ||
| <Error Condition="!Exists('..\XZ.NET\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\XZ.NET\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props'))" /> | ||
| <Error Condition="!Exists('..\XZ.NET\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\XZ.NET\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets'))" /> | ||
| </Target> | ||
| <Import Project="..\XZ.NET\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\XZ.NET\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" /> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| using System; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Security.Cryptography; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| using XZ.NET; | ||
|
|
||
| namespace XZ.NET.Tests | ||
| { | ||
| [TestClass] | ||
| public class XZInputStreamTests | ||
| { | ||
| [TestMethod] | ||
| [TestCategory("XZ.NET")] | ||
| public void Decompress() | ||
| { | ||
| Decompress_Template("A.xz", "A.pdf"); | ||
| Decompress_Template("B9.xz", "B.txt"); | ||
| Decompress_Template("B1.xz", "B.txt"); | ||
| Decompress_Template("C.xz", "C.bin"); | ||
| } | ||
|
|
||
| public void Decompress_Template(string xzFileName, string originFileName) | ||
| { | ||
| byte[] decompDigest; | ||
| byte[] originDigest; | ||
|
|
||
| string xzFile = Path.Combine(TestSetup.SampleDir, xzFileName); | ||
| string originFile = Path.Combine(TestSetup.SampleDir, originFileName); | ||
| using (MemoryStream decompMs = new MemoryStream()) | ||
| { | ||
| using (FileStream compFs = new FileStream(xzFile, FileMode.Open, FileAccess.Read, FileShare.Read)) | ||
| using (XZInputStream xz = new XZInputStream(compFs)) | ||
| { | ||
| xz.CopyTo(decompMs); | ||
| } | ||
| decompMs.Position = 0; | ||
|
|
||
| HashAlgorithm hash = SHA256.Create(); | ||
| decompDigest = hash.ComputeHash(decompMs); | ||
| } | ||
|
|
||
| using (FileStream originFs = new FileStream(originFile, FileMode.Open, FileAccess.Read, FileShare.Read)) | ||
| { | ||
| HashAlgorithm hash = SHA256.Create(); | ||
| originDigest = hash.ComputeHash(originFs); | ||
| } | ||
|
|
||
| Assert.IsTrue(decompDigest.SequenceEqual(originDigest)); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| using System; | ||
| using System.Diagnostics; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Security.Cryptography; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| using XZ.NET; | ||
|
|
||
| namespace XZ.NET.Tests | ||
| { | ||
| [TestClass] | ||
| public class XZOutputStreamTests | ||
| { | ||
| [TestMethod] | ||
| [TestCategory("XZ.NET")] | ||
| public void Compress() | ||
| { | ||
| Compress_Template("A.pdf", 1, 9); | ||
| Compress_Template("B.txt", 1, XZOutputStream.DefaultPreset); | ||
| Compress_Template("C.bin", 1, 1); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| [TestCategory("XZ.NET")] | ||
| public void CompressMultithread() | ||
| { | ||
| Compress_Template("A.pdf", 2, 6); | ||
| Compress_Template("B.txt", 2, 4); | ||
| Compress_Template("C.bin", Environment.ProcessorCount, 1); | ||
| } | ||
|
|
||
| public void Compress_Template(string sampleFileName, int threads, uint preset) | ||
| { | ||
| string tempDecompFile = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); | ||
| string tempXzFile = tempDecompFile + ".xz"; | ||
| try | ||
| { | ||
| string sampleFile = Path.Combine(TestSetup.SampleDir, sampleFileName); | ||
| using (FileStream xzCompFs = new FileStream(tempXzFile, FileMode.Create, FileAccess.Write, FileShare.None)) | ||
| using (FileStream sampleFs = new FileStream(sampleFile, FileMode.Open, FileAccess.Read, FileShare.Read)) | ||
| using (XZOutputStream xz = new XZOutputStream(xzCompFs, threads, preset, true)) | ||
| { | ||
| sampleFs.CopyTo(xz); | ||
| } | ||
|
|
||
| Process proc = new Process | ||
| { | ||
| StartInfo = new ProcessStartInfo | ||
| { | ||
| UseShellExecute = false, | ||
| CreateNoWindow = true, | ||
| FileName = Path.Combine(TestSetup.SampleDir, "xz.exe"), | ||
| Arguments = $"-k -d {tempXzFile}", | ||
| } | ||
| }; | ||
| proc.Start(); | ||
| proc.WaitForExit(); | ||
| Assert.IsTrue(proc.ExitCode == 0); | ||
|
|
||
| byte[] decompDigest; | ||
| byte[] originDigest; | ||
| using (FileStream fs = new FileStream(sampleFile, FileMode.Open, FileAccess.Read, FileShare.Read)) | ||
| { | ||
| HashAlgorithm hash = SHA256.Create(); | ||
| originDigest = hash.ComputeHash(fs); | ||
| } | ||
|
|
||
| using (FileStream fs = new FileStream(tempDecompFile, FileMode.Open, FileAccess.Read, FileShare.Read)) | ||
| { | ||
| HashAlgorithm hash = SHA256.Create(); | ||
| decompDigest = hash.ComputeHash(fs); | ||
| } | ||
|
|
||
| Assert.IsTrue(originDigest.SequenceEqual(decompDigest)); | ||
|
|
||
| } | ||
| finally | ||
| { | ||
| if (File.Exists(tempXzFile)) | ||
| File.Delete(tempXzFile); | ||
| if (File.Exists(tempDecompFile)) | ||
| File.Delete(tempDecompFile); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="MSTest.TestAdapter" version="1.2.0" targetFramework="net45" /> | ||
| <package id="MSTest.TestFramework" version="1.2.0" targetFramework="net45" /> | ||
| </packages> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To integrate unit test, targeted .Net Framework 4 Client Profile.
Multi targeting would be useful to keep compatibility with .Net Framework 2.0 ~ 3.5.