Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r13a669fc8333d93a997aa54f6037f0592da1cd96 -rc4ad887551228b6487d353f77691d3fd3bbafa6f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 13a669fc8333d93a997aa54f6037f0592da1cd96)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision c4ad887551228b6487d353f77691d3fd3bbafa6f)
@@ -221,8 +221,8 @@
// Then
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
- Tuple.Create("Openen van bestaand project is gelukt.", LogLevelConstant.Info)
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gelukt.", LogLevelConstant.Info)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(action, expectedMessages, 3);
Assert.AreEqual(tempRingtoetsFile, gui.ProjectFilePath);
Index: Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -rc4ad887551228b6487d353f77691d3fd3bbafa6f
--- Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs (.../StorageCommandHandler.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs (.../StorageCommandHandler.cs) (revision c4ad887551228b6487d353f77691d3fd3bbafa6f)
@@ -107,9 +107,9 @@
log.Info(Resources.StorageCommandHandler_NewProject_Creating_new_project_canceled);
return;
}
- log.Info(Resources.Creating_new_project);
+ log.Info(Resources.Creating_new_project_started);
projectOwner.SetProject(projectFactory.CreateNewProject(), null);
- log.Info(Resources.Created_new_project_successful);
+ log.Info(Resources.Creating_new_project_successful);
}
public string GetExistingProjectFilePath()
@@ -126,13 +126,13 @@
}
}
- log.Info(Resources.StorageCommandHandler_OpenExistingProject_Opening_existing_project_canceled);
+ log.Info(Resources.StorageCommandHandler_OpenExistingProject_Opening_project_canceled);
return null;
}
public bool OpenExistingProject(string filePath)
{
- log.Info(Resources.StorageCommandHandler_OpenExistingProject_Opening_existing_project);
+ log.Info(Resources.StorageCommandHandler_OpenExistingProject_Opening_project_started);
try
{
@@ -141,7 +141,7 @@
catch (Exception e) when (e is ArgumentException || e is CriticalFileReadException || e is StorageValidationException)
{
log.Error(e.Message, e);
- log.Error(Resources.StorageCommandHandler_OpeningExistingProject_Opening_existing_project_failed);
+ log.Error(Resources.StorageCommandHandler_OpeningExistingProject_Opening_project_failed);
projectOwner.SetProject(projectFactory.CreateNewProject(), null);
return false;
}
@@ -198,7 +198,7 @@
OpenProjectActivity.ProjectMigrationConstructionProperties migrationProperties;
if (PrepareProjectMigration(filePath, out migrationProperties) == MigrationRequired.Aborted)
{
- log.Info(Resources.StorageCommandHandler_OpenExistingProject_Opening_existing_project_canceled);
+ log.Info(Resources.StorageCommandHandler_OpenExistingProject_Opening_project_canceled);
return false;
}
Index: Core/Common/src/Core.Common.Gui/OpenProjectActivity.cs
===================================================================
diff -u -r76948e8765899b35776102ecd211d3d7575a9e4d -rc4ad887551228b6487d353f77691d3fd3bbafa6f
--- Core/Common/src/Core.Common.Gui/OpenProjectActivity.cs (.../OpenProjectActivity.cs) (revision 76948e8765899b35776102ecd211d3d7575a9e4d)
+++ Core/Common/src/Core.Common.Gui/OpenProjectActivity.cs (.../OpenProjectActivity.cs) (revision c4ad887551228b6487d353f77691d3fd3bbafa6f)
@@ -78,7 +78,7 @@
projectFactory = requiredOpenProjectProperties.ProjectFactory;
storage = requiredOpenProjectProperties.ProjectStorage;
- Description = Resources.OpenProjectActivity_Open_existing_project;
+ Description = Resources.OpenProjectActivity_Open_project;
}
protected override void OnRun()
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r9a63232347559e0dceb413fd38d7b87258807910 -rc4ad887551228b6487d353f77691d3fd3bbafa6f
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9a63232347559e0dceb413fd38d7b87258807910)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c4ad887551228b6487d353f77691d3fd3bbafa6f)
@@ -322,20 +322,20 @@
}
///
- /// Looks up a localized string similar to Nieuw Ringtoetsproject succesvol aangemaakt..
+ /// Looks up a localized string similar to Nieuw project aanmaken is gestart..
///
- public static string Created_new_project_successful {
+ public static string Creating_new_project_started {
get {
- return ResourceManager.GetString("Created_new_project_successful", resourceCulture);
+ return ResourceManager.GetString("Creating_new_project_started", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Nieuw Ringtoetsproject aanmaken....
+ /// Looks up a localized string similar to Nieuw project aanmaken is gelukt..
///
- public static string Creating_new_project {
+ public static string Creating_new_project_successful {
get {
- return ResourceManager.GetString("Creating_new_project", resourceCulture);
+ return ResourceManager.GetString("Creating_new_project_successful", resourceCulture);
}
}
@@ -581,7 +581,7 @@
}
///
- /// Looks up a localized string similar to Het Ringtoetsproject is niet opgeslagen..
+ /// Looks up a localized string similar to Opslaan van project is mislukt..
///
public static string ExceptionDialog_ButtonSaveProjectClick_Saving_project_failed {
get {
@@ -590,7 +590,7 @@
}
///
- /// Looks up a localized string similar to Project niet opgeslagen.
+ /// Looks up a localized string similar to Project is niet opgeslagen.
///
public static string ExceptionDialog_ButtonSaveProjectClick_Saving_project_failed_caption {
get {
@@ -599,7 +599,7 @@
}
///
- /// Looks up a localized string similar to Het Ringtoetsproject is succesvol opgeslagen..
+ /// Looks up a localized string similar to Opslaan van project is gelukt..
///
public static string ExceptionDialog_ButtonSaveProjectClick_Successfully_saved_project {
get {
@@ -608,7 +608,7 @@
}
///
- /// Looks up a localized string similar to Project opgeslagen.
+ /// Looks up a localized string similar to Project is opgeslagen.
///
public static string ExceptionDialog_ButtonSaveProjectClick_Successfully_saved_project_caption {
get {
@@ -1198,16 +1198,16 @@
}
///
- /// Looks up a localized string similar to Openen van bestaand project.
+ /// Looks up a localized string similar to Openen van project.
///
- public static string OpenProjectActivity_Open_existing_project {
+ public static string OpenProjectActivity_Open_project {
get {
- return ResourceManager.GetString("OpenProjectActivity_Open_existing_project", resourceCulture);
+ return ResourceManager.GetString("OpenProjectActivity_Open_project", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Leeg project initialiseren.
+ /// Looks up a localized string similar to Initialiseren van leeg project.
///
public static string OpenProjectActivity_ProgressTextStepName_InitializeEmptyProject {
get {
@@ -1216,7 +1216,7 @@
}
///
- /// Looks up a localized string similar to Ingeladen project initialiseren.
+ /// Looks up a localized string similar to Initialiseren van geopend project.
///
public static string OpenProjectActivity_ProgressTextStepName_InitializeProject {
get {
@@ -1225,7 +1225,7 @@
}
///
- /// Looks up a localized string similar to Migratie project.
+ /// Looks up a localized string similar to Migreren van project.
///
public static string OpenProjectActivity_ProgressTextStepName_MigrateProject {
get {
@@ -1234,7 +1234,7 @@
}
///
- /// Looks up a localized string similar to Inlezen project.
+ /// Looks up a localized string similar to Inlezen van project.
///
public static string OpenProjectActivity_ProgressTextStepName_ReadProject {
get {
@@ -1521,7 +1521,7 @@
}
///
- /// Looks up a localized string similar to Opgeslagen project initialiseren.
+ /// Looks up a localized string similar to Initialiseren van opgeslagen project.
///
public static string SaveProjectActivity_ProgressTextStepName_InitializeSavedProject {
get {
@@ -1539,7 +1539,7 @@
}
///
- /// Looks up a localized string similar to Voorbereiding opslaan.
+ /// Looks up a localized string similar to Voorbereidingen opslaan.
///
public static string SaveProjectActivity_ProgressTextStepName_StagingProject {
get {
@@ -1648,7 +1648,7 @@
}
///
- /// Looks up a localized string similar to Project aan het sluiten....
+ /// Looks up a localized string similar to Project afsluiten.
///
public static string StorageCommandHandler_ClosingProject_Title {
get {
@@ -1657,7 +1657,7 @@
}
///
- /// Looks up a localized string similar to Aanmaken van een nieuw Ringtoetsproject geannuleerd..
+ /// Looks up a localized string similar to Nieuw project aanmaken is geannuleerd..
///
public static string StorageCommandHandler_NewProject_Creating_new_project_canceled {
get {
@@ -1666,29 +1666,29 @@
}
///
- /// Looks up a localized string similar to Openen van bestaand Ringtoetsproject....
+ /// Looks up a localized string similar to Openen van project is geannuleerd..
///
- public static string StorageCommandHandler_OpenExistingProject_Opening_existing_project {
+ public static string StorageCommandHandler_OpenExistingProject_Opening_project_canceled {
get {
- return ResourceManager.GetString("StorageCommandHandler_OpenExistingProject_Opening_existing_project", resourceCulture);
+ return ResourceManager.GetString("StorageCommandHandler_OpenExistingProject_Opening_project_canceled", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Openen van bestaand Ringtoetsproject geannuleerd..
+ /// Looks up a localized string similar to Openen van project is gestart..
///
- public static string StorageCommandHandler_OpenExistingProject_Opening_existing_project_canceled {
+ public static string StorageCommandHandler_OpenExistingProject_Opening_project_started {
get {
- return ResourceManager.GetString("StorageCommandHandler_OpenExistingProject_Opening_existing_project_canceled", resourceCulture);
+ return ResourceManager.GetString("StorageCommandHandler_OpenExistingProject_Opening_project_started", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Het is niet gelukt om het Ringtoetsproject te laden..
+ /// Looks up a localized string similar to Openen van project is mislukt..
///
- public static string StorageCommandHandler_OpeningExistingProject_Opening_existing_project_failed {
+ public static string StorageCommandHandler_OpeningExistingProject_Opening_project_failed {
get {
- return ResourceManager.GetString("StorageCommandHandler_OpeningExistingProject_Opening_existing_project_failed", resourceCulture);
+ return ResourceManager.GetString("StorageCommandHandler_OpeningExistingProject_Opening_project_failed", resourceCulture);
}
}
@@ -1702,7 +1702,7 @@
}
///
- /// Looks up a localized string similar to Opslaan van het Ringtoetsproject geannuleerd..
+ /// Looks up a localized string similar to Opslaan van project is geannuleerd..
///
public static string StorageCommandHandler_SaveProject_Saving_project_canceled {
get {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r9a63232347559e0dceb413fd38d7b87258807910 -rc4ad887551228b6487d353f77691d3fd3bbafa6f
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 9a63232347559e0dceb413fd38d7b87258807910)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision c4ad887551228b6487d353f77691d3fd3bbafa6f)
@@ -154,8 +154,8 @@
Kritieke fout opgetreden tijdens deactivering van de grafische interface plugin.
-
- Nieuw Ringtoetsproject aanmaken...
+
+ Nieuw project aanmaken is gestart.
Berichten
@@ -175,8 +175,8 @@
..\Resources\saveHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Openen van bestaand Ringtoetsproject geannuleerd.
+
+ Openen van project is geannuleerd.
Geen enkele 'Importer' is beschikbaar voor dit element ({0}).
@@ -211,8 +211,8 @@
Berichten
-
- Nieuw Ringtoetsproject succesvol aangemaakt.
+
+ Nieuw project aanmaken is gelukt.
Beeld
@@ -271,8 +271,8 @@
Eigenschappen
-
- Openen van bestaand Ringtoetsproject...
+
+ Openen van project is gestart.
../Resources/brick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -499,11 +499,11 @@
Argument van DynamicPropertyOrderEvaluationMethod moet van het type 'string' zijn. Klasse: {0}.
-
- Het is niet gelukt om het Ringtoetsproject te laden.
+
+ Openen van project is mislukt.
- Opslaan van het Ringtoetsproject geannuleerd.
+ Opslaan van project is geannuleerd.
Kan geen 'IImportCommandHandler'-afhankelijk element in het contextmenu creëren zonder een 'IImportCommandHandler'.
@@ -533,10 +533,10 @@
Sla wijzigingen in het project op: {0}?
- Project aan het sluiten...
+ Project afsluiten
- Aanmaken van een nieuw Ringtoetsproject geannuleerd.
+ Nieuw project aanmaken is geannuleerd.
Algemeen filter
@@ -592,20 +592,20 @@
Importeren van gegevens is door de gebruiker geannuleerd.
-
- Openen van bestaand project
+
+ Openen van project
- Migratie project
+ Migreren van project
- Inlezen project
+ Inlezen van project
- Ingeladen project initialiseren
+ Initialiseren van geopend project
- Leeg project initialiseren
+ Initialiseren van leeg project
Stap {0} van {1} | {2}
@@ -617,10 +617,10 @@
Opslaan van project
- Opgeslagen project initialiseren
+ Initialiseren van opgeslagen project
- Voorbereiding opslaan
+ Voorbereidingen opslaan
Project opslaan
@@ -635,16 +635,16 @@
..\Resources\bug-exclamation.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- Het Ringtoetsproject is niet opgeslagen.
+ Opslaan van project is mislukt.
- Project niet opgeslagen
+ Project is niet opgeslagen
- Het Ringtoetsproject is succesvol opgeslagen.
+ Opslaan van project is gelukt.
- Project opgeslagen
+ Project is opgeslagen
Importeren van '{0}'
Index: Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs
===================================================================
diff -u -r38499aa6936706c30ac12e481233d3f13545dd8b -rc4ad887551228b6487d353f77691d3fd3bbafa6f
--- Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs (.../StorageCommandHandlerTest.cs) (revision 38499aa6936706c30ac12e481233d3f13545dd8b)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs (.../StorageCommandHandlerTest.cs) (revision c4ad887551228b6487d353f77691d3fd3bbafa6f)
@@ -82,8 +82,8 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Nieuw Ringtoetsproject aanmaken...", LogLevelConstant.Info),
- Tuple.Create("Nieuw Ringtoetsproject succesvol aangemaakt.", LogLevelConstant.Info)
+ Tuple.Create("Nieuw project aanmaken is gestart.", LogLevelConstant.Info),
+ Tuple.Create("Nieuw project aanmaken is gelukt.", LogLevelConstant.Info)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 2);
@@ -248,8 +248,8 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
- Tuple.Create("Openen van bestaand project is gelukt.", LogLevelConstant.Info)
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gelukt.", LogLevelConstant.Info)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 2);
Assert.IsTrue(result);
@@ -298,8 +298,8 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
- Tuple.Create("Openen van bestaand Ringtoetsproject geannuleerd.", LogLevelConstant.Info)
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is geannuleerd.", LogLevelConstant.Info)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 2);
Assert.IsFalse(result);
@@ -352,8 +352,8 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
- Tuple.Create("Openen van bestaand Ringtoetsproject geannuleerd.", LogLevelConstant.Info)
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is geannuleerd.", LogLevelConstant.Info)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 2);
Assert.IsFalse(result);
@@ -404,9 +404,9 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
Tuple.Create(errorMessage, LogLevelConstant.Error),
- Tuple.Create("Het is niet gelukt om het Ringtoetsproject te laden.", LogLevelConstant.Error)
+ Tuple.Create("Openen van project is mislukt.", LogLevelConstant.Error)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 3);
Assert.IsFalse(result);
@@ -458,9 +458,9 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
Tuple.Create(errorMessage, LogLevelConstant.Error),
- Tuple.Create("Het is niet gelukt om het Ringtoetsproject te laden.", LogLevelConstant.Error)
+ Tuple.Create("Openen van project is mislukt.", LogLevelConstant.Error)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 3);
Assert.IsFalse(result);
@@ -520,9 +520,9 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
Tuple.Create(errorMessage, LogLevelConstant.Error),
- Tuple.Create("Openen van bestaand project is mislukt.", LogLevelConstant.Error)
+ Tuple.Create("Openen van project is mislukt.", LogLevelConstant.Error)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 3);
Assert.IsFalse(result);
@@ -572,9 +572,9 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
Tuple.Create(goodErrorMessageText, LogLevelConstant.Error),
- Tuple.Create("Openen van bestaand project is mislukt.", LogLevelConstant.Error)
+ Tuple.Create("Openen van project is mislukt.", LogLevelConstant.Error)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 3);
Assert.IsFalse(result);
@@ -626,8 +626,8 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
- Tuple.Create("Openen van bestaand project is mislukt.", LogLevelConstant.Error)
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is mislukt.", LogLevelConstant.Error)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 2);
Assert.IsFalse(result);
@@ -678,8 +678,8 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
- Tuple.Create("Openen van bestaand project is gelukt.", LogLevelConstant.Info)
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gelukt.", LogLevelConstant.Info)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 2);
Assert.IsTrue(result);
@@ -737,8 +737,8 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
- Tuple.Create("Openen van bestaand project is gelukt.", LogLevelConstant.Info)
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gelukt.", LogLevelConstant.Info)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 2);
Assert.IsTrue(result);
@@ -825,7 +825,7 @@
Action call = () => returnedPath = storageCommandHandler.GetExistingProjectFilePath();
// Assert
- const string expectedMessage = "Openen van bestaand Ringtoetsproject geannuleerd.";
+ const string expectedMessage = "Openen van project is geannuleerd.";
Tuple expectedLogMessageAndLevel = Tuple.Create(expectedMessage, LogLevelConstant.Info);
TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel);
Assert.IsNull(returnedPath);
@@ -888,7 +888,7 @@
projectOwnerStub.Stub(po => po.ProjectFilePath).Return("");
var inquiryHelper = mocks.StrictMock();
- inquiryHelper.Expect(h => h.InquirePerformOptionalStep("Project aan het sluiten...",
+ inquiryHelper.Expect(h => h.InquirePerformOptionalStep("Project afsluiten",
$"Sla wijzigingen in het project op: {projectName}?")).
Return(OptionalStepResult.Cancel);
mocks.ReplayAll();
@@ -935,7 +935,7 @@
projectOwnerStub.Stub(po => po.ProjectFilePath).Return("");
var inquiryHelper = mocks.StrictMock();
- inquiryHelper.Expect(h => h.InquirePerformOptionalStep("Project aan het sluiten...",
+ inquiryHelper.Expect(h => h.InquirePerformOptionalStep("Project afsluiten",
$"Sla wijzigingen in het project op: {projectName}?"))
.Return(OptionalStepResult.SkipOptionalStep);
mocks.ReplayAll();
@@ -986,7 +986,7 @@
projectOwnerStub.Stub(po => po.ProjectFilePath).Return(someValidFilePath);
var inquiryHelper = mocks.StrictMock();
- inquiryHelper.Expect(h => h.InquirePerformOptionalStep("Project aan het sluiten...",
+ inquiryHelper.Expect(h => h.InquirePerformOptionalStep("Project afsluiten",
$"Sla wijzigingen in het project op: {projectName}?"))
.Return(OptionalStepResult.PerformOptionalStep);
mocks.ReplayAll();
@@ -1045,7 +1045,7 @@
projectOwnerStub.Expect(po => po.SetProject(project, someValidFilePath));
var inquiryHelper = mocks.StrictMock();
- inquiryHelper.Expect(h => h.InquirePerformOptionalStep("Project aan het sluiten...",
+ inquiryHelper.Expect(h => h.InquirePerformOptionalStep("Project afsluiten",
$"Sla wijzigingen in het project op: {projectName}?"))
.Return(OptionalStepResult.PerformOptionalStep);
inquiryHelper.Expect(h => h.GetTargetFileLocation(fileFilter, projectName))
Index: Core/Common/test/Core.Common.Gui.Test/ExceptionDialogTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -rc4ad887551228b6487d353f77691d3fd3bbafa6f
--- Core/Common/test/Core.Common.Gui.Test/ExceptionDialogTest.cs (.../ExceptionDialogTest.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.Gui.Test/ExceptionDialogTest.cs (.../ExceptionDialogTest.cs) (revision c4ad887551228b6487d353f77691d3fd3bbafa6f)
@@ -252,8 +252,8 @@
}
[Test]
- [TestCase(true, "Project opgeslagen", "Het Ringtoetsproject is succesvol opgeslagen.")]
- [TestCase(false, "Project niet opgeslagen", "Het Ringtoetsproject is niet opgeslagen.")]
+ [TestCase(true, "Project is opgeslagen", "Opslaan van project is gelukt.")]
+ [TestCase(false, "Project is niet opgeslagen", "Opslaan van project is mislukt.")]
public void GivenExceptionDialog_WhenSaveProjectClicked_ThenSaveProjectAsCalledAndMessageBoxShown(bool saveSuccessful, string expectedDialogTitle, string expectedDialogMessage)
{
// Setup
@@ -327,8 +327,8 @@
buttonTester.Click();
// Assert
- Assert.AreEqual("Project niet opgeslagen", messageBoxTitle);
- Assert.AreEqual("Het Ringtoetsproject is niet opgeslagen.", messageBoxText);
+ Assert.AreEqual("Project is niet opgeslagen", messageBoxTitle);
+ Assert.AreEqual("Opslaan van project is mislukt.", messageBoxText);
}
mocks.VerifyAll();
Index: Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs
===================================================================
diff -u -r76948e8765899b35776102ecd211d3d7575a9e4d -rc4ad887551228b6487d353f77691d3fd3bbafa6f
--- Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs (.../GuiCoreTest.cs) (revision 76948e8765899b35776102ecd211d3d7575a9e4d)
+++ Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs (.../GuiCoreTest.cs) (revision c4ad887551228b6487d353f77691d3fd3bbafa6f)
@@ -538,8 +538,8 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
- Tuple.Create("Openen van bestaand project is gelukt.", LogLevelConstant.Info)
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gelukt.", LogLevelConstant.Info)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages);
Assert.AreEqual(testFile, gui.ProjectFilePath);
@@ -590,8 +590,8 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
- Tuple.Create("Openen van bestaand Ringtoetsproject geannuleerd.", LogLevelConstant.Info)
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is geannuleerd.", LogLevelConstant.Info)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages);
@@ -641,9 +641,9 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
Tuple.Create(expectedErrorMessage, LogLevelConstant.Error),
- Tuple.Create("Het is niet gelukt om het Ringtoetsproject te laden.", LogLevelConstant.Error)
+ Tuple.Create("Openen van project is mislukt.", LogLevelConstant.Error)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages);
@@ -696,9 +696,9 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
Tuple.Create(expectedErrorMessage, LogLevelConstant.Error),
- Tuple.Create("Openen van bestaand project is mislukt.", LogLevelConstant.Error)
+ Tuple.Create("Openen van project is mislukt.", LogLevelConstant.Error)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages);
@@ -746,9 +746,9 @@
// Assert
var expectedMessages = new[]
{
- Tuple.Create("Openen van bestaand Ringtoetsproject...", LogLevelConstant.Info),
+ Tuple.Create("Openen van project is gestart.", LogLevelConstant.Info),
Tuple.Create(storageExceptionText, LogLevelConstant.Error),
- Tuple.Create("Openen van bestaand project is mislukt.", LogLevelConstant.Error)
+ Tuple.Create("Openen van project is mislukt.", LogLevelConstant.Error)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages);
Index: Core/Common/test/Core.Common.Gui.Test/OpenProjectActivityTest.cs
===================================================================
diff -u -rd90afe0704aff148ea3b453306dc97e2db02a75d -rc4ad887551228b6487d353f77691d3fd3bbafa6f
--- Core/Common/test/Core.Common.Gui.Test/OpenProjectActivityTest.cs (.../OpenProjectActivityTest.cs) (revision d90afe0704aff148ea3b453306dc97e2db02a75d)
+++ Core/Common/test/Core.Common.Gui.Test/OpenProjectActivityTest.cs (.../OpenProjectActivityTest.cs) (revision c4ad887551228b6487d353f77691d3fd3bbafa6f)
@@ -57,7 +57,7 @@
// Assert
Assert.IsInstanceOf(activity);
- Assert.AreEqual("Openen van bestaand project", activity.Description);
+ Assert.AreEqual("Openen van project", activity.Description);
Assert.IsNull(activity.ProgressText);
Assert.AreEqual(ActivityState.None, activity.State);
@@ -602,8 +602,8 @@
// Assert
var expectedProgressMessages = new[]
{
- "Stap 1 van 3 | Migratie project",
- "Stap 2 van 3 | Inlezen project"
+ "Stap 1 van 3 | Migreren van project",
+ "Stap 2 van 3 | Inlezen van project"
};
CollectionAssert.AreEqual(expectedProgressMessages, progressMessages);
mocks.VerifyAll();
@@ -643,7 +643,7 @@
// Assert
var expectedProgressMessages = new[]
{
- "Stap 1 van 2 | Inlezen project"
+ "Stap 1 van 2 | Inlezen van project"
};
CollectionAssert.AreEqual(expectedProgressMessages, progressMessages);
mocks.VerifyAll();
@@ -687,7 +687,7 @@
Action call = () => activity.Finish();
// Assert
- const string expectedMessage = "Openen van bestaand project is gelukt.";
+ const string expectedMessage = "Openen van project is gelukt.";
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
Assert.AreEqual(ActivityState.Finished, activity.State);
@@ -736,7 +736,7 @@
Action call = () => activity.Finish();
// Assert
- Tuple expectedMessage = Tuple.Create("Openen van bestaand project is mislukt.",
+ Tuple expectedMessage = Tuple.Create("Openen van project is mislukt.",
LogLevelConstant.Error);
TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedMessage, 1);
@@ -790,7 +790,7 @@
Action call = () => activity.Finish();
// Assert
- Tuple expectedMessage = Tuple.Create("Openen van bestaand project is mislukt.",
+ Tuple expectedMessage = Tuple.Create("Openen van project is mislukt.",
LogLevelConstant.Error);
TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedMessage, 1);
@@ -840,7 +840,7 @@
Action call = () => activity.Finish();
// Assert
- Tuple expectedMessage = Tuple.Create("Openen van bestaand project is geannuleerd.",
+ Tuple expectedMessage = Tuple.Create("Openen van project is geannuleerd.",
LogLevelConstant.Warn);
TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedMessage, 1);
@@ -902,7 +902,7 @@
// Assert
var expectedProgressMessages = new[]
{
- "Stap 3 van 3 | Ingeladen project initialiseren"
+ "Stap 3 van 3 | Initialiseren van geopend project"
};
CollectionAssert.AreEqual(expectedProgressMessages, progressMessages);
@@ -952,7 +952,7 @@
// Assert
var expectedProgressMessages = new[]
{
- "Stap 2 van 2 | Ingeladen project initialiseren"
+ "Stap 2 van 2 | Initialiseren van geopend project"
};
CollectionAssert.AreEqual(expectedProgressMessages, progressMessages);
@@ -1008,7 +1008,7 @@
// Assert
var expectedProgressMessages = new[]
{
- "Stap 3 van 3 | Leeg project initialiseren"
+ "Stap 3 van 3 | Initialiseren van leeg project"
};
CollectionAssert.AreEqual(expectedProgressMessages, progressMessages);
@@ -1057,7 +1057,7 @@
// Assert
var expectedProgressMessages = new[]
{
- "Stap 2 van 2 | Leeg project initialiseren"
+ "Stap 2 van 2 | Initialiseren van leeg project"
};
CollectionAssert.AreEqual(expectedProgressMessages, progressMessages);
Index: Core/Common/test/Core.Common.Gui.Test/SaveProjectActivityTest.cs
===================================================================
diff -u -rd90afe0704aff148ea3b453306dc97e2db02a75d -rc4ad887551228b6487d353f77691d3fd3bbafa6f
--- Core/Common/test/Core.Common.Gui.Test/SaveProjectActivityTest.cs (.../SaveProjectActivityTest.cs) (revision d90afe0704aff148ea3b453306dc97e2db02a75d)
+++ Core/Common/test/Core.Common.Gui.Test/SaveProjectActivityTest.cs (.../SaveProjectActivityTest.cs) (revision c4ad887551228b6487d353f77691d3fd3bbafa6f)
@@ -263,7 +263,7 @@
int totalSteps = saveExistingProject ? 2 : 3;
var expectedProgressMessages = new[]
{
- $"Stap 1 van {totalSteps} | Voorbereiding opslaan",
+ $"Stap 1 van {totalSteps} | Voorbereidingen opslaan",
$"Stap 2 van {totalSteps} | Project opslaan"
};
CollectionAssert.AreEqual(expectedProgressMessages, progressMessages);
@@ -416,7 +416,7 @@
int totalSteps = hasStagedProject ? 2 : 3;
var expectedProgressMessages = new[]
{
- $"Stap {totalSteps} van {totalSteps} | Opgeslagen project initialiseren"
+ $"Stap {totalSteps} van {totalSteps} | Initialiseren van opgeslagen project"
};
CollectionAssert.AreEqual(expectedProgressMessages, progressMessages);
mocks.VerifyAll();