Index: Core/Common/test/Core.Common.IO.Test/Readers/SqLiteDatabaseReaderBaseTest.cs =================================================================== diff -u -r6a87577fa7123c62be24c8f7a192a496fe41f8fb -r2572d3096fb3d683eb18fcaf490791ea81d64ece --- Core/Common/test/Core.Common.IO.Test/Readers/SqLiteDatabaseReaderBaseTest.cs (.../SqLiteDatabaseReaderBaseTest.cs) (revision 6a87577fa7123c62be24c8f7a192a496fe41f8fb) +++ Core/Common/test/Core.Common.IO.Test/Readers/SqLiteDatabaseReaderBaseTest.cs (.../SqLiteDatabaseReaderBaseTest.cs) (revision 2572d3096fb3d683eb18fcaf490791ea81d64ece) @@ -27,7 +27,6 @@ using Core.Common.TestUtil; using Core.Common.Util.Builders; using NUnit.Framework; -using UtilResources = Core.Common.Util.Properties.Resources; namespace Core.Common.IO.Test.Readers { @@ -101,7 +100,7 @@ TestDelegate test = () => new TestReader(testFile).Dispose(); // Assert - string expectedMessage = new FileReaderErrorMessageBuilder(testFile).Build(UtilResources.Error_File_does_not_exist); + string expectedMessage = new FileReaderErrorMessageBuilder(testFile).Build("Het bestand bestaat niet."); var exception = Assert.Throws(test); Assert.AreEqual(expectedMessage, exception.Message); } Index: Core/Common/test/Core.Common.Util.Test/Attributes/ResourcesCategoryAttributeTest.cs =================================================================== diff -u -r6a87577fa7123c62be24c8f7a192a496fe41f8fb -r2572d3096fb3d683eb18fcaf490791ea81d64ece --- Core/Common/test/Core.Common.Util.Test/Attributes/ResourcesCategoryAttributeTest.cs (.../ResourcesCategoryAttributeTest.cs) (revision 6a87577fa7123c62be24c8f7a192a496fe41f8fb) +++ Core/Common/test/Core.Common.Util.Test/Attributes/ResourcesCategoryAttributeTest.cs (.../ResourcesCategoryAttributeTest.cs) (revision 2572d3096fb3d683eb18fcaf490791ea81d64ece) @@ -44,7 +44,7 @@ public void ParameteredConstructor_ResourcePropertyIsNotString_ThrowInvalidOperationException() { // Call - TestDelegate call = () => new ResourcesCategoryAttribute(typeof(Resources), "abacus"); + TestDelegate call = () => new ResourcesCategoryAttribute(typeof(Resources), nameof(Resources.abacus)); // Assert string message = Assert.Throws(call).Message; @@ -55,30 +55,30 @@ public void ParameteredConstructor_StringResource_ExpectedValues() { // Call - var attribute = new ResourcesCategoryAttribute(typeof(Resources), "SomeStringResource"); + var attribute = new ResourcesCategoryAttribute(typeof(Resources), nameof(Resources.SomeStringResource)); // Assert - Assert.AreEqual(Resources.SomeStringResource, attribute.Category); + Assert.AreEqual("Awesome!", attribute.Category); } [Test] public void ParameteredConstructor_StringResourceAtPosition_AddTabsForPosition() { // Call - var attribute = new ResourcesCategoryAttribute(typeof(Resources), "SomeStringResource", 1, 2); + var attribute = new ResourcesCategoryAttribute(typeof(Resources), nameof(Resources.SomeStringResource), 1, 2); // Assert - Assert.AreEqual($"\t{Resources.SomeStringResource}", attribute.Category); + Assert.AreEqual("\tAwesome!", attribute.Category); } [Test] public void ParameteredConstructor_StringResourceAtPositionMoreThanCategoryAmount_NoTabsAdded() { // Call - var attribute = new ResourcesCategoryAttribute(typeof(Resources), "SomeStringResource", 4, 2); + var attribute = new ResourcesCategoryAttribute(typeof(Resources), nameof(Resources.SomeStringResource), 4, 2); // Assert - Assert.AreEqual(Resources.SomeStringResource, attribute.Category); + Assert.AreEqual("Awesome!", attribute.Category); } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Util.Test/Attributes/ResourcesDescriptionAttributeTest.cs =================================================================== diff -u -r6a87577fa7123c62be24c8f7a192a496fe41f8fb -r2572d3096fb3d683eb18fcaf490791ea81d64ece --- Core/Common/test/Core.Common.Util.Test/Attributes/ResourcesDescriptionAttributeTest.cs (.../ResourcesDescriptionAttributeTest.cs) (revision 6a87577fa7123c62be24c8f7a192a496fe41f8fb) +++ Core/Common/test/Core.Common.Util.Test/Attributes/ResourcesDescriptionAttributeTest.cs (.../ResourcesDescriptionAttributeTest.cs) (revision 2572d3096fb3d683eb18fcaf490791ea81d64ece) @@ -44,7 +44,7 @@ public void ParameteredConstructor_ResourcePropertyIsNotString_ThrowInvalidOperationException() { // Call - TestDelegate call = () => new ResourcesDescriptionAttribute(typeof(Resources), "abacus"); + TestDelegate call = () => new ResourcesDescriptionAttribute(typeof(Resources), nameof(Resources.abacus)); // Assert string message = Assert.Throws(call).Message; @@ -55,10 +55,10 @@ public void ParameteredConstructor_StringResource_ExpectedValues() { // Call - var attribute = new ResourcesDescriptionAttribute(typeof(Resources), "SomeStringResource"); + var attribute = new ResourcesDescriptionAttribute(typeof(Resources), nameof(Resources.SomeStringResource)); // Assert - Assert.AreEqual(Resources.SomeStringResource, attribute.Description); + Assert.AreEqual("Awesome!", attribute.Description); } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Util.Test/Attributes/ResourcesDisplayNameAttributeTest.cs =================================================================== diff -u -r6a87577fa7123c62be24c8f7a192a496fe41f8fb -r2572d3096fb3d683eb18fcaf490791ea81d64ece --- Core/Common/test/Core.Common.Util.Test/Attributes/ResourcesDisplayNameAttributeTest.cs (.../ResourcesDisplayNameAttributeTest.cs) (revision 6a87577fa7123c62be24c8f7a192a496fe41f8fb) +++ Core/Common/test/Core.Common.Util.Test/Attributes/ResourcesDisplayNameAttributeTest.cs (.../ResourcesDisplayNameAttributeTest.cs) (revision 2572d3096fb3d683eb18fcaf490791ea81d64ece) @@ -46,7 +46,7 @@ public void ParameteredConstructor_ResourcePropertyIsNotString_ThrowInvalidOperationException() { // Call - TestDelegate call = () => new ResourcesDisplayNameAttribute(typeof(Resources), "abacus"); + TestDelegate call = () => new ResourcesDisplayNameAttribute(typeof(Resources), nameof(Resources.abacus)); // Assert string message = Assert.Throws(call).Message; @@ -57,10 +57,10 @@ public void ParameteredConstructor_StringResource_ExpectedValues() { // Call - var attribute = new ResourcesDisplayNameAttribute(typeof(Resources), "SomeStringResource"); + var attribute = new ResourcesDisplayNameAttribute(typeof(Resources), nameof(Resources.SomeStringResource)); // Assert - Assert.AreEqual(Resources.SomeStringResource, attribute.DisplayName); + Assert.AreEqual("Awesome!", attribute.DisplayName); } [Test] @@ -73,7 +73,7 @@ // Assert Assert.IsNotNull(resourcesDisplayNameAttribute); - Assert.AreEqual(Resources.EnumStringResource, resourcesDisplayNameAttribute.DisplayName); + Assert.AreEqual("Awesome enum value", resourcesDisplayNameAttribute.DisplayName); } [Test] @@ -86,7 +86,7 @@ // Assert Assert.IsNotNull(resourcesDisplayNameAttribute); - Assert.AreEqual(Resources.MethodStringResource, resourcesDisplayNameAttribute.DisplayName); + Assert.AreEqual("Awesome method value", resourcesDisplayNameAttribute.DisplayName); } [Test] @@ -97,7 +97,7 @@ // Assert Assert.IsNotNull(resourcesDisplayNameAttribute); - Assert.AreEqual(Resources.ClassStringResource, resourcesDisplayNameAttribute.DisplayName); + Assert.AreEqual("Awesome class value", resourcesDisplayNameAttribute.DisplayName); } private enum SimpleEnum Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/StructuresImporterTest.cs =================================================================== diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r2572d3096fb3d683eb18fcaf490791ea81d64ece --- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/StructuresImporterTest.cs (.../StructuresImporterTest.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/StructuresImporterTest.cs (.../StructuresImporterTest.cs) (revision 2572d3096fb3d683eb18fcaf490791ea81d64ece) @@ -38,7 +38,6 @@ using Riskeer.Common.IO.FileImporters; using Riskeer.Common.IO.FileImporters.MessageProviders; using Riskeer.Common.IO.Structures; -using CoreCommonUtilResources = Core.Common.Util.Properties.Resources; namespace Riskeer.Common.IO.Test.FileImporters { @@ -205,7 +204,7 @@ { string[] messageArray = messages.ToArray(); string expectedMessage = new FileReaderErrorMessageBuilder(filePath) - .Build(CoreCommonUtilResources.Error_Path_must_be_specified); + .Build("Bestandspad mag niet leeg of ongedefinieerd zijn."); StringAssert.StartsWith(expectedMessage, messageArray[0]); }); Assert.IsFalse(importResult); @@ -266,7 +265,7 @@ // Assert string expectedMessage = new FileReaderErrorMessageBuilder(folderPath) - .Build(CoreCommonUtilResources.Error_Path_must_not_point_to_empty_file_name); + .Build("Bestandspad mag niet verwijzen naar een lege bestandsnaam."); TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsFalse(importResult); } Index: Riskeer/Common/test/Riskeer.Common.IO.Test/Structures/StructuresCharacteristicsCsvReaderTest.cs =================================================================== diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r2572d3096fb3d683eb18fcaf490791ea81d64ece --- Riskeer/Common/test/Riskeer.Common.IO.Test/Structures/StructuresCharacteristicsCsvReaderTest.cs (.../StructuresCharacteristicsCsvReaderTest.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/Structures/StructuresCharacteristicsCsvReaderTest.cs (.../StructuresCharacteristicsCsvReaderTest.cs) (revision 2572d3096fb3d683eb18fcaf490791ea81d64ece) @@ -27,7 +27,6 @@ using Core.Common.Util.Builders; using NUnit.Framework; using Riskeer.Common.IO.Structures; -using UtilResources = Core.Common.Util.Properties.Resources; namespace Riskeer.Common.IO.Test.Structures { @@ -46,7 +45,7 @@ TestDelegate call = () => new StructuresCharacteristicsCsvReader(path); // Assert - string expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilResources.Error_Path_must_be_specified); + string expectedMessage = new FileReaderErrorMessageBuilder(path).Build("Bestandspad mag niet leeg of ongedefinieerd zijn."); TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } @@ -77,7 +76,7 @@ // Assert var exception = Assert.Throws(call); - string expectedMessage = new FileReaderErrorMessageBuilder(testDataPath).Build(UtilResources.Error_Path_must_not_point_to_empty_file_name); + string expectedMessage = new FileReaderErrorMessageBuilder(testDataPath).Build("Bestandspad mag niet verwijzen naar een lege bestandsnaam."); Assert.AreEqual(expectedMessage, exception.Message); } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs =================================================================== diff -u -r2c8a3abae63494fce39939b239344dc2a41132c9 -r2572d3096fb3d683eb18fcaf490791ea81d64ece --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs) (revision 2c8a3abae63494fce39939b239344dc2a41132c9) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs) (revision 2572d3096fb3d683eb18fcaf490791ea81d64ece) @@ -41,7 +41,7 @@ Assert.IsInstanceOf>(calculation); Assert.IsInstanceOf(calculation); - Assert.AreEqual(RiskeerCommonDataResources.Calculation_DefaultName, calculation.Name); + Assert.AreEqual("Nieuwe berekening", calculation.Name); Assert.IsNotNull(calculation.InputParameters); Assert.IsNull(calculation.Comments.Body); Assert.IsNull(calculation.Output); Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r937cad85a137a7c77b84dec605916b0b45415169 -r2572d3096fb3d683eb18fcaf490791ea81d64ece --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 937cad85a137a7c77b84dec605916b0b45415169) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 2572d3096fb3d683eb18fcaf490791ea81d64ece) @@ -82,7 +82,7 @@ string text = info.Text(null); // Assert - Assert.AreEqual(RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, text); + Assert.AreEqual("Resultaat", text); } [Test] Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/SurfaceLines/MacroStabilityInwardsSurfaceLineExtensionsTest.cs =================================================================== diff -u -r59482025a9b7fc432eaf09f808006f543dec5840 -r2572d3096fb3d683eb18fcaf490791ea81d64ece --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/SurfaceLines/MacroStabilityInwardsSurfaceLineExtensionsTest.cs (.../MacroStabilityInwardsSurfaceLineExtensionsTest.cs) (revision 59482025a9b7fc432eaf09f808006f543dec5840) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/SurfaceLines/MacroStabilityInwardsSurfaceLineExtensionsTest.cs (.../MacroStabilityInwardsSurfaceLineExtensionsTest.cs) (revision 2572d3096fb3d683eb18fcaf490791ea81d64ece) @@ -28,7 +28,6 @@ using Riskeer.Common.IO.SurfaceLines; using Riskeer.MacroStabilityInwards.IO.SurfaceLines; using Riskeer.MacroStabilityInwards.Primitives; -using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; namespace Riskeer.MacroStabilityInwards.IO.Test.SurfaceLines { @@ -42,32 +41,32 @@ var name = "Missing SurfaceLevelOutside"; CharacteristicPoints set = CreateCompleteCharacteristicPointSet(name); set.SurfaceLevelOutside = null; - yield return new TestCaseData(set, RiskeerCommonDataResources.CharacteristicPoint_SurfaceLevelOutside).SetName(name); + yield return new TestCaseData(set, "Maaiveld buitenwaarts").SetName(name); name = "Missing DikeToeAtRiver"; set = CreateCompleteCharacteristicPointSet(name); set.DikeToeAtRiver = null; - yield return new TestCaseData(set, RiskeerCommonDataResources.CharacteristicPoint_DikeToeAtRiver).SetName(name); + yield return new TestCaseData(set, "Teen dijk buitenwaarts").SetName(name); name = "Missing DikeTopAtPolder"; set = CreateCompleteCharacteristicPointSet(name); set.DikeTopAtPolder = null; - yield return new TestCaseData(set, RiskeerCommonDataResources.CharacteristicPoint_DikeTopAtPolder).SetName(name); + yield return new TestCaseData(set, "Kruin binnentalud").SetName(name); name = "Missing DikeTopAtRiver"; set = CreateCompleteCharacteristicPointSet(name); set.DikeTopAtRiver = null; - yield return new TestCaseData(set, RiskeerCommonDataResources.CharacteristicPoint_DikeTopAtRiver).SetName(name); + yield return new TestCaseData(set, "Kruin buitentalud").SetName(name); name = "Missing DikeToeAtPolder"; set = CreateCompleteCharacteristicPointSet(name); set.DikeToeAtPolder = null; - yield return new TestCaseData(set, RiskeerCommonDataResources.CharacteristicPoint_DikeToeAtPolder).SetName(name); + yield return new TestCaseData(set, "Teen dijk binnenwaarts").SetName(name); name = "Missing SurfaceLevelInside"; set = CreateCompleteCharacteristicPointSet(name); set.SurfaceLevelInside = null; - yield return new TestCaseData(set, RiskeerCommonDataResources.CharacteristicPoint_SurfaceLevelInside).SetName(name); + yield return new TestCaseData(set, "Maaiveld binnenwaarts").SetName(name); } } @@ -80,42 +79,42 @@ yield return new TestCaseData( set, new Action((points, p) => points.SurfaceLevelOutside = p), - RiskeerCommonDataResources.CharacteristicPoint_SurfaceLevelOutside).SetName(name); + "Maaiveld buitenwaarts").SetName(name); name = "Moved DikeToeAtRiver"; set = CreateCompleteCharacteristicPointSet(name); yield return new TestCaseData( set, new Action((points, p) => points.DikeToeAtRiver = p), - RiskeerCommonDataResources.CharacteristicPoint_DikeToeAtRiver).SetName(name); + "Teen dijk buitenwaarts").SetName(name); name = "Moved DikeTopAtPolder"; set = CreateCompleteCharacteristicPointSet(name); yield return new TestCaseData( set, new Action((points, p) => points.DikeTopAtPolder = p), - RiskeerCommonDataResources.CharacteristicPoint_DikeTopAtPolder).SetName(name); + "Kruin binnentalud").SetName(name); name = "Moved DikeTopAtRiver"; set = CreateCompleteCharacteristicPointSet(name); yield return new TestCaseData( set, new Action((points, p) => points.DikeTopAtRiver = p), - RiskeerCommonDataResources.CharacteristicPoint_DikeTopAtRiver).SetName(name); + "Kruin buitentalud").SetName(name); name = "Moved DikeToeAtPolder"; set = CreateCompleteCharacteristicPointSet(name); yield return new TestCaseData( set, new Action((points, p) => points.DikeToeAtPolder = p), - RiskeerCommonDataResources.CharacteristicPoint_DikeToeAtPolder).SetName(name); + "Teen dijk binnenwaarts").SetName(name); name = "Moved SurfaceLevelInside"; set = CreateCompleteCharacteristicPointSet(name); yield return new TestCaseData( set, new Action((points, p) => points.SurfaceLevelInside = p), - RiskeerCommonDataResources.CharacteristicPoint_SurfaceLevelInside).SetName(name); + "Maaiveld binnenwaarts").SetName(name); } } Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs =================================================================== diff -u -rd1b677c4bef119458dc4ec64058c68dd508578e3 -r2572d3096fb3d683eb18fcaf490791ea81d64ece --- Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs (.../TestWaveConditionsCalculation.cs) (revision d1b677c4bef119458dc4ec64058c68dd508578e3) +++ Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs (.../TestWaveConditionsCalculation.cs) (revision 2572d3096fb3d683eb18fcaf490791ea81d64ece) @@ -44,7 +44,7 @@ /// is default set to false. public TestWaveConditionsCalculation(T input, bool hasOutput = false) { - Name = RiskeerCommonDataResources.Calculation_DefaultName; + Name = "Nieuwe berekening"; InputParameters = input; HasOutput = hasOutput; }