From efb779eae003d45d08f4a065d235aca34add5ace Mon Sep 17 00:00:00 2001 From: Cory Leach Date: Thu, 18 Aug 2022 12:51:32 -0500 Subject: [PATCH] Update SaveLoadUtilityTests.cs Added precompile check so that tests don't fail when JSON is not present --- Tests/Editor/SaveLoadUtilityTests.cs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Tests/Editor/SaveLoadUtilityTests.cs b/Tests/Editor/SaveLoadUtilityTests.cs index 9162892..53dd265 100644 --- a/Tests/Editor/SaveLoadUtilityTests.cs +++ b/Tests/Editor/SaveLoadUtilityTests.cs @@ -11,7 +11,7 @@ public class SaveLoadUtilityTests { private string TestKey = "TestKey"; private string TestSalt = "TestSalt"; - + private ISerializationMethod GetSerializationMethod(SerializationMethodType method) { switch (method) @@ -26,40 +26,43 @@ private ISerializationMethod GetSerializationMethod(SerializationMethodType meth return new SerializationMethodUnityJson(); case SerializationMethodType.UnityJsonEncrypted: return new SerializationMethodUnityJsonEncrypted(TestKey,TestSalt); +#if JSON_DOT_NET + case SerializationMethodType.JsonDotNet: return new SerializationMethodJsonDotNet(); case SerializationMethodType.JsonDotNetEncrypted: return new SerializationMethodJsonDotNetEncrypted(TestKey,TestSalt); +#endif case SerializationMethodType.Custom: return new SerializationMethodBinary(); default: throw new ArgumentOutOfRangeException(nameof(method), method, null); } } - + [Serializable] public class SaveLoadTestObject { public string testData; } - + [Test] public void SaveLoadAndDelete([Values]SerializationMethodType method) { var testSave = new SaveLoadTestObject() {testData = "SaveFileExists"}; var serializationMethod = GetSerializationMethod(method); var filename = "TestSave.sav"; - + SaveLoadUtility.Save(testSave,serializationMethod,filename); - + Assert.IsTrue(SaveLoadUtility.Exists(filename)); var loadedSave = (SaveLoadTestObject)SaveLoadUtility.Load(typeof(SaveLoadTestObject), serializationMethod, filename); Assert.NotNull(loadedSave); Assert.IsTrue(loadedSave.testData == testSave.testData); - + SaveLoadUtility.DeleteSavedFile(filename); - + Assert.IsFalse(SaveLoadUtility.Exists(filename)); } @@ -77,16 +80,16 @@ public void CanGetFiles() var serializationMethod = GetSerializationMethod(SerializationMethodType.Binary); var filename = "TestSave.sav"; var folder = "TestFolder"; - + SaveLoadUtility.Save(testSave,serializationMethod,filename,folder); var files = SaveLoadUtility.GetSavedFiles(folder); Assert.IsTrue(files.Length == 1); - + //Files should contain a list of names that exactly match the file name used //omits the path of the file Assert.IsTrue(files[0] == filename); - + SaveLoadUtility.DeleteSavedFile(filename,folder); files = SaveLoadUtility.GetSavedFiles(); @@ -108,8 +111,7 @@ public void TearDown() } } } - + } } -