wismna/modernkeepass
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePass.git synced 2025-10-03 15:40:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changed most services to singletons

Browse Source 
Refactor the Database Service (no more enum, ...)
Restored the Donate page with Paypal web page
Added (but not working) MS App Center integration
Corrected tests accordingly
WIP AOP to detect database changes
This commit is contained in:
BONNEVILLE Geoffroy
2018-02-23 18:09:21 +01:00
parent b46ab8db51
commit 7dbf93fe7b
35 changed files with 199 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ModernKeePassApp.Test/Mock/DatabaseServiceMock.cs
View File

@@ -9,13 +9,11 @@ using Windows.Storage;
namespace ModernKeePassApp.Test.Mock
{
public class DatabaseServiceMock : IDatabase
public class DatabaseServiceMock : IDatabaseService
{
private bool _isOpen;
private bool _isFileOpen;
private bool _isClosed;
public PwCompressionAlgorithm CompressionAlgorithm { get; set; }
public StorageFile DatabaseFile { get; set; }
@@ -24,20 +22,13 @@ namespace ModernKeePassApp.Test.Mock
public KdfParameters KeyDerivation { get; set; }
public bool IsOpen
{
get { return _isOpen; }
}
public bool IsOpen => _isOpen;
public bool IsFileOpen
{
get { return _isFileOpen; }
}
public bool IsFileOpen => DatabaseFile != null;
public bool IsClosed
{
get { return _isClosed; }
}
public bool IsClosed => _isClosed;
public bool HasChanged { get; set; }
public string Name => "MockDatabase";

2
ModernKeePassApp.Test/Mock/RecentServiceMock.cs
View File

@@ -6,7 +6,7 @@ using Windows.Storage;
namespace ModernKeePassApp.Test.Mock
{
class RecentServiceMock : IRecent
class RecentServiceMock : IRecentService
{
public int EntryCount => 0;

2
ModernKeePassApp.Test/Mock/ResourceServiceMock.cs
View File

@@ -3,7 +3,7 @@ using ModernKeePass.Interfaces;
namespace ModernKeePassApp.Test.Mock
{
class ResourceServiceMock : IResource
class ResourceServiceMock : IResourceService
{
public string GetResourceValue(string key)
{

2
ModernKeePassApp.Test/Mock/SettingsServiceMock.cs
View File

@@ -3,7 +3,7 @@ using ModernKeePass.Interfaces;
namespace ModernKeePassApp.Test.Mock
{
public class SettingsServiceMock : ISettings
public class SettingsServiceMock : ISettingsService
{
public T GetSetting<T>(string property)
{

39
ModernKeePassApp.Test/ViewModelsTests.cs
View File

@@ -31,14 +31,15 @@ namespace ModernKeePassApp.Test
var mainVm = new MainVm(null, null, database, _resource, _recent);
Assert.AreEqual(1, mainVm.MainMenuItems.Count());
var firstGroup = mainVm.MainMenuItems.FirstOrDefault();
Assert.AreEqual(6, firstGroup.Count());
Assert.AreEqual(7, firstGroup.Count());
database.Status = 1;
database.DatabaseFile = Package.Current.InstalledLocation.GetFileAsync(@"Data\TestDatabase.kdbx")
.GetAwaiter().GetResult();
mainVm = new MainVm(null, null, database, _resource, _recent);
Assert.IsNotNull(mainVm.SelectedItem);
Assert.AreEqual(typeof(OpenDatabasePage), ((MainMenuItemVm) mainVm.SelectedItem).PageType);
database.Status = 2;
database.Open(null, false).GetAwaiter().GetResult();
mainVm = new MainVm(null, null, database, _resource, _recent);
Assert.IsNotNull(mainVm.SelectedItem);
Assert.AreEqual(2, mainVm.MainMenuItems.Count());
@@ -57,19 +58,11 @@ namespace ModernKeePassApp.Test
Assert.AreEqual(15.0, compositeKeyVm.PasswordComplexityIndicator);
}
[TestMethod]
public void TestDonateVm()
{
var donateVm = new DonateVm(new LicenseServiceMock());
Assert.AreEqual(4, donateVm.Donations.Count);
}
[TestMethod]
public void TestOpenVm()
{
var database = new DatabaseServiceMock
{
Status = 1,
DatabaseFile = Package.Current.InstalledLocation.GetFileAsync(@"Data\TestDatabase.kdbx")
.GetAwaiter().GetResult()
};
@@ -99,15 +92,13 @@ namespace ModernKeePassApp.Test
[TestMethod]
public void TestSaveVm()
{
var database = new DatabaseServiceMock
{
Status = 2
};
var database = new DatabaseServiceMock();
var saveVm = new SaveVm(database);
saveVm.Save(false);
Assert.AreEqual(2, database.Status);
saveVm.Save();
Assert.AreEqual(0, database.Status);
database.Open(null, false).GetAwaiter().GetResult();
saveVm.Save(false).GetAwaiter().GetResult();
Assert.IsTrue(database.IsOpen);
saveVm.Save().GetAwaiter().GetResult();
Assert.IsFalse(database.IsOpen);
}
[TestMethod]
@@ -126,10 +117,7 @@ namespace ModernKeePassApp.Test
[TestMethod]
public void TestEntryVm()
{
var database = new DatabaseServiceMock
{
Status = 2
};
var database = new DatabaseServiceMock();
var entryVm = new EntryVm(new PwEntry(true, true), new GroupVm(), database)
{
Name = "Test",
@@ -141,10 +129,7 @@ namespace ModernKeePassApp.Test
[TestMethod]
public void TestGroupVm()
{
var database = new DatabaseServiceMock
{
Status = 2
};
var database = new DatabaseServiceMock();
var entryVm = new GroupVm(new PwGroup(true, true), new GroupVm(), database)
{
Name = "Test"