Index: Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs
===================================================================
diff -u -r92056906158ddd85bd0b82da96167997e08c289a -r77238b032be21dcdd12920dd1fb894d7a78b52f3
--- Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs (.../GuiUpdateHandler.cs) (revision 92056906158ddd85bd0b82da96167997e08c289a)
+++ Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs (.../GuiUpdateHandler.cs) (revision 77238b032be21dcdd12920dd1fb894d7a78b52f3)
@@ -147,7 +147,14 @@
}
else
{
- log.InfoFormat(Resources.GuiUpdateHandler_UpdateItemsUsingDialog_Updating_from_Path_0_cancelled, oldPath);
+ if (!string.IsNullOrEmpty(oldPath))
+ {
+ log.InfoFormat(Resources.GuiUpdateHandler_UpdateItemsUsingDialog_Updating_from_Path_0_cancelled, oldPath);
+ }
+ else
+ {
+ log.InfoFormat(Resources.GuiUpdateHandler_UpdateItemsUsingDialog_Updating_cancelled);
+ }
}
}
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -rb194ffd0014b0e3251cb95bd1c73a3eb5c71290f -r77238b032be21dcdd12920dd1fb894d7a78b52f3
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b194ffd0014b0e3251cb95bd1c73a3eb5c71290f)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 77238b032be21dcdd12920dd1fb894d7a78b52f3)
@@ -964,6 +964,15 @@
}
///
+ /// Looks up a localized string similar to Bijwerken van gegevens is door de gebruiker geannuleerd..
+ ///
+ public static string GuiUpdateHandler_UpdateItemsUsingDialog_Updating_cancelled {
+ get {
+ return ResourceManager.GetString("GuiUpdateHandler_UpdateItemsUsingDialog_Updating_cancelled", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Bijwerken van gegevens in '{0}' is door de gebruiker geannuleerd..
///
public static string GuiUpdateHandler_UpdateItemsUsingDialog_Updating_from_Path_0_cancelled {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -rb194ffd0014b0e3251cb95bd1c73a3eb5c71290f -r77238b032be21dcdd12920dd1fb894d7a78b52f3
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision b194ffd0014b0e3251cb95bd1c73a3eb5c71290f)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 77238b032be21dcdd12920dd1fb894d7a78b52f3)
@@ -631,4 +631,7 @@
Algemeen
+
+ Bijwerken van gegevens is door de gebruiker geannuleerd.
+
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs
===================================================================
diff -u -r69eb17523e5ae490637e29718a4a563cbcaacc3c -r77238b032be21dcdd12920dd1fb894d7a78b52f3
--- Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs (.../GuiUpdateHandlerTest.cs) (revision 69eb17523e5ae490637e29718a4a563cbcaacc3c)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs (.../GuiUpdateHandlerTest.cs) (revision 77238b032be21dcdd12920dd1fb894d7a78b52f3)
@@ -341,7 +341,7 @@
}
[Test]
- public void UpdateOn_InquiryHelperReturnsNoPath_UpdateCancelledWithLogMessage()
+ public void UpdateOn_InquiryHelperReturnsNoPathAndCurrentPathNotSet_UpdateCancelledWithLogMessage()
{
// Setup
var generator = new FileFilterGenerator();
@@ -373,12 +373,58 @@
Action call = () => updateHandler.UpdateOn(targetObject);
// Assert
- TestHelper.AssertLogMessageIsGenerated(call, "Bijwerken van gegevens in '' is door de gebruiker geannuleerd.");
+ const string expectedLogMessage = "Bijwerken van gegevens is door de gebruiker geannuleerd.";
+ Tuple expectedLogMessageAndLevel = Tuple.Create(expectedLogMessage,
+ LogLevelConstant.Info);
+ TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel);
}
mockRepository.VerifyAll();
}
[Test]
+ public void UpdateOn_InquiryHelperReturnsNoPathAndCurrentPathSet_UpdateCancelledWithLogMessage()
+ {
+ // Setup
+ var generator = new FileFilterGenerator();
+ var targetObject = new object();
+
+ var mockRepository = new MockRepository();
+ var inquiryHelper = mockRepository.Stub();
+ inquiryHelper.Expect(ih => ih.GetSourceFileLocation(generator.Filter)).Return(null);
+ var fileImporter = mockRepository.Stub();
+ mockRepository.ReplayAll();
+
+ const string currentPath = "FilePath/to/Update";
+ using (var form = new Form())
+ {
+ var updateHandler = new GuiUpdateHandler(form, new UpdateInfo[]
+ {
+ new UpdateInfo