diff --git a/DeathSocket/1000x1000.png b/DeathSocket/1000x1000.png deleted file mode 100644 index 8a6dd87..0000000 Binary files a/DeathSocket/1000x1000.png and /dev/null differ diff --git a/DeathSocket/DeathSocket.fsproj b/DeathSocket/DeathSocket.fsproj index bb26fcc..3f8cc01 100644 --- a/DeathSocket/DeathSocket.fsproj +++ b/DeathSocket/DeathSocket.fsproj @@ -5,9 +5,7 @@ - - diff --git a/DeathSocket/IO.fs b/DeathSocket/IO.fs deleted file mode 100644 index 5b3461a..0000000 --- a/DeathSocket/IO.fs +++ /dev/null @@ -1,2 +0,0 @@ -module IO - diff --git a/TestCentre/ConsoleTests.fs b/TestCentre/ConsoleTests.fs index 154d8b3..d6b7873 100644 --- a/TestCentre/ConsoleTests.fs +++ b/TestCentre/ConsoleTests.fs @@ -24,7 +24,7 @@ let loadLocation = __SOURCE_DIRECTORY__ + "/LoadingTestArea" // File Path - let loadPath = loadLocation + "/LoadTest.png" + let loadPath = loadLocation + "/RequiredInfo/LoadTest.png" let savePath = saveLocation + "/SaveTest.png" (* Brushes converted to string []. diff --git a/TestCentre/LoadingTestArea/AboutLoadingTestArea.txt b/TestCentre/LoadingTestArea/AboutLoadingTestArea.txt deleted file mode 100644 index 6b9a412..0000000 --- a/TestCentre/LoadingTestArea/AboutLoadingTestArea.txt +++ /dev/null @@ -1,3 +0,0 @@ -This folder is the test area for loading images which are used in the Test Centre. -Images in here should not be deleted. -If you create a test which involves loading any pre-determined images (or any other content), please store it in this folder. diff --git a/TestCentre/LoadingTestArea/LoadTest.png b/TestCentre/LoadingTestArea/LoadTest.png deleted file mode 100644 index 8a6dd87..0000000 Binary files a/TestCentre/LoadingTestArea/LoadTest.png and /dev/null differ diff --git a/TestCentre/LoadingTestArea/RequiredInfo/LoadTest.png b/TestCentre/LoadingTestArea/RequiredInfo/LoadTest.png new file mode 100644 index 0000000..44f413c Binary files /dev/null and b/TestCentre/LoadingTestArea/RequiredInfo/LoadTest.png differ diff --git a/TestCentre/SavingTestArea/AboutSavingTestArea.txt b/TestCentre/SavingTestArea/AboutSavingTestArea.txt deleted file mode 100644 index 3f89da6..0000000 --- a/TestCentre/SavingTestArea/AboutSavingTestArea.txt +++ /dev/null @@ -1,2 +0,0 @@ -This folder is the test area for saving the images produced in Test Centre. -When a test produces an image, it should save it in here and conduct any processing on it here also. diff --git a/TestCentre/Script.fsx b/TestCentre/Script.fsx index 0203dea..7c24da5 100644 --- a/TestCentre/Script.fsx +++ b/TestCentre/Script.fsx @@ -8,6 +8,39 @@ open System.Reflection open SmoulderingBeachBall.Domain open SmoulderingBeachBall.Services open System.Threading +open System.IO + +let loadLocation = __SOURCE_DIRECTORY__ + "/LoadingTestArea" +let saveLocation = __SOURCE_DIRECTORY__ + "/SavingTestArea" +let random = Random() + +(*Resetting the Testing Area Folders Scripts +=============================================================================== +The following scripts are for when you need to "manually" clear out the +LoadingTestArea and SavingTestArea folders. If you do not want to open up the +folder in Explorer and delete the files that way, just run the scripts in this +section. If you reset the LoadingTestArea, you will need to repopulate it using +the "Populating LoadingTestArea Folder Scripts" below. *) + +let resetSavingTestArea () = + let files = Directory.GetFileSystemEntries(saveLocation, "*.png") + match files.Length with + | 0 -> () + | _ -> + files + |> Array.iter (fun f -> File.Delete(f)) + +let resetLoadingTestArea () = + let files = Directory.GetFileSystemEntries(loadLocation, "*.png") + match files.Length with + | 0 -> () + | _ -> + files + |> Array.iter (fun f -> File.Delete(f)) + +// Run these when the above functions have been added to F# interactive. +resetSavingTestArea () +resetLoadingTestArea () (* Populating LoadingTestArea Folder Scripts =============================================================================== @@ -16,10 +49,6 @@ You can then use these images in LibraryTests.fs -- Property Tests. The tests consists of loading images from LoadingTestArea, transforming them and saving them in SavingTestArea. *) -let saveLocation = __SOURCE_DIRECTORY__ + "/LoadingTestArea" - -let random = Random() - let allColours = let properties = typeof.GetProperties(BindingFlags.Public ||| BindingFlags.Static) @@ -42,7 +71,7 @@ let populateSpec sizes = { width = randomSize (sizes) height = randomSize (sizes) colour = (randomBrush ()) :?> Brush - filePath = saveLocation + filePath = loadLocation overlay = None } let generateSpecs amount = diff --git a/TestCentre/TestCentre.fsproj b/TestCentre/TestCentre.fsproj index 2e6f108..095f0ae 100644 --- a/TestCentre/TestCentre.fsproj +++ b/TestCentre/TestCentre.fsproj @@ -45,13 +45,6 @@ - - - PreserveNewest - - - PreserveNewest -