fix #19 boolean arguments are not managed properly

interappconnectorproject · Dec 14, 2023 · 1c95626 · 1c95626
1 parent 71686a8
commit 1c95626
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 9 deletions.
diff --git a/src/InterAppConnector/CommandManager.cs b/src/InterAppConnector/CommandManager.cs
@@ -204,8 +204,17 @@ where method.GetCustomAttribute<CustomInputStringAttribute>() != null
                                 }
                                 else
                                 {
-                                    throw new ArgumentException();
-                                }
+                                    if (parameterType == typeof(bool))
+                                    {
+                                        _arguments[selectedCommand].Arguments[findArgument.Name].Value = Convert.ChangeType(item.Value, parameterType);
+                                        _parameterObject[selectedCommand].GetType().GetProperty(findArgument.OriginalPropertyName)!.SetValue(_parameterObject[selectedCommand], Convert.ChangeType(item.Value, parameterType));
+                                        _arguments[selectedCommand].Arguments[findArgument.Name].IsSetByUser = true;
+                                    }
+                                    else
+                                    {
+                                        throw new ArgumentException();
+                                    }
+                                }                               
                             }
                             catch (Exception exc)
                             {

diff --git a/src/InterAppConnector/CommandOutput.cs b/src/InterAppConnector/CommandOutput.cs
@@ -1,5 +1,4 @@
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using InterAppConnector.DataModels;
 using InterAppConnector.Enumerations;
 using InterAppConnector.Exceptions;

diff --git a/src/InterAppConnector/CommandUtil.cs b/src/InterAppConnector/CommandUtil.cs
@@ -2,9 +2,7 @@
 using InterAppConnector.DataModels;
 using InterAppConnector.Enumerations;
 using InterAppConnector.Interfaces;
-using System;
 using System.Collections;
-using System.Diagnostics;
 using System.Reflection;
 using System.Text;
 

diff --git a/tests/InterAppConnector.Test.Library/CommandManagerTest.cs b/tests/InterAppConnector.Test.Library/CommandManagerTest.cs
@@ -376,10 +376,6 @@ public void SetArgument_WithAnotherValidatorCustomInputStringAndValueNotInRange_
 
         [TestCase("abcd123a")]
         [TestCase("ab")]
-        //
-        [TestCase("")]
-        [TestCase("abcdd123")]
-        //
         public void SetArgument_ParameterWithWrongCustomString_ReturnArgumentException(string value)
         {
             Argument arguments = Argument.Parse(new[] { "setargument", "-plate", value }, "-");

diff --git a/tests/InterAppConnector.Test.Library/Commands/BooleanCommand.cs b/tests/InterAppConnector.Test.Library/Commands/BooleanCommand.cs
@@ -0,0 +1,15 @@
+using InterAppConnector.Attributes;
+using InterAppConnector.Interfaces;
+using InterAppConnector.Test.Library.DataModels;
+
+namespace InterAppConnector.Test.Library.Commands
+{
+    [Command("booleancommand")]
+    public class BooleanCommand : ICommand<DataModelWithBoolean>
+    {
+        public string Main(DataModelWithBoolean arguments)
+        {
+            return CommandOutput.Ok(arguments);
+        }
+    }
+}
diff --git a/tests/InterAppConnector.Test.Library/DataModels/DataModelWithBoolean.cs b/tests/InterAppConnector.Test.Library/DataModels/DataModelWithBoolean.cs
@@ -0,0 +1,8 @@
+namespace InterAppConnector.Test.Library.DataModels
+{
+    public class DataModelWithBoolean
+    {
+        public bool MandatorySwitch { get; set; }
+        public int Number { get; set; }
+    }
+}
diff --git a/tests/InterAppConnector.Test.Library/InterAppCommunicationTest.cs b/tests/InterAppConnector.Test.Library/InterAppCommunicationTest.cs
@@ -36,6 +36,29 @@ public void ExecuteAsBatch_ExecuteBatchTestCommandWithSuccessfulMessage_ReturnSu
             Assert.That(result.MessageStatus, Is.EqualTo(CommandExecutionMessageType.Success));
         }
 
+        [Test]
+        public void ExecuteAsBatch_ExecuteBatchTestCommandWithBooleanSet_ReturnSuccessfulMessage()
+        {
+            CommandManager manager = new CommandManager();
+            manager.AddCommand<BooleanCommand, DataModelWithBoolean>(true);
+            DataModelWithBoolean batchCommandDataModel = new DataModelWithBoolean
+            {
+                MandatorySwitch = true,
+                Number = 50
+            };
+            dynamic parameters = new ExpandoObject();
+            parameters.MandatorySwitch = batchCommandDataModel.MandatorySwitch;
+            parameters.Number = 50;
+
+            InterAppCommunication connector = new InterAppCommunication(manager);
+            CommandResult<DataModelWithBoolean> result = connector.ExecuteAsBatch<DataModelWithBoolean>("booleancommand", parameters);
+
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.MessageStatus, Is.EqualTo(CommandExecutionMessageType.Success));
+            Assert.That(result.Message.MandatorySwitch, Is.True);
+            Assert.That(result.Message.Number, Is.EqualTo(50));
+        }
+
         [Test]
         public void ExecuteAsBatch_ExecuteBatchTestCommandWithWarningMessage_ReturnWarningMessage()
         {
@@ -320,6 +343,23 @@ public void ExecuteAsInteractiveCLI_WithMissingValueTypeArguments_ReturnMissingA
             Assert.That(Environment.ExitCode, Is.EqualTo(3));
         }
 
+        [Test]
+        public void ExecuteAsInteractiveCLI_WithBooleanValue_ReturnNoErrorMessage()
+        {
+            CommandManager command = new CommandManager();
+            command.AddCommand<BooleanCommand, DataModelWithBoolean>();
+            string[] arguments = "booleancommand -mandatoryswitch -number 50".Split(" ");
+
+            Action connectorAction = () =>
+            {
+                InterAppCommunication connector = new InterAppCommunication(command);
+                connector.ExecuteAsInteractiveCLI(arguments);
+            };
+
+            Assert.That(connectorAction, Throws.Nothing);
+            Assert.That(Environment.ExitCode, Is.EqualTo(0));
+        }
+
         [Test]
         public void ExecuteAsInteractiveCLI_WithMissingOptionalValueTypeArguments_ReturnValue()
         {