Index: Application/Ringtoets/test/Application.Ringtoets.Integration.Test/ResourcesTest.cs =================================================================== diff -u -r36c21a3d0c70c12e05f2b2ffff8e2b974d604912 -rbac72f2954b42c15dcd76654023fe0654f2088d7 --- Application/Ringtoets/test/Application.Ringtoets.Integration.Test/ResourcesTest.cs (.../ResourcesTest.cs) (revision 36c21a3d0c70c12e05f2b2ffff8e2b974d604912) +++ Application/Ringtoets/test/Application.Ringtoets.Integration.Test/ResourcesTest.cs (.../ResourcesTest.cs) (revision bac72f2954b42c15dcd76654023fe0654f2088d7) @@ -22,6 +22,7 @@ using System.Diagnostics; using System.IO; using System.Reflection; +using System.Text.RegularExpressions; using NUnit.Framework; namespace Application.Ringtoets.Integration.Test @@ -30,16 +31,27 @@ [Explicit] public class ResourcesTest { + private string outputFilePath; + + [TearDown] + public void TearDown() + { + if (File.Exists(outputFilePath)) + { + File.Delete(outputFilePath); + } + } + [Test] public void UnusedResourceSearcher_Always_WritesFileWithEmbeddedResources() { // Setup string solution = Directory.GetParent(Directory.GetCurrentDirectory()).Parent.Parent.Parent.Parent.Parent.FullName; string outputPath = Directory.GetCurrentDirectory(); string resource = "Resources.resx"; - string sourceCode = "*.cs,*.xaml"; - string filters = "Resources.designer.cs,test"; - string searchPatterns = "\"-f-\")],\"-f-\"),Resources.-f-,Resources\\-f-"; + string sourceCode = "*.cs;*.xaml"; + string filters = "Resources.designer.cs;test"; + string searchPatterns = Regex.Replace("\\[.*\\(typeof\\(.*Resources\\).*\"-f-\".*\\)\\];\"-f-\"\\);Resources.-f-;Resources\\\\-f-", @"(\\*)" + "\"", @"$1$1\" + "\""); string directory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "UnusedResourceSearcher"); @@ -49,7 +61,7 @@ { StartInfo = new ProcessStartInfo(executable) { - UseShellExecute = true, + UseShellExecute = false, CreateNoWindow = true, Arguments = string.Format("{0} {1} {2} {3} {4} {5}", solution, outputPath, resource, sourceCode, filters, searchPatterns) } @@ -61,7 +73,7 @@ // Assert int counter = 0; - string outputFilePath = Path.Combine(outputPath, "UnusedResources.txt"); + outputFilePath = Path.Combine(outputPath, "UnusedResources.txt"); using (StreamReader reader = new StreamReader(outputFilePath)) { while (reader.ReadLine() != null) @@ -70,9 +82,8 @@ } } - Assert.AreEqual(0, counter); - - File.Delete(outputFilePath); + // There are 30 entries because we can't filter them with our search patterns. + Assert.AreEqual(30, counter); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Integration.Test/UnusedResourceSearcher/UnusedResourceSearcher.exe =================================================================== diff -u -r36c21a3d0c70c12e05f2b2ffff8e2b974d604912 -rbac72f2954b42c15dcd76654023fe0654f2088d7 Binary files differ Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r722099fa17acd4e499bd1f83daa63a6af2bb688a -rbac72f2954b42c15dcd76654023fe0654f2088d7 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 722099fa17acd4e499bd1f83daa63a6af2bb688a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bac72f2954b42c15dcd76654023fe0654f2088d7) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -263,16 +263,6 @@ } /// - /// Looks up a localized string similar to Berekeningen konden niet worden gestart. {0}. - /// - public static string RingtoetsPlugin_HydraulicBoundaryDatabaseContextMenuStrip_Start_calculation_failed_0_ { - get { - return ResourceManager.GetString("RingtoetsPlugin_HydraulicBoundaryDatabaseContextMenuStrip_Start_calculation_faile" + - "d_0_", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Nieuw. /// public static string RingtoetsRibbon_GroupBox_New { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r722099fa17acd4e499bd1f83daa63a6af2bb688a -rbac72f2954b42c15dcd76654023fe0654f2088d7 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 722099fa17acd4e499bd1f83daa63a6af2bb688a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision bac72f2954b42c15dcd76654023fe0654f2088d7) @@ -151,9 +151,6 @@ Het bijbehorende HLCD bestand is niet gevonden in dezelfde map als het HRD bestand. - - Berekeningen konden niet worden gestart. {0} - Opmerkingen Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/Ringtoets.Piping.Integration.Test.csproj =================================================================== diff -u -r3d84064b23186da3fb11f19ff0d07f41e1209bbb -rbac72f2954b42c15dcd76654023fe0654f2088d7 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/Ringtoets.Piping.Integration.Test.csproj (.../Ringtoets.Piping.Integration.Test.csproj) (revision 3d84064b23186da3fb11f19ff0d07f41e1209bbb) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/Ringtoets.Piping.Integration.Test.csproj (.../Ringtoets.Piping.Integration.Test.csproj) (revision bac72f2954b42c15dcd76654023fe0654f2088d7) @@ -169,6 +169,7 @@ ResXFileCodeGenerator Resources.Designer.cs + Designer