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

New toast action to show toast messages from XAML

Browse Source 
Code cleanup for Sonar
Tests corrections
This commit is contained in:
BONNEVILLE Geoffroy
2018-06-21 11:13:40 +02:00
parent 803dab0fb5
commit 559fbe65c3
15 changed files with 110 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ModernKeePassApp.Test/DatabaseTests.cs
View File

@@ -17,9 +17,8 @@ namespace ModernKeePassApp.Test
public void TestCreate()
{
Assert.IsTrue(_database.IsClosed);
_database.DatabaseFile = ApplicationData.Current.TemporaryFolder.CreateFileAsync("NewDatabase.kdbx").GetAwaiter().GetResult();
Assert.IsTrue(_database.IsFileOpen);
OpenOrCreateDatabase(true);
var databaseFile = ApplicationData.Current.TemporaryFolder.CreateFileAsync("NewDatabase.kdbx").GetAwaiter().GetResult();
OpenOrCreateDatabase(databaseFile, true);
_database.Close();
Assert.IsTrue(_database.IsClosed);
}
@@ -28,9 +27,8 @@ namespace ModernKeePassApp.Test
public void TestOpen()
{
Assert.IsTrue(_database.IsClosed);
_database.DatabaseFile = Package.Current.InstalledLocation.GetFileAsync(@"Data\TestDatabase.kdbx").GetAwaiter().GetResult();
Assert.IsTrue(_database.IsFileOpen);
OpenOrCreateDatabase(false);
var databaseFile = Package.Current.InstalledLocation.GetFileAsync(@"Data\TestDatabase.kdbx").GetAwaiter().GetResult();
OpenOrCreateDatabase(databaseFile, false);
}
[TestMethod]
@@ -44,16 +42,16 @@ namespace ModernKeePassApp.Test
TestOpen();
}
private void OpenOrCreateDatabase(bool createNew)
private void OpenOrCreateDatabase(StorageFile databaseFile, bool createNew)
{
Assert.ThrowsException<ArgumentNullException>(
() => _database.Open(null, createNew));
() => _database.Open(databaseFile, null, createNew));
var compositeKey = new CompositeKeyVm(_database, new ResourceServiceMock())
{
HasPassword = true,
Password = "test"
};
compositeKey.OpenDatabase(createNew).GetAwaiter().GetResult();
compositeKey.OpenDatabase(databaseFile, createNew).GetAwaiter().GetResult();
Assert.IsTrue(_database.IsOpen);
}
}

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

@@ -11,13 +11,11 @@ namespace ModernKeePassApp.Test.Mock
public class DatabaseServiceMock : IDatabaseService
{
private bool _isOpen;
private bool _isClosed;
private CompositeKey _compositeKey;
private StorageFile _databaseFile;
public PwCompressionAlgorithm CompressionAlgorithm { get; set; }
public StorageFile DatabaseFile { get; set; }
public CompositeKey CompositeKey
{
get { return _compositeKey; }
@@ -30,10 +28,6 @@ namespace ModernKeePassApp.Test.Mock
public bool IsOpen => _isOpen;
public bool IsFileOpen => DatabaseFile != null;
public bool IsClosed => _isClosed;
public bool HasChanged { get; set; }
public string Name => "MockDatabase";
@@ -51,7 +45,6 @@ namespace ModernKeePassApp.Test.Mock
public void Close(bool releaseFile = true)
{
_isClosed = true;
_isOpen = false;
}
@@ -59,17 +52,17 @@ namespace ModernKeePassApp.Test.Mock
{
throw new NotImplementedException();
}
public void Open(CompositeKey key, bool createNew = false)
public void Open(StorageFile databaseFile, CompositeKey key, bool createNew = false)
{
_databaseFile = databaseFile;
_compositeKey = key;
_isOpen = true;
_isClosed = false;
}
public void ReOpen()
{
Open(_compositeKey);
Open(_databaseFile, _compositeKey);
}
public void Save()

25
ModernKeePassApp.Test/ViewModelsTests.cs
View File

@@ -31,15 +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(7, firstGroup.Count());
Assert.AreEqual(7, firstGroup?.Count());
database.DatabaseFile = Package.Current.InstalledLocation.GetFileAsync(@"Data\TestDatabase.kdbx")
var databaseFile = Package.Current.InstalledLocation.GetFileAsync(@"Data\TestDatabase.kdbx")
.GetAwaiter().GetResult();
mainVm = new MainVm(null, null, database, _resource, _recent);
mainVm = new MainVm(null, null, database, _resource, _recent, databaseFile);
Assert.IsNotNull(mainVm.SelectedItem);
Assert.AreEqual(typeof(OpenDatabasePage), ((MainMenuItemVm) mainVm.SelectedItem).PageType);
database.Open(null);
database.Open(databaseFile, null);
mainVm = new MainVm(null, null, database, _resource, _recent);
Assert.IsNotNull(mainVm.SelectedItem);
Assert.AreEqual(2, mainVm.MainMenuItems.Count());
@@ -51,7 +51,7 @@ namespace ModernKeePassApp.Test
{
var database = new DatabaseServiceMock();
var compositeKeyVm = new CompositeKeyVm(database, _resource);
Assert.IsTrue(compositeKeyVm.OpenDatabase(false).GetAwaiter().GetResult());
Assert.IsTrue(compositeKeyVm.OpenDatabase(null, false).GetAwaiter().GetResult());
compositeKeyVm.StatusType = 1;
compositeKeyVm.Password = "test";
Assert.AreEqual(0, compositeKeyVm.StatusType);
@@ -61,13 +61,10 @@ namespace ModernKeePassApp.Test
[TestMethod]
public void TestOpenVm()
{
var database = new DatabaseServiceMock
{
DatabaseFile = Package.Current.InstalledLocation.GetFileAsync(@"Data\TestDatabase.kdbx")
.GetAwaiter().GetResult()
};
var openVm = new OpenVm(database);
Assert.IsTrue(openVm.ShowPasswordBox);
var databaseFile = Package.Current.InstalledLocation.GetFileAsync(@"Data\TestDatabase.kdbx")
.GetAwaiter().GetResult();
var openVm = new OpenVm(databaseFile);
Assert.IsTrue(openVm.IsFileSelected);
Assert.AreEqual("MockDatabase", openVm.Name);
}
@@ -94,7 +91,7 @@ namespace ModernKeePassApp.Test
{
var database = new DatabaseServiceMock();
var saveVm = new SaveVm(database);
database.Open(null);
database.Open(null, null);
saveVm.Save(false);
Assert.IsTrue(database.IsOpen);
saveVm.Save();
@@ -108,7 +105,7 @@ namespace ModernKeePassApp.Test
Assert.AreEqual(1, settingsVm.MenuItems.Count());
var firstGroup = settingsVm.MenuItems.FirstOrDefault();
// All groups have an empty title, so all settings are put inside the empty group
Assert.AreEqual(4, firstGroup.Count());
Assert.AreEqual(4, firstGroup?.Count());
Assert.IsNotNull(settingsVm.SelectedItem);
var selectedItem = (ListMenuItemVm) settingsVm.SelectedItem;
Assert.AreEqual(typeof(SettingsNewDatabasePage), selectedItem.PageType);