Merge branch 'release/v2.3.3'

bezzad · Feb 23, 2022 · f21b987 · f21b987
2 parents f0c1f81 + 39532e1
commit f21b987
Show file tree

Hide file tree

Showing 31 changed files with 125 additions and 94 deletions.
diff --git a/src/Downloader.Test/ExceptionHelperTest.cs b/src/Downloader.Test/ExceptionHelperTest.cs
diff --git a/...loader.Test/DownloadServiceEventsState.cs → ...Test/Helper/DownloadServiceEventsState.cs b/...loader.Test/DownloadServiceEventsState.cs → ...Test/Helper/DownloadServiceEventsState.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Downloader.Test
+namespace Downloader.Test.Helper
 {
     public class DownloadServiceEventsState
     {
@@ -21,7 +21,7 @@ public DownloadServiceEventsState(IDownloadService downloadService)
 
             downloadService.DownloadProgressChanged += (s, e) => {
                 DownloadProgressCount++;
-                DownloadProgressIsCorrect &= (e.ProgressPercentage == downloadService.Package.SaveProgress);
+                DownloadProgressIsCorrect &= e.ProgressPercentage == downloadService.Package.SaveProgress;
             };
 
             downloadService.DownloadFileCompleted += (s, e) => {

diff --git a/...ownloader.Test/DownloadIntegrationTest.cs → ...tegrationTests/DownloadIntegrationTest.cs b/...ownloader.Test/DownloadIntegrationTest.cs → ...tegrationTests/DownloadIntegrationTest.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Threading;
 
-namespace Downloader.Test
+namespace Downloader.Test.IntegrationTests
 {
     public abstract class DownloadIntegrationTest
     {
@@ -314,7 +314,7 @@ public void SpeedLimitTest()
             Config.MaximumBytesPerSecond = 256; // 256 Byte/s
             var downloader = new DownloadService(Config);
             downloader.DownloadProgressChanged += (s, e) => {
-                averageSpeed = ((averageSpeed * progressCounter) + e.BytesPerSecondSpeed) / (progressCounter + 1);
+                averageSpeed = (averageSpeed * progressCounter + e.BytesPerSecondSpeed) / (progressCounter + 1);
                 progressCounter++;
             };
 

diff --git a/...der.Test/DownloadServiceMockHelperTest.cs → ...ionTests/DownloadServiceMockHelperTest.cs b/...der.Test/DownloadServiceMockHelperTest.cs → ...ionTests/DownloadServiceMockHelperTest.cs
@@ -1,7 +1,7 @@
 using Downloader.Test.Helper;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.IntegrationTests
 {
     [TestClass]
     public class DownloadServiceMockHelperTest

diff --git a/src/Downloader.Test/DownloadServiceTest.cs → ...t/IntegrationTests/DownloadServiceTest.cs b/src/Downloader.Test/DownloadServiceTest.cs → ...t/IntegrationTests/DownloadServiceTest.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using System.Net;
 
-namespace Downloader.Test
+namespace Downloader.Test.IntegrationTests
 {
     [TestClass]
     public class DownloadServiceTest : DownloadService
@@ -121,7 +121,7 @@ public void TestPackageChunksDataAfterDispose()
             Assert.IsNotNull(Package.Chunks);
             foreach (var chunk in Package.Chunks)
             {
-                Assert.IsTrue(DummyFileHelper.AreEqual(dummyData, chunk.Storage.OpenRead()));
+                Assert.IsTrue(dummyData.AreEqual(chunk.Storage.OpenRead()));
             }
 
             Package.Clear();

diff --git a/...arallelOnTheFlyDownloadIntegrationTest.cs → ...arallelOnTheFlyDownloadIntegrationTest.cs b/...arallelOnTheFlyDownloadIntegrationTest.cs → ...arallelOnTheFlyDownloadIntegrationTest.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.IntegrationTests
 {
     [TestClass]
     public class ParallelOnTheFlyDownloadIntegrationTest : DownloadIntegrationTest

diff --git a/...rallelOnTheTempDownloadIntegrationTest.cs → ...rallelOnTheTempDownloadIntegrationTest.cs b/...rallelOnTheTempDownloadIntegrationTest.cs → ...rallelOnTheTempDownloadIntegrationTest.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.IntegrationTests
 {
     [TestClass]
     public class ParallelOnTheTempDownloadIntegrationTest : DownloadIntegrationTest

diff --git a/.../SerialOnTheFlyDownloadIntegrationTest.cs → .../SerialOnTheFlyDownloadIntegrationTest.cs b/.../SerialOnTheFlyDownloadIntegrationTest.cs → .../SerialOnTheFlyDownloadIntegrationTest.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.IntegrationTests
 {
     [TestClass]
     public class SerialOnTheFlyDownloadIntegrationTest : DownloadIntegrationTest

diff --git a/...SerialOnTheTempDownloadIntegrationTest.cs → ...SerialOnTheTempDownloadIntegrationTest.cs b/...SerialOnTheTempDownloadIntegrationTest.cs → ...SerialOnTheTempDownloadIntegrationTest.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.IntegrationTests
 {
     [TestClass]
     public class SerialOnTheTempDownloadIntegrationTest : DownloadIntegrationTest

diff --git a/src/Downloader.Test/BandwidthTest.cs → ...ownloader.Test/UnitTests/BandwidthTest.cs b/src/Downloader.Test/BandwidthTest.cs → ...ownloader.Test/UnitTests/BandwidthTest.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Threading;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class BandwidthTest

diff --git a/src/Downloader.Test/ChunkDownloaderTest.cs → ...der.Test/UnitTests/ChunkDownloaderTest.cs b/src/Downloader.Test/ChunkDownloaderTest.cs → ...der.Test/UnitTests/ChunkDownloaderTest.cs
@@ -7,7 +7,7 @@
 using Downloader.Test.Helper;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class ChunkDownloaderTest

diff --git a/src/Downloader.Test/ChunkHubTest.cs → ...Downloader.Test/UnitTests/ChunkHubTest.cs b/src/Downloader.Test/ChunkHubTest.cs → ...Downloader.Test/UnitTests/ChunkHubTest.cs
@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class ChunkHubTest

diff --git a/src/Downloader.Test/ChunkTest.cs → src/Downloader.Test/UnitTests/ChunkTest.cs b/src/Downloader.Test/ChunkTest.cs → src/Downloader.Test/UnitTests/ChunkTest.cs
@@ -5,7 +5,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public abstract class ChunkTest
@@ -145,7 +145,7 @@ public void IsValidPositionOnOverflowTest()
             // assert
             Assert.IsFalse(isValidPosition);
         }
-        
+
         [TestMethod]
         public void IsValidPositionWithEqualStorageSizeTest()
         {

diff --git a/src/Downloader.Test/DownloadBuilderTest.cs → ...der.Test/UnitTests/DownloadBuilderTest.cs b/src/Downloader.Test/DownloadBuilderTest.cs → ...der.Test/UnitTests/DownloadBuilderTest.cs
@@ -2,7 +2,7 @@
 using System;
 using System.IO;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class DownloadBuilderTest

diff --git a/...nloader.Test/DownloadConfigurationTest.cs → ...st/UnitTests/DownloadConfigurationTest.cs b/...nloader.Test/DownloadConfigurationTest.cs → ...st/UnitTests/DownloadConfigurationTest.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Reflection;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class DownloadConfigurationTest

diff --git a/src/Downloader.Test/DownloadPackageTest.cs → ...der.Test/UnitTests/DownloadPackageTest.cs b/src/Downloader.Test/DownloadPackageTest.cs → ...der.Test/UnitTests/DownloadPackageTest.cs
@@ -4,7 +4,7 @@
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public abstract class DownloadPackageTest

diff --git a/...ownloader.Test/DummyFileControllerTest.cs → ...Test/UnitTests/DummyFileControllerTest.cs b/...ownloader.Test/DummyFileControllerTest.cs → ...Test/UnitTests/DummyFileControllerTest.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Net;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class DummyFileControllerTest
@@ -36,7 +36,7 @@ public void GetFileWithNameTest()
             byte[] bytes = new byte[size];
             string filename = "testfilename.dat";
             string url = DummyFileHelper.GetFileWithNameUrl(filename, size);
-            var dummyData = Helper.DummyData.GenerateOrderedBytes(size);
+            var dummyData = DummyData.GenerateOrderedBytes(size);
 
             // act
             var headers = ReadAndGetHeaders(url, bytes);
@@ -55,7 +55,7 @@ public void GetFileWithoutHeaderTest()
             byte[] bytes = new byte[size];
             string filename = "testfilename.dat";
             string url = DummyFileHelper.GetFileWithoutHeaderUrl(filename, size);
-            var dummyData = Helper.DummyData.GenerateOrderedBytes(size);
+            var dummyData = DummyData.GenerateOrderedBytes(size);
 
             // act
             var headers = ReadAndGetHeaders(url, bytes);
@@ -74,7 +74,7 @@ public void GetFileWithContentDispositionTest()
             byte[] bytes = new byte[size];
             string filename = "testfilename.dat";
             string url = DummyFileHelper.GetFileWithContentDispositionUrl(filename, size);
-            var dummyData = Helper.DummyData.GenerateOrderedBytes(size);
+            var dummyData = DummyData.GenerateOrderedBytes(size);
 
             // act
             var headers = ReadAndGetHeaders(url, bytes);

diff --git a/src/Downloader.Test/UnitTests/ExceptionHelperTest.cs b/src/Downloader.Test/UnitTests/ExceptionHelperTest.cs
@@ -0,0 +1,84 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.IO;
+using System.Net.Http;
+
+namespace Downloader.Test.UnitTests
+{
+    [TestClass]
+    public class ExceptionHelperTest
+    {
+        [TestMethod]
+        public void HasSourceFromThisNamespaceTest()
+        {
+            // arrange
+            Exception exception = ExceptionThrower.GetException();
+            var exceptionSource = exception.Source;
+            var currentNamespace = "Downloader.Test";
+
+            // act
+            bool hasThisNamespace = exception.HasSource(currentNamespace);
+
+            // assert
+            Assert.IsTrue(hasThisNamespace,
+                $"Exception.Source: {exceptionSource}, CurrentNamespace: {currentNamespace}");
+        }
+
+        [TestMethod]
+        public void HasSourceFromNonOccurrenceNamespaceTest()
+        {
+            // arrange
+            Exception exception = ExceptionThrower.GetException();
+
+            // act
+            bool hasSocketsNamespace = exception.HasSource("System.Net.Sockets");
+            bool hasSecurityNamespace = exception.HasSource("System.Net.Security");
+
+            // assert
+            Assert.IsFalse(hasSocketsNamespace);
+            Assert.IsFalse(hasSecurityNamespace);
+        }
+    }
+
+    public static class ExceptionThrower
+    {
+        public static Exception GetException()
+        {
+            try
+            {
+                ThrowException();
+                return new Exception(); // This code will never run.
+            }
+            catch (Exception e)
+            {
+                return e;
+            }
+        }
+        private static void ThrowException()
+        {
+            try
+            {
+                ThrowIoException();
+            }
+            catch (Exception e)
+            {
+                throw new Exception("High level exception", e);
+            }
+        }
+        private static void ThrowIoException()
+        {
+            try
+            {
+                ThrowHttpRequestException();
+            }
+            catch (Exception e)
+            {
+                throw new IOException("Mid level exception", e);
+            }
+        }
+        private static void ThrowHttpRequestException()
+        {
+            throw new HttpRequestException("Low level exception");
+        }
+    }
+}
diff --git a/src/Downloader.Test/FileChunkTest.cs → ...ownloader.Test/UnitTests/FileChunkTest.cs b/src/Downloader.Test/FileChunkTest.cs → ...ownloader.Test/UnitTests/FileChunkTest.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class FileChunkTest : ChunkTest

diff --git a/...ownloader.Test/FileDownloadPackageTest.cs → ...Test/UnitTests/FileDownloadPackageTest.cs b/...ownloader.Test/FileDownloadPackageTest.cs → ...Test/UnitTests/FileDownloadPackageTest.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class FileDownloadPackageTest : DownloadPackageTest

diff --git a/src/Downloader.Test/FileHelperTest.cs → ...wnloader.Test/UnitTests/FileHelperTest.cs b/src/Downloader.Test/FileHelperTest.cs → ...wnloader.Test/UnitTests/FileHelperTest.cs
@@ -3,7 +3,7 @@
 using Downloader.Test.Helper;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class FileHelperTest

diff --git a/src/Downloader.Test/FileStorageTest.cs → ...nloader.Test/UnitTests/FileStorageTest.cs b/src/Downloader.Test/FileStorageTest.cs → ...nloader.Test/UnitTests/FileStorageTest.cs
@@ -4,7 +4,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class FileStorageTest : StorageTest

diff --git a/src/Downloader.Test/MemoryChunkTest.cs → ...nloader.Test/UnitTests/MemoryChunkTest.cs b/src/Downloader.Test/MemoryChunkTest.cs → ...nloader.Test/UnitTests/MemoryChunkTest.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class MemoryChunkTest : ChunkTest

diff --git a/...nloader.Test/MemoryDownloadPackageTest.cs → ...st/UnitTests/MemoryDownloadPackageTest.cs b/...nloader.Test/MemoryDownloadPackageTest.cs → ...st/UnitTests/MemoryDownloadPackageTest.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class MemoryDownloadPackageTest : DownloadPackageTest

diff --git a/src/Downloader.Test/MemoryStorageTest.cs → ...oader.Test/UnitTests/MemoryStorageTest.cs b/src/Downloader.Test/MemoryStorageTest.cs → ...oader.Test/UnitTests/MemoryStorageTest.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Downloader.Test
+namespace Downloader.Test.UnitTests
 {
     [TestClass]
     public class MemoryStorageTest : StorageTest