NK-100 Разделитель в меню плагина

- Запрет на два разделителя подряд - Запрет на разделитель в первом пункте меню - Тесты на функции
schadin · Nov 23, 2016 · 2f2d208 · 2f2d208
1 parent 8d5797e
commit 2f2d208
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 0 deletions.
diff --git a/NppKate/Common/CommandManager.cs b/NppKate/Common/CommandManager.cs
@@ -35,6 +35,7 @@ public class CommandManager : ICommandManager
     {
         const int DefaultCapacity = 5;
         private volatile int HiddenIndex = -1;
+        private volatile bool _LastItemIsSeparator = true;
 
         private Dictionary<string, List<CommandMenuItem>> _commandIndexes;
 
@@ -69,6 +70,9 @@ public string GetNameByIndex(string module, int commandIndex)
 
         public int RegisterCommand(string module, string name, Action commandHandler = null, bool isCheckedWithStart = false, ShortcutKey? shortcut = null)
         {
+            if (_LastItemIsSeparator && "-".Equals(name))
+                return 0;
+
             if (!_commandIndexes.ContainsKey(module))
             {
                 _commandIndexes.Add(module, new List<CommandMenuItem>(DefaultCapacity));
@@ -86,6 +90,7 @@ public int RegisterCommand(string module, string name, Action commandHandler = n
                 Name = name,
                 CommandIndex = cmdIndex
             });
+            _LastItemIsSeparator = "-".Equals(name);
             return cmdIndex;
         }
 

diff --git a/NppKate/Common/IModule.cs b/NppKate/Common/IModule.cs
@@ -25,12 +25,16 @@ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+using System;
+
 namespace NppKate.Common
 {
     public interface IModule
     {
         void Init(IModuleManager manager);
         void Final();
+
+        [Obsolete("Property is deprecated", false)]
         bool IsNeedRun { get; }
     }
 }
diff --git a/Test/NppKateTest/CommandManager/CmdManagerTest.cs b/Test/NppKateTest/CommandManager/CmdManagerTest.cs
@@ -0,0 +1,56 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NppKate.Common;
+
+namespace NppKateTest.CommandManager
+{
+    [TestClass]
+    public class CmdManagerTest
+    {
+        const string Module = "Test";
+        const string Module2 = "Test2";
+        [TestMethod]
+        public void CheckDoubleSeparator()
+        {
+            var cmdManager = new NppKate.Common.CommandManager();
+            cmdManager.RegisterCommand(Module, "1");
+            cmdManager.RegisterSeparator(Module);
+            cmdManager.RegisterSeparator(Module);
+
+            Assert.AreEqual<int>(cmdManager.GetCommandsByModule(Module).Count, 2);
+        }
+
+        [TestMethod]
+        public void CheckFirstSeparator()
+        {
+            var cmdManager = new NppKate.Common.CommandManager();
+            cmdManager.RegisterSeparator(Module);
+
+            Assert.AreEqual<int>(cmdManager.GetCommandsByModule(Module).Count, 0);
+        }
+
+        private void AddCommands(ICommandManager cmd, int count, string module)
+        {
+            for (int i = 0; i < count; i++)
+            {
+                cmd.RegisterCommand(module, $"command_{i}");
+            }
+        }
+
+        [TestMethod]
+        public void AddOneCommand()
+        {
+            var cmdManager = new NppKate.Common.CommandManager();
+            AddCommands(cmdManager, 1, Module);
+            Assert.AreEqual<int>(cmdManager.GetCommandsByModule(Module).Count, 1);
+        }
+        [TestMethod]
+        public void AddManyCommand()
+        {
+            var cmdManager = new NppKate.Common.CommandManager();
+            var count = 10;
+            AddCommands(cmdManager, count, Module);
+            Assert.AreEqual<int>(cmdManager.GetCommandsByModule(Module).Count, count);
+        }
+    }
+}
diff --git a/test/NppKateTest/NppKateTest.csproj b/test/NppKateTest/NppKateTest.csproj
@@ -74,6 +74,7 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
+    <Compile Include="CommandManager\CmdManagerTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SnippetTest\SnippetTest.cs" />
     <Compile Include="SnippetTest\SnippetTextBuilderTest.cs" />