Skip to content

Commit b7486e8

Browse files
kenbotkenbot
committed
Trying again
1 parent 187acbe commit b7486e8

File tree

4 files changed

+30
-34
lines changed

4 files changed

+30
-34
lines changed

‎UnitTest/Tests/TestDemoHandler.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void InsertNewDemo_NullGameFileIdFails()
5656
FileName = "InsertNewDemo_NullGameFileIdFails.zip"
5757
};
5858

59-
var fileData = demoHandler.InsertNewDemo(sourcePort, gameFile, "zandemo.cld", "Great description");
59+
var fileData = demoHandler.InsertNewDemo(sourcePort, gameFile, @"Resources\zandemo.cld", "Great description");
6060

6161
Assert.IsNull(fileData);
6262
}
@@ -104,7 +104,7 @@ public void InsertNewDemo_InsertsFileOnDisk()
104104
var existingDemos = Directory.EnumerateFiles(config.DemoDirectory.GetFullPath());
105105
Assert.IsFalse(existingDemos.Any());
106106

107-
var fileData = demoHandler.InsertNewDemo(sourcePort, gameFile, "zandemo.cld", "Copy it");
107+
var fileData = demoHandler.InsertNewDemo(sourcePort, gameFile, @"Resources\zandemo.cld", "Copy it");
108108

109109
existingDemos = Directory.EnumerateFiles(config.DemoDirectory.GetFullPath());
110110

@@ -136,7 +136,7 @@ public void InsertNewDemo_InsertsFileToDatabase()
136136
var existingDemos = database.GetFiles(gameFile, FileType.Demo).ToList();
137137
Assert.IsFalse(existingDemos.Any());
138138

139-
var fileData = demoHandler.InsertNewDemo(sourcePort, gameFile, "zandemo.cld", "Save to DB!!");
139+
var fileData = demoHandler.InsertNewDemo(sourcePort, gameFile, @"Resources\zandemo.cld", "Save to DB!!");
140140

141141
Assert.IsNotNull(fileData);
142142
existingDemos = database.GetFiles(gameFile, FileType.Demo).ToList();

‎UnitTest/Tests/TestFileHandler.cs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -636,16 +636,15 @@ public void UpdateFromOriginal_DoesNothingIfOriginalFileDoesntExist()
636636

637637
// Set up original file
638638
File.Copy(@"Resources\happy.png", @"OriginalDir\happy.png");
639-
var originalFileInfo = new FileInfo(@"OriginalDir\happy.png");
640-
Assert.IsTrue(originalFileInfo.Exists);
639+
Assert.IsTrue(File.Exists(@"OriginalDir\happy.png"));
641640

642641
// Insert a copy
643642
IGameFile gameFile = CreateSavedGameFile("UpdateFromOriginal_DoesNothingIfOriginalFileDoesntExist.zip");
644643
var file = fileHandler.InsertAndCopy(gameFile, FileType.Demo, @"OriginalDir\happy.png");
645644
var localWriteTime = new FileInfo(file.FullFileName).LastWriteTime;
646645

647646
// Touch the original file so we know if it was copied or not
648-
originalFileInfo.LastWriteTime = DateTime.Now;
647+
var originalFileInfo = TestUtil.TouchFile(@"OriginalDir\happy.png");
649648

650649
// Delete original file
651650
originalFileInfo.Delete();
@@ -668,16 +667,15 @@ public void UpdateFromOriginal_DoesNothingIfOriginalFileIsOlderThanLocal()
668667

669668
// Set up original file
670669
File.Copy(@"Resources\happy.png", @"OriginalDir\happy.png");
671-
var originalFileInfo = new FileInfo(@"OriginalDir\happy.png");
672-
Assert.IsTrue(originalFileInfo.Exists);
670+
Assert.IsTrue(File.Exists(@"OriginalDir\happy.png"));
673671

674672
// Insert a copy
675673
IGameFile gameFile = CreateSavedGameFile("UpdateFromOriginal_DoesNothingIfOriginalFileIsOlderThanLocal.zip");
676674
var file = fileHandler.InsertAndCopy(gameFile, FileType.Demo, @"OriginalDir\happy.png");
677675
var localWriteTime = new FileInfo(file.FullFileName).LastWriteTime;
678676

679677
// Touch the original file so we know if it was copied or not
680-
originalFileInfo.LastWriteTime = DateTime.Now;
678+
var originalFileInfo = TestUtil.TouchFile(@"OriginalDir\happy.png");
681679

682680
// Make the local file look like it's more up to date than the original
683681
file.DateCreated = file.DateCreated.AddDays(3);
@@ -695,16 +693,15 @@ public void UpdateFromOriginal_CopiesOriginalFileToLocal()
695693

696694
// Set up original file
697695
File.Copy(@"Resources\happy.png", @"OriginalDir\happy.png");
698-
var originalFileInfo = new FileInfo(@"OriginalDir\happy.png");
699-
Assert.IsTrue(originalFileInfo.Exists);
696+
Assert.IsTrue(File.Exists(@"OriginalDir\happy.png"));
700697

701698
// Insert a copy
702699
IGameFile gameFile = CreateSavedGameFile("UpdateFromOriginal_CopiesOriginalFileToLocal.zip");
703700
var file = fileHandler.InsertAndCopy(gameFile, FileType.Demo, @"OriginalDir\happy.png");
704701
var localWriteTime = new FileInfo(file.FullFileName).LastWriteTime;
705702

706703
// Touch the original file so we know if it was copied or not
707-
originalFileInfo.LastWriteTime = DateTime.Now;
704+
var originalFileInfo = TestUtil.TouchFile(@"OriginalDir\happy.png");
708705

709706
fileHandler.UpdateFromOriginal("OriginalDir", file);
710707

@@ -719,15 +716,14 @@ public void UpdateFromOriginal_UpdatesDatabase()
719716
var fileHandler = new FileHandler(database, config);
720717

721718
File.Copy(@"Resources\happy.png", @"OriginalDir\happy.png");
722-
var originalFileInfo = new FileInfo(@"OriginalDir\happy.png");
723-
Assert.IsTrue(originalFileInfo.Exists);
719+
Assert.IsTrue(File.Exists(@"OriginalDir\happy.png"));
724720

725721
IGameFile gameFile = CreateSavedGameFile("UpdateFromOriginal_UpdatesDatabase.zip");
726722
var file = fileHandler.InsertAndCopy(gameFile, FileType.Demo, @"OriginalDir\happy.png");
727723
var localWriteTime = new FileInfo(file.FullFileName).LastWriteTime;
728724

729725
// Touch the original file so we know if it was copied or not
730-
originalFileInfo.LastWriteTime = DateTime.Now;
726+
var originalFileInfo = TestUtil.TouchFile(@"OriginalDir\happy.png");
731727

732728
fileHandler.UpdateFromOriginal("OriginalDir", file, f =>
733729
{
@@ -744,15 +740,14 @@ public void UpdateFromOriginal_SetsDateCreatedToOriginalFileLastWrite()
744740
var fileHandler = new FileHandler(database, config);
745741

746742
File.Copy(@"Resources\happy.png", @"OriginalDir\happy.png");
747-
var originalFileInfo = new FileInfo(@"OriginalDir\happy.png");
748-
Assert.IsTrue(originalFileInfo.Exists);
743+
Assert.IsTrue(File.Exists(@"OriginalDir\happy.png"));
749744

750745
IGameFile gameFile = CreateSavedGameFile("UpdateFromOriginal_SetsDateCreatedToOriginalFileLastWrite.zip");
751746
var file = fileHandler.InsertAndCopy(gameFile, FileType.Demo, @"OriginalDir\happy.png");
752747
var localWriteTime = new FileInfo(file.FullFileName).LastWriteTime;
753748

754749
// Touch the original file so we know if it was copied or not
755-
originalFileInfo.LastWriteTime = DateTime.Now;
750+
var originalFileInfo = TestUtil.TouchFile(@"OriginalDir\happy.png");
756751

757752
fileHandler.UpdateFromOriginal("OriginalDir", file);
758753

‎UnitTest/Tests/TestSaveGameHandler.cs‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void UpdateSaveGameFromSourcePort_CopiesToSaveGameDir()
182182
var saveGame = saveGameHandler.InsertSaveGame(sourcePort, gameFile, @"SourcePortSaveGames\chocosave1.dsg");
183183

184184
// Touch the save so we know that it has been copied
185-
var originalFileInfo = TouchFile(@"SourcePortSaveGames\chocosave1.dsg");
185+
var originalFileInfo = TestUtil.TouchFile(@"SourcePortSaveGames\chocosave1.dsg");
186186

187187
saveGameHandler.UpdateSaveGameFromSourcePort(sourcePort, saveGame);
188188

@@ -216,7 +216,7 @@ public void UpdateSaveGameFromSourcePort_UpdatesDescriptionInDB()
216216
Assert.IsNull(saveGame.Description);
217217

218218
// Touch the original file so we know if it was copied or not
219-
var originalFileInfo = TouchFile(@"SourcePortSaveGames\chocosave1.dsg");
219+
var originalFileInfo = TestUtil.TouchFile(@"SourcePortSaveGames\chocosave1.dsg");
220220

221221
saveGameHandler.UpdateSaveGameFromSourcePort(sourcePort, saveGame);
222222

@@ -273,16 +273,5 @@ public void CopySaveGameToSourcePort_CopiesGameToSourcePort()
273273

274274
Assert.IsTrue(File.Exists(@"SourcePortSaveGames\chocosave1.dsg"));
275275
}
276-
277-
private static FileInfo TouchFile(string fileName)
278-
{
279-
// Github runs the tests much faster, need to put a bit of distance
280-
// between the times
281-
Thread.Sleep(1);
282-
var fileInfo = new FileInfo(fileName);
283-
fileInfo.LastWriteTime = DateTime.Now;
284-
Thread.Sleep(1);
285-
return fileInfo;
286-
}
287276
}
288277
}

‎UnitTest/Tests/TestUtil.cs‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
using System;
2-
using DoomLauncher;
1+
using DoomLauncher;
32
using DoomLauncher.Interfaces;
3+
using Newtonsoft.Json;
4+
using System;
45
using System.IO;
56
using System.IO.Compression;
67
using System.Linq;
7-
using Newtonsoft.Json;
8+
using System.Threading;
89

910
namespace UnitTest.Tests
1011
{
@@ -61,6 +62,17 @@ public static bool AllFieldsEqual<T>(T obj1, T obj2, string[] ignore = null)
6162
return true;
6263
}
6364

65+
public static FileInfo TouchFile(string fileName)
66+
{
67+
// Github runs the tests much faster, need to put a bit of distance
68+
// between the times
69+
Thread.Sleep(1);
70+
var fileInfo = new FileInfo(fileName);
71+
fileInfo.LastWriteTime = DateTime.Now;
72+
Thread.Sleep(1);
73+
return fileInfo;
74+
}
75+
6476
private static string GetObjectJson(object obj) =>
6577
JsonConvert.SerializeObject(obj);
6678

0 commit comments

Comments
 (0)