Merge remote-tracking branch 'origin/dev/v3.17.x.x'

Author: witcher112

Assets/Editor/Tests/Pack1UnarchiverTest.cs

@@ -30,9 +30,8 @@ public void Unpack()
         string metaPath = TestFixtures.GetFilePath("pack1/test.pack1.meta");
         string metaString = File.ReadAllText(metaPath);
         Pack1Meta meta = Pack1Meta.Parse(metaString);
-
-        MapHashExtractedFiles mapHashExtractedFiles = new MapHashExtractedFiles();
-        var pack1Unarchiver = new Pack1Unarchiver(archivePath, meta, _tempDir, mapHashExtractedFiles, Key);
+        
+        var pack1Unarchiver = new Pack1Unarchiver(archivePath, meta, _tempDir, Key);
         pack1Unarchiver.Unarchive(new CancellationToken());
 
         Assert.True(Directory.Exists(Path.Combine(_tempDir, "dir")));

Assets/Editor/Tests/UnarchiverTest.cs

@@ -53,8 +53,7 @@ private void CheckConsistency(string sourceDirPath, string dirPath)
     [Test]
     public void Unarchive()
     {
-        MapHashExtractedFiles mapHashExtractedFiles = new MapHashExtractedFiles();
-        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath, mapHashExtractedFiles);
+        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath);
 
         unarchiver.Unarchive(CancellationToken.Empty);
 
@@ -64,8 +63,7 @@ public void Unarchive()
     [Test]
     public void CancelUnarchive()
     {
-        MapHashExtractedFiles mapHashExtractedFiles = new MapHashExtractedFiles();
-        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath, mapHashExtractedFiles);
+        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath);
 
         CancellationTokenSource source = new CancellationTokenSource();
         source.Cancel();
@@ -76,8 +74,7 @@ public void CancelUnarchive()
     [Test]
     public void UnarchiveCorruptedArchive()
     {
-        MapHashExtractedFiles mapHashExtractedFiles = new MapHashExtractedFiles();
-        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/corrupted-zip.zip"), _dirPath, mapHashExtractedFiles);
+        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/corrupted-zip.zip"), _dirPath);
 
         Assert.That(() => unarchiver.Unarchive(CancellationToken.Empty), Throws.Exception);
     }
@@ -86,9 +83,8 @@ public void UnarchiveCorruptedArchive()
     public void UnarchiveWithPassword()
     {
         string password = "\x08\x07\x18\x24" + "123==";
-
-        MapHashExtractedFiles mapHashExtractedFiles = new MapHashExtractedFiles();
-        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/password-zip.zip"), _dirPath, mapHashExtractedFiles, password);
+        
+        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/password-zip.zip"), _dirPath, password);
 
         unarchiver.Unarchive(CancellationToken.Empty);
 
@@ -98,8 +94,7 @@ public void UnarchiveWithPassword()
     [Test]
     public void ProgressReporting()
     {
-        MapHashExtractedFiles mapHashExtractedFiles = new MapHashExtractedFiles();
-        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath, mapHashExtractedFiles);
+        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath);
 
         int? lastAmount = null;
         int? lastEntry = null;