moving input test images into ./tests/TestImages/Input

tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs

@@ -44,7 +44,7 @@ namespace ImageSharp.Tests
                 throw new Exception("Vector.IsHardwareAccelerated == false! ('prefer32 bit' enabled?)");
             }
 
-            string path = TestFile.GetPath(fileName);
+            string path = TestFile.GetInputFileFullPath(fileName);
             byte[] bytes = File.ReadAllBytes(path);
 
             this.Measure(

tests/ImageSharp.Tests/Image/ImageTests.cs

@@ -3,6 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
+// ReSharper disable InconsistentNaming
 namespace ImageSharp.Tests
 {
     using System;
@@ -15,7 +16,7 @@ namespace ImageSharp.Tests
     /// <summary>
     /// Tests the <see cref="Image"/> class.
     /// </summary>
-    public class ImageTests
+    public class ImageTests : FileTestBase
     {
         [Fact]
         public void ConstructorByteArray()
@@ -67,8 +68,9 @@ namespace ImageSharp.Tests
         [Fact]
         public void Save_DetecedEncoding()
         {
-            string file = TestFile.GetPath("../../TestOutput/Save_DetecedEncoding.png");
+            string dir = this.CreateOutputDirectory(nameof(ImageTests));
-            System.IO.DirectoryInfo dir = System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(file));
+            string file = System.IO.Path.Combine(dir, "Save_DetecedEncoding.png");
+
             using (Image<Rgba32> image = new Image<Rgba32>(10, 10))
             {
                 image.Save(file);
@@ -81,9 +83,11 @@ namespace ImageSharp.Tests
         }
 
         [Fact]
-        public void Save_UnknownExtensionsEncoding()
+        public void Save_WhenExtensionIsUnknown_Throws()
         {
-            string file = TestFile.GetPath("../../TestOutput/Save_DetecedEncoding.tmp");
+            string dir = this.CreateOutputDirectory(nameof(ImageTests));
+            string file = System.IO.Path.Combine(dir, "Save_UnknownExtensionsEncoding_Throws.tmp");
+
             NotSupportedException ex = Assert.Throws<NotSupportedException>(
                 () =>
                     {
@@ -97,8 +101,9 @@ namespace ImageSharp.Tests
         [Fact]
         public void Save_SetEncoding()
         {
-            string file = TestFile.GetPath("../../TestOutput/Save_SetEncoding.dat");
+            string dir = this.CreateOutputDirectory(nameof(ImageTests));
-            System.IO.DirectoryInfo dir = System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(file));
+            string file = System.IO.Path.Combine(dir, "Save_SetEncoding.dat");
+
             using (Image<Rgba32> image = new Image<Rgba32>(10, 10))
             {
                 image.Save(file, new PngEncoder());

tests/ImageSharp.Tests/TestBase.cs

@@ -25,9 +25,7 @@ namespace ImageSharp.Tests
         /// </returns>
         protected string CreateOutputDirectory(string path, params string[] pathParts)
         {
-            string assemblyLocation = typeof(TestFile).GetTypeInfo().Assembly.Location;
+            path = Path.Combine(TestEnvironment.ActualOutputDirectoryFullPath, path);
-            assemblyLocation = Path.GetDirectoryName(assemblyLocation);
-            path = Path.GetFullPath(Path.Combine(assemblyLocation, "../../../TestOutput", path));
 
             if (pathParts != null && pathParts.Length > 0)
             {

tests/ImageSharp.Tests/TestFile.cs

@@ -28,7 +28,7 @@ namespace ImageSharp.Tests
         /// The formats directory, as lazy value
         /// </summary>
         // ReSharper disable once InconsistentNaming
-        private static readonly Lazy<string> formatsDirectory = new Lazy<string>(TestEnvironment.GetInputImagesDirectoryFullPath);
+        private static readonly Lazy<string> inputImagesDirectory = new Lazy<string>(() => TestEnvironment.InputImagesDirectoryFullPath);
         
         /// <summary>
         /// The image.
@@ -73,12 +73,12 @@ namespace ImageSharp.Tests
         public string FileNameWithoutExtension => Path.GetFileNameWithoutExtension(this.file);
 
         /// <summary>
-        /// Gets the "Formats" test file directory.
+        /// Gets the Input Images directory.
         /// </summary>
-        private static string FormatsDirectory => formatsDirectory.Value;
+        private static string InputImagesDirectory => inputImagesDirectory.Value;
         
         /// <summary>
-        /// Gets the full qualified path to the file.
+        /// Gets the full qualified path to the input test file.
         /// </summary>
         /// <param name="file">
         /// The file path.
@@ -86,9 +86,9 @@ namespace ImageSharp.Tests
         /// <returns>
         /// The <see cref="string"/>.
         /// </returns>
-        public static string GetPath(string file)
+        public static string GetInputFileFullPath(string file)
         {
-            return Path.Combine(FormatsDirectory, file);
+            return Path.Combine(InputImagesDirectory, file);
         }
 
         /// <summary>
@@ -100,7 +100,7 @@ namespace ImageSharp.Tests
         /// </returns>
         public static TestFile Create(string file)
         {
-            return Cache.GetOrAdd(file, (string fileName) => new TestFile(GetPath(file)));
+            return Cache.GetOrAdd(file, (string fileName) => new TestFile(GetInputFileFullPath(file)));
         }
 
         /// <summary>

tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs

@@ -144,8 +144,8 @@ namespace ImageSharp.Tests
             }
         }
 
-        internal string GetReferenceOutputFileName(string extension = null, object settings = null) 
+        internal string GetReferenceOutputFileName(string extension = null, object settings = null) =>
-            => this.GetTestOutputFileName(extension, settings).Replace("TestOutput", "ReferenceOutput");
+            TestEnvironment.GetReferenceOutputFileName(this.GetTestOutputFileName(extension, settings));
 
         internal void Init(string typeName, string methodName)
         {

tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs

@@ -11,8 +11,14 @@ namespace ImageSharp.Tests
     {
         public const string ImageSharpSolution = "ImageSharp.sln";
 
-        public const string InputImagesRelativePath = @"tests\ImageSharp.Tests\TestImages\Formats";
+        private const string InputImagesRelativePath = @"tests\TestImages\Input";
-        
+
+        private const string ActualOutputDirectoryRelativePath = @"tests\TestImages\ActualOutput";
+
+        private const string ReferenceOutputDirectoryRelativePath = @"tests\TestImages\ReferenceOutput";
+
+        private static Lazy<string> solutionDirectoryFullPath = new Lazy<string>(GetSolutionDirectoryFullPathImpl);
+
         private static Lazy<bool> runsOnCi = new Lazy<bool>(
             () =>
                 {
@@ -25,8 +31,10 @@ namespace ImageSharp.Tests
         /// Gets a value indicating whether test execution runs on CI.
         /// </summary>
         internal static bool RunsOnCI => runsOnCi.Value;
-        
+
-        internal static string GetSolutionDirectoryFullPath()
+        internal static string SolutionDirectoryFullPath => solutionDirectoryFullPath.Value;
+
+        private static string GetSolutionDirectoryFullPathImpl()
         {
             string assemblyLocation = typeof(TestFile).GetTypeInfo().Assembly.Location;
 
@@ -51,22 +59,26 @@ namespace ImageSharp.Tests
                     throw new Exception($"Unable to find ImageSharp solution directory from {assemblyLocation}!");
                 }
             }
-            
+
             return directory.FullName;
         }
+       
+        /// <summary>
+        /// Gets the correct full path to the Input Images directory.
+        /// </summary>
+        internal static string InputImagesDirectoryFullPath => Path.Combine(SolutionDirectoryFullPath, InputImagesRelativePath);
 
         /// <summary>
-        /// Gets the correct path to the InputImages directory.
+        /// Gets the correct full path to the Actual Output directory. (To be written to by the test cases.)
         /// </summary>
-        /// <returns>
+        internal static string ActualOutputDirectoryFullPath => Path.Combine(SolutionDirectoryFullPath, ActualOutputDirectoryRelativePath);
-        /// The <see cref="string"/>.
-        /// </returns>
-        internal static string GetInputImagesDirectoryFullPath()
-        {
-            string soulitionDir = GetSolutionDirectoryFullPath();
 
-            return Path.Combine(soulitionDir, InputImagesRelativePath);
+        /// <summary>
-        }
+        /// Gets the correct full path to the Expected Output directory. (To compare the test results to.)
-        
+        /// </summary>
+        internal static string ReferenceOutputDirectoryFullPath => Path.Combine(SolutionDirectoryFullPath, ReferenceOutputDirectoryRelativePath);
+
+        internal static string GetReferenceOutputFileName(string actualOutputFileName) =>
+            actualOutputFileName.Replace("ActualOutput", "ExpectedOutput");
     }
 }

tests/ImageSharp.Tests/TestUtilities/Tests/IntegrationTestUtilsTests.cs

@@ -35,7 +35,7 @@ namespace ImageSharp.Tests
         public void FromSystemDrawingBitmap<TPixel>(TestImageProvider<TPixel> dummyProvider)
             where TPixel : struct, IPixel<TPixel>
         {
-            string path = TestFile.GetPath(TestImages.Png.Splash);
+            string path = TestFile.GetInputFileFullPath(TestImages.Png.Splash);
 
             using (var sdBitmap = new System.Drawing.Bitmap(path))
             {
@@ -51,7 +51,7 @@ namespace ImageSharp.Tests
         public void OpenWithReferenceDecoder<TPixel>(TestImageProvider<TPixel> dummyProvider)
             where TPixel : struct, IPixel<TPixel>
         {
-            string path = TestFile.GetPath(TestImages.Png.Splash);
+            string path = TestFile.GetInputFileFullPath(TestImages.Png.Splash);
             using (Image<TPixel> image = Image.Load<TPixel>(path, ReferenceDecoder.Instance))
             {
                 image.DebugSave(dummyProvider);

tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs

@@ -19,24 +19,45 @@ namespace ImageSharp.Tests
         }
 
         private ITestOutputHelper Output { get; }
+        
+        private void CheckPath(string path)
+        {
+            this.Output.WriteLine(path);
+            Assert.True(Directory.Exists(path));
+        }
 
+        [Fact]
+        public void SolutionDirectoryFullPath()
+        {
+            this.CheckPath(TestEnvironment.SolutionDirectoryFullPath);
+        }
 
         [Fact]
-        public void GetSolutionDirectoryFullPath()
+        public void InputImagesDirectoryFullPath()
         {
-            string path = TestEnvironment.GetSolutionDirectoryFullPath();
+            this.CheckPath(TestEnvironment.InputImagesDirectoryFullPath);
-            this.Output.WriteLine(path);
+        }
 
-            Assert.True(Directory.Exists(path));
+        [Fact]
+        public void ActualOutputDirectoryFullPath()
+        {
+            this.CheckPath(TestEnvironment.ActualOutputDirectoryFullPath);
         }
 
         [Fact]
-        public void GetInputImagesDirectoryFullPath()
+        public void ExpectedOutputDirectoryFullPath()
         {
-            string path = TestEnvironment.GetInputImagesDirectoryFullPath();
+            this.CheckPath(TestEnvironment.ReferenceOutputDirectoryFullPath);
-            this.Output.WriteLine(path);
+        }
 
-            Assert.True(Directory.Exists(path));
+        [Fact]
+        public void GetReferenceOutputFileName()
+        {
+            string actual = Path.Combine(TestEnvironment.ActualOutputDirectoryFullPath, @"foo\bar\lol.jpeg");
+            string expected = TestEnvironment.GetReferenceOutputFileName(actual);
+
+            this.Output.WriteLine(expected);
+            Assert.Contains(TestEnvironment.ReferenceOutputDirectoryFullPath, expected);
         }
     }
 }