Fixed SaveDb for CachingFileStorage and target file not existing

-> + Tests
First, very simple implementation of ChangingFileStorage in KP2A App (preliminary)

src/Kp2aUnitTests/Kp2aUnitTests.csproj

@@ -71,6 +71,7 @@
     <Compile Include="TestLoadDbCredentials.cs" />
     <Compile Include="TestCachingFileStorage.cs" />
     <Compile Include="TestSaveDb.cs" />
+    <Compile Include="TestSaveDbCached.cs" />
     <Compile Include="TestSynchronizeCachedDatabase.cs" />
   </ItemGroup>
   <ItemGroup>

src/Kp2aUnitTests/MainActivity.cs

@@ -19,8 +19,10 @@ namespace Kp2aUnitTests
             TestRunner runner = new TestRunner();
             // Run all tests from this assembly
             runner.AddTests(Assembly.GetExecutingAssembly());
-			//runner.AddTests(new List<Type> { typeof(TestSynchronizeCachedDatabase) });
-			//runner.AddTests(new List<Type> { typeof(TestLoadDb) });}}
+			//runner.AddTests(new List<Type> { typeof(TestSaveDbCached) });
+			//runner.AddTests(typeof(TestSaveDbCached).GetMethod("TestLoadEditSaveWhenModified"));
+			
+			//runner.AddTests(new List<Type> { typeof(TestSaveDb) });
 			//runner.AddTests(new List<Type> { typeof(TestCachingFileStorage) });
 			//runner.AddTests(typeof(TestCachingFileStorage).GetMethod("TestSaveToRemote"));
 			//runner.AddTests(typeof(TestLoadDb).GetMethod("TestLoadKdbpWithPasswordOnly"));

src/Kp2aUnitTests/TestCachingFileStorage.cs

@@ -191,8 +191,6 @@ namespace Kp2aUnitTests
 
 			Assert.IsTrue(_testCacheSupervisor.CouldntOpenFromRemoteCalled);
 			Assert.IsFalse(_testCacheSupervisor.CouldntSaveToRemoteCalled);
-			Assert.IsFalse(_testCacheSupervisor.RestoredRemoteCalled);
-
 			
 		}
 

src/Kp2aUnitTests/TestSaveDb.cs

@@ -126,6 +126,35 @@ namespace Kp2aUnitTests
 		}
 
 
+		[TestMethod]
+		public void TestLoadEditSaveWithWriteBecauseTargetNotExists()
+		{
+			//create the default database:
+			IKp2aApp app = SetupAppWithDefaultDatabase();
+			//save it and reload it so we have a base version
+			SaveDatabase(app);
+			app = LoadDatabase(DefaultFilename, DefaultPassword, DefaultKeyfile);
+			
+			//modify the database by adding a group:
+			app.GetDb().KpDatabase.RootGroup.AddGroup(new PwGroup(true, true, "TestGroup", PwIcon.Apple), true);
+
+			//delete the file:
+			File.Delete(DefaultFilename);
+
+			//save the database:
+			SaveDatabase(app);
+
+			//make sure no question was asked
+			Assert.AreEqual(null, ((TestKp2aApp)app).LastYesNoCancelQuestionTitle);
+
+			//load database to a new app instance:
+			IKp2aApp resultApp = LoadDatabase(DefaultFilename, DefaultPassword, DefaultKeyfile);
+
+			//ensure the file was saved:
+			AssertDatabasesAreEqual(app.GetDb().KpDatabase, resultApp.GetDb().KpDatabase);
+
+		}
+
 		[TestMethod]
 		public void TestLoadEditSaveWithSyncOverwriteBecauseOfNoCheck()
 		{

src/Kp2aUnitTests/TestSaveDbCached.cs

@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using KeePassLib;
+using KeePassLib.Serialization;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using keepass2android;
+using keepass2android.Io;
+
+namespace Kp2aUnitTests
+{
+	[TestClass]
+	class TestSaveDbCached: TestBase
+	{
+		private TestCacheSupervisor _testCacheSupervisor = new TestCacheSupervisor();
+		private TestFileStorage _testFileStorage = new TestFileStorage();
+
+		protected override TestKp2aApp CreateTestKp2aApp()
+		{
+			TestKp2aApp app = base.CreateTestKp2aApp();
+			app.FileStorage = new CachingFileStorage(_testFileStorage, "/mnt/sdcard/kp2atest/cache/", _testCacheSupervisor);
+			return app;
+		}
+
+		[TestMethod]
+		public void TestLoadEditSave()
+		{
+			//create the default database:
+			IKp2aApp app = SetupAppWithDefaultDatabase();
+			IOConnection.DeleteFile(new IOConnectionInfo { Path = DefaultFilename });
+			//save it and reload it so we have a base version
+			SaveDatabase(app);
+			app = LoadDatabase(DefaultFilename, DefaultPassword, DefaultKeyfile);
+			//modify the database by adding a group:
+			app.GetDb().KpDatabase.RootGroup.AddGroup(new PwGroup(true, true, "TestGroup", PwIcon.Apple), true);
+			//save the database again:
+			SaveDatabase(app);
+			Assert.IsNull(((TestKp2aApp)app).LastYesNoCancelQuestionTitle);
+			Assert.IsFalse(_testCacheSupervisor.CouldntOpenFromRemoteCalled);
+			Assert.IsFalse(_testCacheSupervisor.CouldntSaveToRemoteCalled);
+
+			//load database to a new app instance:
+			IKp2aApp resultApp = LoadDatabase(DefaultFilename, DefaultPassword, DefaultKeyfile);
+
+			//ensure the change was saved:
+			AssertDatabasesAreEqual(app.GetDb().KpDatabase, resultApp.GetDb().KpDatabase);
+		}
+
+		[TestMethod]
+		public void TestLoadEditSaveWhenDeleted()
+		{
+			//create the default database:
+			IKp2aApp app = SetupAppWithDefaultDatabase();
+			IOConnection.DeleteFile(new IOConnectionInfo { Path = DefaultFilename });
+			//save it and reload it so we have a base version
+			SaveDatabase(app);
+			app = LoadDatabase(DefaultFilename, DefaultPassword, DefaultKeyfile);
+
+			//delete the file:
+			File.Delete(DefaultFilename);
+
+			//modify the database by adding a group:
+			app.GetDb().KpDatabase.RootGroup.AddGroup(new PwGroup(true, true, "TestGroup", PwIcon.Apple), true);
+			//save the database again:
+			SaveDatabase(app);
+			Assert.IsNull(((TestKp2aApp) app).LastYesNoCancelQuestionTitle);
+			Assert.IsFalse(_testCacheSupervisor.CouldntOpenFromRemoteCalled);
+			Assert.IsFalse(_testCacheSupervisor.CouldntSaveToRemoteCalled);
+
+			//load database to a new app instance:
+			IKp2aApp resultApp = LoadDatabase(DefaultFilename, DefaultPassword, DefaultKeyfile);
+
+			//ensure the change was saved:
+			AssertDatabasesAreEqual(app.GetDb().KpDatabase, resultApp.GetDb().KpDatabase);
+		}
+
+
+		[TestMethod]
+		public void TestLoadEditSaveWhenModified()
+		{
+			//create the default database:
+			IKp2aApp app = SetupAppWithDefaultDatabase();
+			IOConnection.DeleteFile(new IOConnectionInfo { Path = DefaultFilename });
+			//save it and reload it so we have a base version
+			SaveDatabase(app);
+			app = LoadDatabase(DefaultFilename, DefaultPassword, DefaultKeyfile);
+
+			foreach (var group in app.GetDb().KpDatabase.RootGroup.Groups)
+				Kp2aLog.Log("app c: " + group.Name);
+
+			//load once more:
+			var app2 = LoadDatabase(DefaultFilename, DefaultPassword, DefaultKeyfile);
+
+			//modifiy once:
+			PwGroup group2 = new PwGroup(true, true, "TestGroup2", PwIcon.Apple);
+			app2.GetDb().KpDatabase.RootGroup.AddGroup(group2, true);
+
+			foreach (var group in app.GetDb().KpDatabase.RootGroup.Groups)
+				Kp2aLog.Log("app b: " + group.Name);
+
+			SaveDatabase(app2);
+
+			foreach (var group in app.GetDb().KpDatabase.RootGroup.Groups)
+				Kp2aLog.Log("app d: " + group.Name);
+			Assert.IsNull(((TestKp2aApp)app).LastYesNoCancelQuestionTitle);
+			Assert.IsFalse(_testCacheSupervisor.CouldntOpenFromRemoteCalled);
+			Assert.IsFalse(_testCacheSupervisor.CouldntSaveToRemoteCalled);
+
+			//modify the database by adding a group:
+			PwGroup group1 = new PwGroup(true, true, "TestGroup", PwIcon.Apple);
+			app.GetDb().KpDatabase.RootGroup.AddGroup(group1, true);
+
+			foreach (var group in app.GetDb().KpDatabase.RootGroup.Groups)
+				Kp2aLog.Log("app a: " + group.Name);
+
+
+			//save the database again:
+			SaveDatabase(app);
+			Assert.AreEqual(((TestKp2aApp)app).LastYesNoCancelQuestionTitle, UiStringKey.TitleSyncQuestion);
+			Assert.IsFalse(_testCacheSupervisor.CouldntOpenFromRemoteCalled);
+			Assert.IsFalse(_testCacheSupervisor.CouldntSaveToRemoteCalled);
+			
+
+			//load database to a new app instance:
+			IKp2aApp resultApp = LoadDatabase(DefaultFilename, DefaultPassword, DefaultKeyfile);
+
+			app2.GetDb().KpDatabase.RootGroup.AddGroup(group1, true);
+			foreach (var group in app.GetDb().KpDatabase.RootGroup.Groups)
+				Kp2aLog.Log("app: "+group.Name);
+
+			foreach (var group in resultApp.GetDb().KpDatabase.RootGroup.Groups)
+				Kp2aLog.Log("resultApp: " + group.Name);
+
+			//ensure the change was saved:
+			AssertDatabasesAreEqual(app2.GetDb().KpDatabase, resultApp.GetDb().KpDatabase);
+
+		}
+	}
+}