Skip to content

Commit efb779e

Browse files
author
Cory Leach
committed
Update SaveLoadUtilityTests.cs
Added precompile check so that tests don't fail when JSON is not present
1 parent 40a133d commit efb779e

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

Tests/Editor/SaveLoadUtilityTests.cs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class SaveLoadUtilityTests
1111
{
1212
private string TestKey = "TestKey";
1313
private string TestSalt = "TestSalt";
14-
14+
1515
private ISerializationMethod GetSerializationMethod(SerializationMethodType method)
1616
{
1717
switch (method)
@@ -26,40 +26,43 @@ private ISerializationMethod GetSerializationMethod(SerializationMethodType meth
2626
return new SerializationMethodUnityJson();
2727
case SerializationMethodType.UnityJsonEncrypted:
2828
return new SerializationMethodUnityJsonEncrypted(TestKey,TestSalt);
29+
#if JSON_DOT_NET
30+
2931
case SerializationMethodType.JsonDotNet:
3032
return new SerializationMethodJsonDotNet();
3133
case SerializationMethodType.JsonDotNetEncrypted:
3234
return new SerializationMethodJsonDotNetEncrypted(TestKey,TestSalt);
35+
#endif
3336
case SerializationMethodType.Custom:
3437
return new SerializationMethodBinary();
3538
default:
3639
throw new ArgumentOutOfRangeException(nameof(method), method, null);
3740
}
3841
}
39-
42+
4043
[Serializable]
4144
public class SaveLoadTestObject
4245
{
4346
public string testData;
4447
}
45-
48+
4649
[Test]
4750
public void SaveLoadAndDelete([Values]SerializationMethodType method)
4851
{
4952
var testSave = new SaveLoadTestObject() {testData = "SaveFileExists"};
5053
var serializationMethod = GetSerializationMethod(method);
5154
var filename = "TestSave.sav";
52-
55+
5356
SaveLoadUtility.Save(testSave,serializationMethod,filename);
54-
57+
5558
Assert.IsTrue(SaveLoadUtility.Exists(filename));
5659

5760
var loadedSave = (SaveLoadTestObject)SaveLoadUtility.Load(typeof(SaveLoadTestObject), serializationMethod, filename);
5861
Assert.NotNull(loadedSave);
5962
Assert.IsTrue(loadedSave.testData == testSave.testData);
60-
63+
6164
SaveLoadUtility.DeleteSavedFile(filename);
62-
65+
6366
Assert.IsFalse(SaveLoadUtility.Exists(filename));
6467
}
6568

@@ -77,16 +80,16 @@ public void CanGetFiles()
7780
var serializationMethod = GetSerializationMethod(SerializationMethodType.Binary);
7881
var filename = "TestSave.sav";
7982
var folder = "TestFolder";
80-
83+
8184
SaveLoadUtility.Save(testSave,serializationMethod,filename,folder);
8285

8386
var files = SaveLoadUtility.GetSavedFiles(folder);
8487
Assert.IsTrue(files.Length == 1);
85-
88+
8689
//Files should contain a list of names that exactly match the file name used
8790
//omits the path of the file
8891
Assert.IsTrue(files[0] == filename);
89-
92+
9093
SaveLoadUtility.DeleteSavedFile(filename,folder);
9194

9295
files = SaveLoadUtility.GetSavedFiles();
@@ -108,8 +111,7 @@ public void TearDown()
108111
}
109112
}
110113
}
111-
114+
112115
}
113116

114117
}
115-

0 commit comments

Comments
 (0)