RC: 3.11.0-rc1

Assets/Editor/InternalMenuItems.cs

@@ -6,25 +6,10 @@ namespace PatchKit.Unity.Editor
 
 public class InternalMenuItems
 {
-    [MenuItem("Tools/PatchKit Patcher Internal/Upload Asset Store Package", false, 1)]
-    public static void UploadAssetStorePackage()
-    {
-        if (string.IsNullOrEmpty(InternalSettings.Email) || string.IsNullOrEmpty(InternalSettings.Password))
-        {
-            Debug.LogError("Please set email and password in internal settings");
-            return;
-        }
-
-        AssetStoreBatchMode.UploadAssetStorePackage(
-            InternalSettings.Email, InternalSettings.Password,
-            "PatchKit Patcher",
-            new [] {"PatchKit Patcher", "Plugins/PatchKit", "Plugins/UniRx", "StreamingAssets"});
-    }
-
     [MenuItem("Tools/PatchKit Patcher Internal/Settings", false, 100)]
     public static void Settings()
     {
-        InternalSettings.Show();
+        InternalSettings.ShowSettings();
     }
 }
 

Assets/Editor/InternalSettings.cs

@@ -20,7 +20,7 @@ public static string Password
         set { EditorPrefs.SetString(PasswordKey, value); }
     }
 
-    public static void Show()
+    public static void ShowSettings()
     {
         EditorWindow window = GetWindow<InternalSettings>();
         window.Show();

Assets/Editor/Tests/GZipStreamWrapperTest.cs

@@ -0,0 +1,154 @@
+using System;
+using System.IO;
+using System.Text;
+using Ionic.Zlib;
+using NUnit.Framework;
+using PatchKit.Unity.Utilities;
+
+public class GZipStreamWrapperTest
+{
+    private class MockStream : Stream
+    {
+        public override bool CanRead
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        public override bool CanSeek
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public override bool CanWrite
+        {
+            get
+            {
+                return false;
+            }
+        }
+        public override long Length
+        {
+            get
+            {
+                return _internalStream.Length;
+            }
+        }
+
+        public override long Position
+        {
+            get
+            {
+                return _internalStream.Position;
+            }
+
+            set
+            {
+                _internalStream.Position = value;
+            }
+        }
+
+        private readonly int _packetSize;
+
+        private readonly MemoryStream _internalStream;
+
+        public MockStream(byte[] data, int packetSize)
+        {
+            _packetSize = packetSize;
+            _internalStream = new MemoryStream(data);
+        }
+
+        public override void Flush()
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            return _internalStream.Read(buffer, offset, System.Math.Min(count, _packetSize));
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            return _internalStream.Seek(offset, origin);
+        }
+
+        public override void SetLength(long value)
+        {
+            _internalStream.SetLength(value);
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+
+    private const string RawData = "1234567890987654321qwerweqrfa";
+
+    private byte[] compressedData;
+
+    [SetUp]
+    public void SetUp()
+    {
+        using (var targetStream = new MemoryStream())
+        {
+            using (var sourceStream = new MemoryStream(Encoding.ASCII.GetBytes(RawData)))
+            {
+                using (var gzipStream = new GZipStream(targetStream, CompressionMode.Compress))
+                {
+                    Streams.Copy(sourceStream, gzipStream);
+                }
+            }
+
+            compressedData = targetStream.ToArray();
+        }
+    }
+
+    [Test]
+    public void Raw_GZip_Stream_Fails_On_Mocked_Stream()
+    {
+        TestDelegate act = () => {
+            using (var targetStream = new MemoryStream())
+            {
+                using (var mockStream = new MockStream(compressedData, 5))
+                {
+                    using (var gzipStream = new GZipStream(mockStream, CompressionMode.Decompress))
+                    {
+                        Streams.Copy(gzipStream, targetStream);
+                    }
+                }
+            }
+        };
+
+        Assert.Throws(typeof(ZlibException), act);
+    }
+
+    [Test]
+    public void Wrapped_Read_Succeeds_On_Mocked_Stream()
+    {
+        string decompressed;
+        using (var targetStream = new MemoryStream())
+        {
+            using (var mockStream = new MockStream(compressedData, 5))
+            {
+                using (var wrapperStream  = new GZipReadWrapperStream(mockStream))
+                {
+                    using (var gzipStream = new GZipStream(wrapperStream, CompressionMode.Decompress))
+                    {
+                        Streams.Copy(gzipStream, targetStream);
+                    }
+                }
+            }
+
+            decompressed = Encoding.ASCII.GetString(targetStream.ToArray());
+        }
+
+        Assert.That(decompressed == RawData);
+    }
+}

Assets/Editor/Tests/RemoteResourceDownloaderTest.cs

@@ -36,7 +36,6 @@ private RemoteResource CreateTestRemoteResource()
             ChunksData = CreateTestChunksData(),
             Size = 1,
             HashCode = "hashcode",
-            TorrentUrls = new[] {"torrent-url"},
             ResourceUrls = new[]
             {
                 // TODO: Test when MetaUrl is set
@@ -50,7 +49,7 @@ private RemoteResource CreateTestRemoteResource()
                 new ResourceUrl
                 {
                     Url = "url-2",
-                    MetaUrl = null, 
+                    MetaUrl = null,
                     Country = "PL",
                     PartSize = 0,
                 }
@@ -89,66 +88,21 @@ public void TearDown()
     }
 
     [Test]
-    public void UseTorrentDownloaderFirst()
-    {
-        RemoteResource resource = CreateTestRemoteResource();
-
-        var httpDownloader = Substitute.For<IHttpDownloader>();
-        var chunkedHttpDownloader = Substitute.For<IChunkedHttpDownloader>();
-        var torrentDownloader = Substitute.For<ITorrentDownloader>();
-
-        var downloader = new RemoteResourceDownloader(_filePath, _metaFilePath, resource, true,
-            (path, urls) => httpDownloader,
-            (path, urls, data, size) => chunkedHttpDownloader,
-            (path, filePath, bytes) => torrentDownloader);
-
-        downloader.Download(CancellationToken.Empty);
-
-        chunkedHttpDownloader.DidNotReceiveWithAnyArgs().Download(CancellationToken.Empty);
-        torrentDownloader.ReceivedWithAnyArgs().Download(CancellationToken.Empty);
-    }
-
-    [Test]
-    public void UseChunkedHttpDownloaderIfTorrentFails()
-    {
-        RemoteResource resource = CreateTestRemoteResource();
-
-        var httpDownloader = Substitute.For<IHttpDownloader>();
-        var chunkedHttpDownloader = Substitute.For<IChunkedHttpDownloader>();
-        var torrentDownloader = Substitute.For<ITorrentDownloader>();
-        torrentDownloader.When(t => t.Download(CancellationToken.Empty)).Do(
-            info => { throw new DownloadFailureException("Test."); });
-
-        var downloader = new RemoteResourceDownloader(_filePath, _metaFilePath, resource, true,
-            (path, urls) => httpDownloader,
-            (path, urls, data, size) => chunkedHttpDownloader,
-            (path, filePath, bytes) => torrentDownloader);
-
-        downloader.Download(CancellationToken.Empty);
-
-        chunkedHttpDownloader.ReceivedWithAnyArgs().Download(CancellationToken.Empty);
-        torrentDownloader.ReceivedWithAnyArgs().Download(CancellationToken.Empty);
-    }
-
-    [Test]
-    public void UseChunkedHttpDownloaderIfTorrentIsNotUsed()
+    public void UseChunkedHttpDownloader()
     {
         RemoteResource resource = CreateTestRemoteResource();
 
         var httpDownloader = Substitute.For<IHttpDownloader>();
         var chunkedHttpDownloader = Substitute.For<IChunkedHttpDownloader>();
-        var torrentDownloader = Substitute.For<ITorrentDownloader>();
 
-        var downloader = new RemoteResourceDownloader(_filePath, _metaFilePath, resource, false,
+        var downloader = new RemoteResourceDownloader(_filePath, _metaFilePath, resource,
             (path, urls) => httpDownloader,
-            (path, urls, data, size) => chunkedHttpDownloader,
-            (path, filePath, bytes) => torrentDownloader);
+            (path, urls, data, size) => chunkedHttpDownloader);
 
         downloader.Download(CancellationToken.Empty);
 
         httpDownloader.DidNotReceiveWithAnyArgs().Download(CancellationToken.Empty);
         chunkedHttpDownloader.ReceivedWithAnyArgs().Download(CancellationToken.Empty);
-        torrentDownloader.DidNotReceiveWithAnyArgs().Download(CancellationToken.Empty);
     }
 
     [Test]
@@ -159,17 +113,14 @@ public void UseHttpDownloaderIfChunksAreNotAvailable()
 
         var httpDownloader = Substitute.For<IHttpDownloader>();
         var chunkedHttpDownloader = Substitute.For<IChunkedHttpDownloader>();
-        var torrentDownloader = Substitute.For<ITorrentDownloader>();
 
-        var downloader = new RemoteResourceDownloader(_filePath, _metaFilePath, resource, false,
+        var downloader = new RemoteResourceDownloader(_filePath, _metaFilePath, resource,
             (path, urls) => httpDownloader,
-            (path, urls, data, size) => chunkedHttpDownloader,
-            (path, filePath, bytes) => torrentDownloader);
+            (path, urls, data, size) => chunkedHttpDownloader);
 
         downloader.Download(CancellationToken.Empty);
 
         httpDownloader.ReceivedWithAnyArgs().Download(CancellationToken.Empty);
         chunkedHttpDownloader.DidNotReceiveWithAnyArgs().Download(CancellationToken.Empty);
-        torrentDownloader.DidNotReceiveWithAnyArgs().Download(CancellationToken.Empty);
     }
 }

Assets/PatchKit Patcher/Editor/CustomBuilding.cs → Assets/PatchKit Patcher/Editor/Building/CustomBuilding.cs

@@ -7,7 +7,7 @@
 
 namespace PatchKit.Unity
 {
-    public class CustomBuildScripts
+    public class CustomBuilding
     {
         [MenuItem("Tools/Build/Windows x86")]
         public static void BuildWindows86 ()