Fix unit tests + include new jsons

Author: vladzaharia

src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj

@@ -227,6 +227,8 @@
     <None Include="NLog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Properties\layoutDefinition_ergodox.json" />
+    <None Include="Properties\layoutDefinition_moonlander.json" />
     <None Include="Properties\Settings.settings">
       <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs

@@ -485,6 +485,9 @@ private string GetKeyBoardDescription(string keyboardGeometry, string revisionMo
                 case "planck-ez":
                     keyboardDescription = "Planck EZ ";
 
+                    break;
+                case "moonlander":
+                    keyboardDescription = "Moonlander Mk1 ";
                     break;
                 default:
                     keyboardDescription = $"{keyboardGeometry} ";

src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs

@@ -142,7 +142,7 @@ public void LoadCompleteLayout(int numberOfKey, int numberOfLayer, bool noLayout
 
             var mockWindowService = new Mock<IWindowService>();
             var mockLayoutService = new Mock<ILayoutService>();
-            mockLayoutService.Setup(l => l.GetLayoutTemplate("")).ReturnsAsync(layoutTemplate).Verifiable();
+            mockLayoutService.Setup(l => l.GetLayoutTemplate(null)).ReturnsAsync(layoutTemplate).Verifiable();
             var mockSettingsService = new Mock<ISettingsService>();
             mockSettingsService.SetupProperty(s => s.EZLayout, keyboardLayout);
 
@@ -151,7 +151,7 @@ public void LoadCompleteLayout(int numberOfKey, int numberOfLayer, bool noLayout
 
             //Assert
             Assert.Equal(noLayoutAvailable, displayLayoutViewModel.NoLayoutAvailable);
-            mockLayoutService.Verify(l => l.GetLayoutTemplate(""), Times.AtMost(numberOfLayer));
+            mockLayoutService.Verify(l => l.GetLayoutTemplate(null), Times.AtMost(numberOfLayer));
             Assert.Equal(numberOfKey, displayLayoutViewModel.CurrentLayoutTemplate.Count);
         }
 
@@ -171,7 +171,7 @@ public void NextLayerCommand_CanExecute(int layerNumber, bool expectedCanExecute
             }
 
             var mockLayoutService = new Mock<ILayoutService>();
-            mockLayoutService.Setup(l => l.GetLayoutTemplate("")).ReturnsAsync(layoutTemplate);
+            mockLayoutService.Setup(l => l.GetLayoutTemplate(null)).ReturnsAsync(layoutTemplate);
             var mockWindowService = new Mock<IWindowService>();
             var mockSettingsService = new Mock<ISettingsService>();
             mockSettingsService.SetupProperty(s => s.EZLayout, keyboardLayout);
@@ -252,7 +252,7 @@ public void NextLayerCommand_Execute(int layerNumber, int nextLayerHit, int expe
             }
 
             var mockLayoutService = new Mock<ILayoutService>();
-            mockLayoutService.Setup(l => l.GetLayoutTemplate("")).ReturnsAsync(layoutTemplate);
+            mockLayoutService.Setup(l => l.GetLayoutTemplate(null)).ReturnsAsync(layoutTemplate);
             var mockWindowService = new Mock<IWindowService>();
             var mockSettingsService = new Mock<ISettingsService>();
             mockSettingsService.SetupProperty(s => s.EZLayout, keyboardLayout);