Added support for Magnets (landing gear) and added missing tests

MerlinofMines · MerlinofMines · commit d9ade6db5115 · 2021-12-27T15:08:35.000-07:00
diff --git a/EasyCommands.Tests/EasyCommands.Tests.csproj b/EasyCommands.Tests/EasyCommands.Tests.csproj
@@ -131,6 +131,8 @@
     <Compile Include="ParameterParsingTests\TransferCommandProcessorTests.cs" />
     <Compile Include="ScriptTests\BlockHandlerTests\AirVentBlockTests.cs" />
     <Compile Include="ScriptTests\BlockHandlerTests\BeaconBlockTests.cs" />
+    <Compile Include="ScriptTests\BlockHandlerTests\MagnetBlockTests.cs" />
+    <Compile Include="ScriptTests\BlockHandlerTests\LandingGearBlockTests.cs" />
     <Compile Include="ScriptTests\BlockHandlerTests\ThrustBlockTests.cs" />
     <Compile Include="ScriptTests\BlockHandlerTests\ProgramBlockTests.cs" />
     <Compile Include="ScriptTests\BlockHandlerTests\DoorBlockTests.cs" />
diff --git a/EasyCommands.Tests/ScriptTests/BlockHandlerTests/LandingGearBlockTests.cs b/EasyCommands.Tests/ScriptTests/BlockHandlerTests/LandingGearBlockTests.cs
@@ -0,0 +1,133 @@
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using Moq;
+using Sandbox.ModAPI.Ingame;
+using SpaceEngineers.Game.ModAPI.Ingame;
+
+namespace EasyCommands.Tests.ScriptTests {
+    [TestClass]
+    public class LandingGearBlockTests {
+        [TestMethod]
+        public void TurnOnTheLandingGear() {
+            using (ScriptTest test = new ScriptTest(@"turn on the ""test landing gear""")) {
+                Mock<IMyLandingGear> mockLandingGear = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test landing gear", mockLandingGear);
+
+                test.RunUntilDone();
+
+                mockLandingGear.VerifySet(b => b.Enabled = true);
+            }
+        }
+
+        [TestMethod]
+        public void TurnOffTheLandingGear() {
+            using (ScriptTest test = new ScriptTest(@"turn off the ""test landing gear""")) {
+                Mock<IMyLandingGear> mockLandingGear = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test landing gear", mockLandingGear);
+
+                test.RunUntilDone();
+
+                mockLandingGear.VerifySet(b => b.Enabled = false);
+            }
+        }
+
+        [TestMethod]
+        public void IsTheLandingGearConnected() {
+            using (ScriptTest test = new ScriptTest(@"Print ""Connected: "" + ""test landing gear"" is connected")) {
+                Mock<IMyLandingGear> mockLandingGear = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test landing gear", mockLandingGear);
+                mockLandingGear.Setup(b => b.IsLocked).Returns(true);
+
+                test.RunUntilDone();
+
+                Assert.AreEqual("Connected: True", test.Logger[0]);
+            }
+        }
+
+        [TestMethod]
+        public void IsTheLandingGearLocked() {
+            using (ScriptTest test = new ScriptTest(@"Print ""Locked: "" + ""test landing gear"" is locked")) {
+                Mock<IMyLandingGear> mockLandingGear = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test landing gear", mockLandingGear);
+                mockLandingGear.Setup(b => b.IsLocked).Returns(true);
+
+                test.RunUntilDone();
+
+                Assert.AreEqual("Locked: True", test.Logger[0]);
+            }
+        }
+
+        [TestMethod]
+        public void ConnectTheLandingGear() {
+            using (ScriptTest test = new ScriptTest(@"connect the ""test landing gear""")) {
+                Mock<IMyLandingGear> mockLandingGear = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test landing gear", mockLandingGear);
+
+                test.RunUntilDone();
+
+                mockLandingGear.Verify(b => b.Lock());
+            }
+        }
+
+        [TestMethod]
+        public void LockTheLandingGear() {
+            using (ScriptTest test = new ScriptTest(@"lock the ""test landing gear""")) {
+                Mock<IMyLandingGear> mockLandingGear = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test landing gear", mockLandingGear);
+
+                test.RunUntilDone();
+
+                mockLandingGear.Verify(b => b.Lock());
+            }
+        }
+
+        [TestMethod]
+        public void DisconnectTheLandingGear() {
+            using (ScriptTest test = new ScriptTest(@"disconnect the ""test landing gear""")) {
+                Mock<IMyLandingGear> mockLandingGear = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test landing gear", mockLandingGear);
+
+                test.RunUntilDone();
+
+                mockLandingGear.Verify(b => b.Unlock());
+            }
+        }
+
+        [TestMethod]
+        public void UnlockTheLandingGear() {
+            using (ScriptTest test = new ScriptTest(@"unlock the ""test landing gear""")) {
+                Mock<IMyLandingGear> mockLandingGear = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test landing gear", mockLandingGear);
+
+                test.RunUntilDone();
+
+                mockLandingGear.Verify(b => b.Unlock());
+            }
+        }
+
+        [TestMethod]
+        public void IsLandingGearOnAuto() {
+            using (ScriptTest test = new ScriptTest(@"Print ""Auto Lock: "" + the ""test landing gear"" is on auto")) {
+                Mock<IMyLandingGear> mockLandingGear = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test landing gear", mockLandingGear);
+                mockLandingGear.Setup(b => b.AutoLock).Returns(true);
+
+                test.RunUntilDone();
+
+                Assert.AreEqual("Auto Lock: True", test.Logger[0]);
+            }
+        }
+
+        [TestMethod]
+        public void SetLandingGearToAuto() {
+            using (ScriptTest test = new ScriptTest(@"set the ""test landing gear"" to auto")) {
+                Mock<IMyLandingGear> mockLandingGear = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test landing gear", mockLandingGear);
+
+                test.RunUntilDone();
+
+                mockLandingGear.VerifySet(b => b.AutoLock = true);
+            }
+        }
+    }
+}
diff --git a/EasyCommands.Tests/ScriptTests/BlockHandlerTests/MagnetBlockTests.cs b/EasyCommands.Tests/ScriptTests/BlockHandlerTests/MagnetBlockTests.cs
@@ -0,0 +1,133 @@
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using Moq;
+using Sandbox.ModAPI.Ingame;
+using SpaceEngineers.Game.ModAPI.Ingame;
+
+namespace EasyCommands.Tests.ScriptTests {
+    [TestClass]
+    public class MagnetBlockTests {
+        [TestMethod]
+        public void TurnOnTheMagnet() {
+            using (ScriptTest test = new ScriptTest(@"turn on the ""test magnet""")) {
+                Mock<IMyLandingGear> mockMagnet = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test magnet", mockMagnet);
+
+                test.RunUntilDone();
+
+                mockMagnet.VerifySet(b => b.Enabled = true);
+            }
+        }
+
+        [TestMethod]
+        public void TurnOffTheMagnet() {
+            using (ScriptTest test = new ScriptTest(@"turn off the ""test magnet""")) {
+                Mock<IMyLandingGear> mockMagnet = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test magnet", mockMagnet);
+
+                test.RunUntilDone();
+
+                mockMagnet.VerifySet(b => b.Enabled = false);
+            }
+        }
+
+        [TestMethod]
+        public void IsTheMagnetConnected() {
+            using (ScriptTest test = new ScriptTest(@"Print ""Connected: "" + ""test magnet"" is connected")) {
+                Mock<IMyLandingGear> mockMagnet = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test magnet", mockMagnet);
+                mockMagnet.Setup(b => b.IsLocked).Returns(true);
+
+                test.RunUntilDone();
+
+                Assert.AreEqual("Connected: True", test.Logger[0]);
+            }
+        }
+
+        [TestMethod]
+        public void IsTheMagnetLocked() {
+            using (ScriptTest test = new ScriptTest(@"Print ""Locked: "" + ""test magnet"" is locked")) {
+                Mock<IMyLandingGear> mockMagnet = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test magnet", mockMagnet);
+                mockMagnet.Setup(b => b.IsLocked).Returns(true);
+
+                test.RunUntilDone();
+
+                Assert.AreEqual("Locked: True", test.Logger[0]);
+            }
+        }
+
+        [TestMethod]
+        public void ConnectTheMagnet() {
+            using (ScriptTest test = new ScriptTest(@"connect the ""test magnet""")) {
+                Mock<IMyLandingGear> mockMagnet = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test magnet", mockMagnet);
+
+                test.RunUntilDone();
+
+                mockMagnet.Verify(b => b.Lock());
+            }
+        }
+
+        [TestMethod]
+        public void LockTheMagnet() {
+            using (ScriptTest test = new ScriptTest(@"lock the ""test magnet""")) {
+                Mock<IMyLandingGear> mockMagnet = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test magnet", mockMagnet);
+
+                test.RunUntilDone();
+
+                mockMagnet.Verify(b => b.Lock());
+            }
+        }
+
+        [TestMethod]
+        public void DisconnectTheMagnet() {
+            using (ScriptTest test = new ScriptTest(@"disconnect the ""test magnet""")) {
+                Mock<IMyLandingGear> mockMagnet = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test magnet", mockMagnet);
+
+                test.RunUntilDone();
+
+                mockMagnet.Verify(b => b.Unlock());
+            }
+        }
+
+        [TestMethod]
+        public void UnlockTheMagnet() {
+            using (ScriptTest test = new ScriptTest(@"unlock the ""test magnet""")) {
+                Mock<IMyLandingGear> mockMagnet = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test magnet", mockMagnet);
+
+                test.RunUntilDone();
+
+                mockMagnet.Verify(b => b.Unlock());
+            }
+        }
+
+        [TestMethod]
+        public void IsMagnetOnAuto() {
+            using (ScriptTest test = new ScriptTest(@"Print ""Auto Lock: "" + the ""test magnet"" is on auto")) {
+                Mock<IMyLandingGear> mockMagnet = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test magnet", mockMagnet);
+                mockMagnet.Setup(b => b.AutoLock).Returns(true);
+
+                test.RunUntilDone();
+
+                Assert.AreEqual("Auto Lock: True", test.Logger[0]);
+            }
+        }
+
+        [TestMethod]
+        public void SetMagnetToAuto() {
+            using (ScriptTest test = new ScriptTest(@"set the ""test magnet"" to auto")) {
+                Mock<IMyLandingGear> mockMagnet = new Mock<IMyLandingGear>();
+                test.MockBlocksOfType("test magnet", mockMagnet);
+
+                test.RunUntilDone();
+
+                mockMagnet.VerifySet(b => b.AutoLock = true);
+            }
+        }
+    }
+}
diff --git a/EasyCommands/BlockHandlers/BlockHandlers.cs b/EasyCommands/BlockHandlers/BlockHandlers.cs
@@ -29,7 +29,7 @@ public static class BlockHandlerRegistry {
                 { Block.DRILL, new FunctionalBlockHandler<IMyShipDrill>() },
                 { Block.EJECTOR, new EjectorBlockHandler() },
                 { Block.ENGINE, new EngineBlockHandler<IMyPowerProducer>("Engine") },
-                { Block.GEAR, new LandingGearHandler() },
+                { Block.MAGNET, new LandingGearHandler() },
                 { Block.GENERATOR, new GasGeneratorHandler()},
                 { Block.GRAVITY_GENERATOR, new GravityGeneratorBlockHandler() },
                 { Block.GRAVITY_SPHERE, new SphericalGravityGeneratorBlockHandler() },
diff --git a/EasyCommands/BlockHandlers/LandingGearHandlers.cs b/EasyCommands/BlockHandlers/LandingGearHandlers.cs
@@ -25,7 +25,6 @@ public LandingGearHandler() {
                 var lockHandler = BooleanHandler(b => b.IsLocked, (b, v) => { if (v) b.Lock(); else b.Unlock(); });
                 AddPropertyHandler(Property.LOCKED, lockHandler);
                 AddPropertyHandler(Property.CONNECTED, lockHandler);
-                defaultPropertiesByPrimitive[Return.BOOLEAN] = Property.LOCKED;
             }
         }
     }
diff --git a/EasyCommands/CommandParsers/ParameterParsers.cs b/EasyCommands/CommandParsers/ParameterParsers.cs
@@ -243,7 +243,7 @@ public void InitializeParsers() {
             AddBlockWords(Words("turret"), Block.TURRET);
             AddBlockWords(Words("generator"), Block.GENERATOR);
             AddBlockWords(Words("tank"), Block.TANK);
-            AddBlockWords(Words("gear"), Block.GEAR);
+            AddBlockWords(Words("magnet", "gear"), Block.MAGNET);
             AddBlockWords(Words("battery"), Words("batteries"), Block.BATTERY);
             AddBlockWords(Words("chute", "parachute"), Block.PARACHUTE);
             AddBlockWords(Words("wheel"), Words("wheels", "suspension"), Block.SUSPENSION);
diff --git a/EasyCommands/Common/Types.cs b/EasyCommands/Common/Types.cs
@@ -23,7 +23,7 @@ partial class Program {
         public enum LogLevel { DEBUG, INFO, SCRIPT_ONLY }
         #endregion
 
-        public enum Block { PISTON, ROTOR, PROGRAM, TIMER, LIGHT, PROJECTOR, MERGE, CONNECTOR, WELDER, GRINDER, DOOR, DISPLAY, SOUND, CAMERA, SENSOR, BEACON, ANTENNA, COCKPIT, REMOTE, THRUSTER, AIRVENT, GUN, GENERATOR, TANK, GEAR, BATTERY, PARACHUTE, SUSPENSION, DETECTOR, DRILL, ENGINE, SORTER, TURRET, GYROSCOPE, GRAVITY_GENERATOR, GRAVITY_SPHERE, CARGO, WARHEAD, ASSEMBLER, EJECTOR, COLLECTOR, DECOY, HINGE, JUMPDRIVE, LASER_ANTENNA, TERMINAL, REFINERY, REACTOR, TURBINE, SOLAR_PANEL }
+        public enum Block { PISTON, ROTOR, PROGRAM, TIMER, LIGHT, PROJECTOR, MERGE, CONNECTOR, WELDER, GRINDER, DOOR, DISPLAY, SOUND, CAMERA, SENSOR, BEACON, ANTENNA, COCKPIT, REMOTE, THRUSTER, AIRVENT, GUN, GENERATOR, TANK, MAGNET, BATTERY, PARACHUTE, SUSPENSION, DETECTOR, DRILL, ENGINE, SORTER, TURRET, GYROSCOPE, GRAVITY_GENERATOR, GRAVITY_SPHERE, CARGO, WARHEAD, ASSEMBLER, EJECTOR, COLLECTOR, DECOY, HINGE, JUMPDRIVE, LASER_ANTENNA, TERMINAL, REFINERY, REACTOR, TURBINE, SOLAR_PANEL }
         public enum Property { ENABLE, POWER, CONNECTED, LOCKED, COMPLETE, OPEN, TRIGGER, SUPPLY, AUTO, OVERRIDE, LEVEL, ANGLE, VELOCITY, RATIO, FONT, VOLUME, RANGE, INPUT, ROLL_INPUT, NAME, RUN, TEXT, COLOR, BACKGROUND, MEDIA, MEDIA_LIST, INTERVAL, OFFSET, INTENSITY, FALLOFF, POSITION, DIRECTION, TARGET, WAYPOINTS, TARGET_VELOCITY, STRENGTH, COUNTDOWN, SILENCE, SHOW, PROPERTIES, ACTIONS, NAMES }
         public enum ValueProperty { AMOUNT, CREATE, DESTROY, PROPERTY, ACTION };
         public enum Direction { UP, DOWN, LEFT, RIGHT, FORWARD, BACKWARD, CLOCKWISE, COUNTERCLOCKWISE, NONE }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public LandingGearHandler() {`
`25`	`25`	`var lockHandler = BooleanHandler(b => b.IsLocked, (b, v) => { if (v) b.Lock(); else b.Unlock(); });`
`26`	`26`	`AddPropertyHandler(Property.LOCKED, lockHandler);`
`27`	`27`	`AddPropertyHandler(Property.CONNECTED, lockHandler);`
`28`		`- defaultPropertiesByPrimitive[Return.BOOLEAN] = Property.LOCKED;`
`29`	`28`	`}`
`30`	`29`	`}`
`31`	`30`	`}`