Skip to content

Commit d42e51a

Browse files
author
Cory Leach
committed
Added check for JSON_DOT_NET in tests
1 parent d3a5272 commit d42e51a

File tree

1 file changed

+36
-12
lines changed

1 file changed

+36
-12
lines changed

Tests/Editor/SaveLoadUtilityTests.cs

Lines changed: 36 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,42 @@ private ISerializationMethod GetSerializationMethod(SerializationMethodType meth
2626
return new SerializationMethodUnityJson();
2727
case SerializationMethodType.UnityJsonEncrypted:
2828
return new SerializationMethodUnityJsonEncrypted(TestKey,TestSalt);
29+
#if JSON_DOT_NET
2930
case SerializationMethodType.JsonDotNet:
3031
return new SerializationMethodJsonDotNet();
3132
case SerializationMethodType.JsonDotNetEncrypted:
3233
return new SerializationMethodJsonDotNetEncrypted(TestKey,TestSalt);
34+
#endif
3335
case SerializationMethodType.Custom:
3436
return new SerializationMethodBinary();
3537
default:
3638
throw new ArgumentOutOfRangeException(nameof(method), method, null);
3739
}
3840
}
39-
41+
4042
[Serializable]
4143
public class SaveLoadTestObject
4244
{
4345
public string testData;
4446
}
45-
47+
4648
[Test]
4749
public void SaveLoadAndDelete([Values]SerializationMethodType method)
4850
{
4951
var testSave = new SaveLoadTestObject() {testData = "SaveFileExists"};
5052
var serializationMethod = GetSerializationMethod(method);
5153
var filename = "TestSave.sav";
52-
54+
5355
SaveLoadUtility.Save(testSave,serializationMethod,filename);
54-
56+
5557
Assert.IsTrue(SaveLoadUtility.Exists(filename));
5658

5759
var loadedSave = (SaveLoadTestObject)SaveLoadUtility.Load(typeof(SaveLoadTestObject), serializationMethod, filename);
5860
Assert.NotNull(loadedSave);
5961
Assert.IsTrue(loadedSave.testData == testSave.testData);
60-
62+
6163
SaveLoadUtility.DeleteSavedFile(filename);
62-
64+
6365
Assert.IsFalse(SaveLoadUtility.Exists(filename));
6466
}
6567

@@ -77,16 +79,39 @@ public void CanGetFiles()
7779
var serializationMethod = GetSerializationMethod(SerializationMethodType.Binary);
7880
var filename = "TestSave.sav";
7981
var folder = "TestFolder";
80-
82+
8183
SaveLoadUtility.Save(testSave,serializationMethod,filename,folder);
8284

8385
var files = SaveLoadUtility.GetSavedFiles(folder);
8486
Assert.IsTrue(files.Length == 1);
85-
87+
8688
//Files should contain a list of names that exactly match the file name used
8789
//omits the path of the file
8890
Assert.IsTrue(files[0] == filename);
89-
91+
92+
SaveLoadUtility.DeleteSavedFile(filename,folder);
93+
94+
files = SaveLoadUtility.GetSavedFiles();
95+
Assert.IsTrue(files.Length == 0);
96+
}
97+
98+
[Test]
99+
public void CanGetFilesWithExtension()
100+
{
101+
var testSave = new SaveLoadTestObject() {testData = "SaveFileExists"};
102+
var serializationMethod = GetSerializationMethod(SerializationMethodType.Binary);
103+
var filename = "TestSave.sav";
104+
var folder = "TestFolder";
105+
106+
SaveLoadUtility.Save(testSave,serializationMethod,filename,folder);
107+
108+
var files = SaveLoadUtility.GetSavedFiles(folder,"sav");
109+
Assert.IsTrue(files.Length == 1);
110+
111+
//Files should contain a list of names that exactly match the file name used
112+
//omits the path of the file
113+
Assert.IsTrue(files[0] == filename);
114+
90115
SaveLoadUtility.DeleteSavedFile(filename,folder);
91116

92117
files = SaveLoadUtility.GetSavedFiles();
@@ -108,8 +133,7 @@ public void TearDown()
108133
}
109134
}
110135
}
111-
136+
112137
}
113138

114139
}
115-

0 commit comments

Comments
 (0)