Fix test and bug found when doint tests :)

net-daemon · May 7, 2024 · fe15b06 · fe15b06
1 parent e61dee2
commit fe15b06
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 1 deletion.
diff --git a/src/HassModel/NetDaemon.HassModel.CodeGenerator/CodeGeneration/ServicesGenerator.cs b/src/HassModel/NetDaemon.HassModel.CodeGenerator/CodeGeneration/ServicesGenerator.cs
@@ -97,7 +97,14 @@ private static IEnumerable<MemberDeclarationSyntax> GenerateServiceMethod(string
 
         if (serviceArguments is null)
         {
-            targetParam = "object? data";
+            if (service.Target is not null)
+            {
+                targetParam = $"{targetParam}, object? data = null";
+            }
+            else
+            {
+                targetParam = "object? data = null";
+            }
             targetArg = "null, data";
             // method without arguments
             yield return ParseMemberDeclaration($$"""

diff --git a/src/HassModel/NetDaemon.HassModel.Tests/CodeGenerator/ServicesGeneratorTest.cs b/src/HassModel/NetDaemon.HassModel.Tests/CodeGenerator/ServicesGeneratorTest.cs
@@ -82,6 +82,61 @@ public void Run(IHaContext ha)
         CodeGenTestHelper.AssertCodeCompiles(code.ToString(), appCode);
     }
 
+    [Fact]
+    public void TestServicesGenerationWithAndWithoutProvidingDataForServicesWithoutTargetOrFields()
+    {
+        var readOnlyCollection = new HassState[] {
+            new() { EntityId = "script.script1" },
+        };
+
+        var hassServiceDomains = new HassServiceDomain[] {
+            new() {
+                Domain = "script",
+                Services = [
+                    new() {
+                        Service = "turn_off",
+                        Target = new TargetSelector
+                        {
+                            Entity = [new EntitySelector { Domain = ["script"] }]
+                        }
+
+                    },
+                ]
+            }
+        };
+
+        // Act:
+        var code = CodeGenTestHelper.GenerateCompilationUnit(_settings, readOnlyCollection, hassServiceDomains);
+
+        var appCode = """
+                    using NetDaemon.HassModel;
+                    using NetDaemon.HassModel.Entities;
+                    using RootNameSpace;
+
+                    public class Root
+                    {
+                        public void Run(IHaContext ha)
+                        {
+                            var s = new RootNameSpace.Services(ha);
+
+                            s.Script.TurnOff(new ServiceTarget());
+                            s.Script.TurnOff(new ServiceTarget(), new { });
+
+                            ScriptEntity script = new RootNameSpace.ScriptEntity(ha, "script.testScript");
+
+                            script.TurnOff(new { });
+                            script.TurnOff();
+
+                            IScriptEntityCore scriptCore = script;
+                            scriptCore.TurnOff();
+                            scriptCore.TurnOff(new { });
+                        }
+                    }
+                    """;
+
+        CodeGenTestHelper.AssertCodeCompiles(code.ToString(), appCode);
+    }
+
     [Fact]
     public void TestServiceWithoutAnyTargetEntity_ExtensionMethodSkipped()
     {