Refactoring after merge

Author: AJMitev

FileTypeChecker.Tests/FileTypeValidatorTests.cs

@@ -1,12 +1,12 @@
-namespace FileTypeChecker.Tests
+using FileTypeChecker.Types;
+
+namespace FileTypeChecker.Tests
 {
     using System;
     using System.IO;
     using Exceptions;
     using Types;
     using NUnit.Framework;
-    using FileTypeChecker.Abstracts;
-    using System.Text;
     using System.Reflection;
 
     [TestFixture]
@@ -285,24 +285,4 @@ private static byte[] GetFileBytes(string fileName)
         }
 
     }
-
-    public class ArbitraryCsv1FileType : FileType
-    {
-        private static readonly string name = "Arbitrary Csv 1 FileType";
-        private static readonly string extension = "arbitrarycsv1filetype";
-        private static readonly byte[] magicBytes1 = Encoding.UTF8.GetBytes("ID;field_1;field_2;field_3;field_4;field_5;field_6;field_7;field_8");
-        private static readonly MagicSequence[] magicBytesJaggedArray = { new MagicSequence(magicBytes1) };
-        public ArbitraryCsv1FileType() : base(name, extension, magicBytesJaggedArray) { }
-    }
-
-    public class ArbitraryCsv2FileType : FileType
-    {
-        private static readonly string name = "Arbitrary Csv 2 FileType";
-        private static readonly string extension = "arbitrarycsv2filetype";
-        private static readonly byte[] magicBytes1 = Encoding.UTF8.GetBytes("ID;field_1;field_2;field_3;field_4;field_5;field_6;field_7;field_8;field_9");
-        private static readonly MagicSequence[] magicBytesJaggedArray = { new MagicSequence(magicBytes1) };
-        public ArbitraryCsv2FileType() : base(name, extension, magicBytesJaggedArray) { }
-    }
-
-
 }

FileTypeChecker.Tests/Setup.cs

@@ -1,17 +1,11 @@
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FileTypeChecker.Tests
 {
     [SetUpFixture]
     public class Setup
     {
-
         [OneTimeSetUp]
         public void SetUp()
         {
@@ -22,7 +16,5 @@ public void SetUp()
         public void TearDown()
         {
         }
-
-
     }
-}
+}

FileTypeChecker.Tests/StreamExtensionsTests.cs

@@ -1,4 +1,6 @@
-namespace FileTypeChecker.Tests
+using FileTypeChecker.Types;
+
+namespace FileTypeChecker.Tests
 {
     using Types;
     using Extensions;

FileTypeChecker.Tests/Types/ArbitraryCsv1FileType.cs

@@ -0,0 +1,13 @@
+using System.Text;
+using FileTypeChecker.Abstracts;
+
+namespace FileTypeChecker.Tests.Types
+{
+    public class ArbitraryCsv1FileType : FileType
+    {
+        private const string Name = "Arbitrary Csv 1 FileType";
+        private const string Extension = "arbitrarycsv1filetype";
+        private static readonly MagicSequence[] MagicBytesJaggedArray = { new MagicSequence(Encoding.UTF8.GetBytes("ID;field_1;field_2;field_3;field_4;field_5;field_6;field_7;field_8")) };
+        public ArbitraryCsv1FileType() : base(Name, Extension, MagicBytesJaggedArray) { }
+    }
+}

FileTypeChecker.Tests/Types/ArbitraryCsv2FileType.cs

@@ -0,0 +1,14 @@
+using System.Text;
+using FileTypeChecker.Abstracts;
+
+namespace FileTypeChecker.Tests.Types
+{
+    public class ArbitraryCsv2FileType : FileType
+    {
+        private const string Name = "Arbitrary Csv 2 FileType";
+        private const string Extension = "arbitrarycsv2filetype";
+        private static readonly byte[] MagicBytes = Encoding.UTF8.GetBytes("ID;field_1;field_2;field_3;field_4;field_5;field_6;field_7;field_8;field_9");
+        private static readonly MagicSequence[] MagicBytesJaggedArray = { new MagicSequence(MagicBytes) };
+        public ArbitraryCsv2FileType() : base(Name, Extension, MagicBytesJaggedArray) { }
+    }
+}

FileTypeChecker/Abstracts/FileType.cs

@@ -10,17 +10,18 @@
 
     public abstract class FileType : IFileType
     {
-
-        private int BufferSize => Math.Max( MaxMagicSequenceLength, 20);
+        private int BufferSize => Math.Max(MaxMagicSequenceLength, 20);
         private string _name;
         private string _extension;
         private MagicSequence[] _bytes;
 
-        protected FileType(string name, string extension, byte[] magicBytes) : this(name, extension, new MagicSequence(magicBytes))
+        protected FileType(string name, string extension, byte[] magicBytes) : this(name, extension,
+            new MagicSequence(magicBytes))
         {
         }
 
-        protected FileType(string name, string extension, byte[][] magicBytes) : this(name, extension, magicBytes.Select(x => new MagicSequence(x)).ToArray())
+        protected FileType(string name, string extension, byte[][] magicBytes) : this(name, extension,
+            magicBytes.Select(x => new MagicSequence(x)).ToArray())
         {
         }
 
@@ -85,7 +86,7 @@ public bool DoesMatchWith(Stream stream, bool resetPosition = true)
             if (!stream.CanRead || (stream.Position != 0 && !stream.CanSeek))
                 throw new StreamMustBeReadableException();
 
-            if (stream.Position != 0 && resetPosition) 
+            if (stream.Position != 0 && resetPosition)
                 stream.Position = 0;
 
             var buffer = new byte[BufferSize];
@@ -108,7 +109,7 @@ public async Task<bool> DoesMatchWithAsync(Stream stream, bool resetPosition = t
             if (!stream.CanRead || (stream.Position != 0 && !stream.CanSeek))
                 throw new StreamMustBeReadableException();
 
-            if (stream.Position != 0 && resetPosition) 
+            if (stream.Position != 0 && resetPosition)
                 stream.Position = 0;
 
             var buffer = new byte[BufferSize];
@@ -138,4 +139,4 @@ public int GetMatchingNumber(byte[] bytes)
 
         private bool CompareBytes(byte[] bytes) => this.Bytes.Any(byteArray => byteArray.Equals(bytes));
     }
-}
+}