Wrong default path after opening solution in the debug environment #62

- fixes #62 - Cleanup code - only unimportant changes - Fixed some problems related to: Removed dependency of the CAS.UA.Model.Designer.Wrappers on using System.Windows.Forms #38 - Improved some unit tests - Ready to make next pre-release. - UT 👍
mpostol · Nov 24, 2019 · a1a58e7 · a1a58e7
1 parent 3de6a36
commit a1a58e7
Show file tree

Hide file tree

Showing 16 changed files with 140 additions and 249 deletions.
diff --git a/ModelDesigner.Configuration.UnitTests/ServerSelectorUnitTest.cs b/ModelDesigner.Configuration.UnitTests/ServerSelectorUnitTest.cs
@@ -1,4 +1,4 @@
-///___________________________________________________________________________________
+//___________________________________________________________________________________
 //
 //  Copyright (C) 2019, Mariusz Postol LODZ POLAND.
 //
@@ -15,6 +15,7 @@ namespace CAS.CommServer.UA.ModelDesigner.Configuration.UnitTests
   [TestClass]
   public class ServerSelectorUnitTest
   {
+
     [TestMethod]
     public void ServerSelectorCreatorTest()
     {
@@ -67,6 +68,8 @@ public void EmptyServerDescriptorTest()
       _nss.ServerConfiguration = new ServerSelector.ServerDescriptor() { codebase = String.Empty, configuration = String.Empty };
       Assert.IsFalse(_ui.WarningCalled);
     }
+
+    #region Instrumentation
     private class OpenFileDialog4UnitTest : IFileDialog
     {
       private string m_DefaultExt;
@@ -220,9 +223,8 @@ public Func<IFolderBrowserDialog> OpenFolderBrowserDialogFunc
           return () => new FolderBrowserDialog();
         }
       }
-
       public Func<string, string, bool> MessageBoxShowWarningAskYN => throw new NotImplementedException();
-
+      public bool UseWaitCursor { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
       private void MessageBoxShowMethod(string text, string caption)
       {
         WarningCalled = true;
@@ -231,6 +233,7 @@ private void MessageBoxShowMethod(string text, string caption)
       }
 
     }
+    #endregion
 
   }
 }
diff --git a/ModelDesigner.Configuration.UnitTests/ServerWrapper_CommServer_UnitTest.cs b/ModelDesigner.Configuration.UnitTests/ServerWrapper_CommServer_UnitTest.cs
@@ -55,7 +55,8 @@ public void ServerWrapperConstructorTest()
       Assert.IsNotNull(_sw);
       Assert.IsTrue(_configurationChanged);
     }
-    //private instrumentation
+
+    #region instrumentation
     private class GraphicalUserInterface : IGraphicalUserInterface
     {
       public Action<string, string> MessageBoxShowError
@@ -100,9 +101,12 @@ public Func<IFileDialog> SaveFileDialogFuc
           throw new NotImplementedException();
         }
       }
-
       public Func<string, string, bool> MessageBoxShowWarningAskYN => throw new NotImplementedException();
+      public bool UseWaitCursor { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+
     }
     private const string _dataPath = "Plugin";
+    #endregion
+
   }
 }
diff --git a/ModelDesigner.Configuration.UnitTests/ServerWrapper_UAOOI_UnitTest.cs b/ModelDesigner.Configuration.UnitTests/ServerWrapper_UAOOI_UnitTest.cs
@@ -95,9 +95,11 @@ public Func<IFileDialog> SaveFileDialogFuc
           throw new NotImplementedException();
         }
       }
-
       public Func<string, string, bool> MessageBoxShowWarningAskYN => throw new NotImplementedException();
+      public bool UseWaitCursor { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+
     }
     public object AssemblyHelper { get; private set; }
   }
+
 }
diff --git a/ModelDesigner.Configuration/ServerSelector.cs b/ModelDesigner.Configuration/ServerSelector.cs
@@ -1,17 +1,8 @@
-//<summary>
-//  Title   : PropertyGrid wrapper to select a server plug-in.
-//  System  : Microsoft Visual C# .NET 2008
-//  $LastChangedDate$
-//  $Rev$
-//  $LastChangedBy$
-//  $URL$
-//  $Id$
+//___________________________________________________________________________________
 //
-//  Copyright (C)2009, CAS LODZ POLAND.
-//  TEL: +48 (42) 686 25 47
-//  mailto://[email protected]
-//  http://www.cas.eu
-//</summary>
+//  Copyright (C) 2019, Mariusz Postol LODZ POLAND.
+//
+//___________________________________________________________________________________
 
 using CAS.CommServer.UA.Common;
 using CAS.CommServer.UA.ModelDesigner.Configuration.Properties;

diff --git a/ModelDesigner.Configuration/UserInterface/GraphicalUserInterface.cs b/ModelDesigner.Configuration/UserInterface/GraphicalUserInterface.cs
@@ -87,7 +87,12 @@ public Func<IFolderBrowserDialog> OpenFolderBrowserDialogFunc
     /// </summary>
     /// <value>The message box show warning ask yn.</value>
     public Func<string, string, bool> MessageBoxShowWarningAskYN => (x, y) => MessageBox.Show(x, y, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes;
-    #endregion 
+    /// <summary>
+    /// Gets or sets whether the wait cursor is used for all open forms of the application.
+    /// </summary>
+    /// <value><c>true</c> is the wait cursor is used for all open forms; otherwise, <c>false</c>.</value>
+    public bool UseWaitCursor { get => Application.UseWaitCursor; set => Application.UseWaitCursor = value; }
+    #endregion
 
     #region private
     private class OpenFileDialogWrapper : FileDialogWrapper

diff --git a/ModelDesigner.Configuration/UserInterface/IGraphicalUserInterface.cs b/ModelDesigner.Configuration/UserInterface/IGraphicalUserInterface.cs
@@ -21,9 +21,9 @@ public interface IGraphicalUserInterface
     /// <value>The message box show action.</value>
     Action<string, string> MessageBoxShowWarning { get; }
     /// <summary>
-    /// Gets or sets the exclamation message box show delegate.
+    /// Gets the exclamation message box show delegate.
     /// </summary>
-    /// <value>The message box show.</value>
+    /// <value>The message box show action.</value>
     Action<string, string> MessageBoxShowExclamation { get; }
     /// <summary>
     /// Gets or sets the error message box show delegate.
@@ -50,5 +50,11 @@ public interface IGraphicalUserInterface
     /// </summary>
     /// <value>The message box show warning ask yn.</value>
     Func<string, string, bool> MessageBoxShowWarningAskYN { get; }
+    /// <summary>
+    /// Gets or sets whether the wait cursor is used for all open forms of the application.
+    /// </summary>
+    /// <value><c>true</c> is the wait cursor is used for all open forms; otherwise, <c>false</c>.</value>
+    bool UseWaitCursor { get; set; }
+
   }
 }
diff --git a/ModelDesigner.DesignStudio.UnitTest/Controls/BaseTreeNodeControlUnitTest.cs b/ModelDesigner.DesignStudio.UnitTest/Controls/BaseTreeNodeControlUnitTest.cs
@@ -12,6 +12,7 @@
 
 namespace CAS.CommServer.UA.ModelDesigner.DesignStudio.UnitTest.Controls
 {
+
   [TestClass]
   public class BaseTreeNodeControlUnitTest
   {

diff --git a/ModelDesigner.DesignStudio.UnitTest/IO/ConfigurationManagementUnitTest.cs b/ModelDesigner.DesignStudio.UnitTest/IO/ConfigurationManagementUnitTest.cs
@@ -57,13 +57,35 @@ public void DefaultFileNameTest()
       Assert.IsFalse(String.IsNullOrEmpty(_newItem.DefaultDirectory));
       Assert.IsFalse(_newItem.ChangesArePresent);
       _IFileDialogMock.Verify(x => x.FileName, Times.Never);
-      _IFileDialogMock.VerifySet(x => x.FileName = @"c:\\folder\file.name", Times.Never);
+      _IFileDialogMock.VerifySet(x => x.FileName =It.IsAny<string>(), Times.Never);
       _IFileDialogMock.Verify(x => x.InitialDirectory, Times.Never);
     }
-    private class ConfigurationManagementFixture : ConfigurationManagement
+    [TestMethod]
+    public void ShowOpenDialogTestMethod()
     {
-      public override ConfigurationType ConfigurationType => throw new NotImplementedException();
+      const string DefaultExt = "uamdsl";
+      const string FileName = "UAModelDesignerSolution";
+      const string Filter = "UA Model Designer Solution File (* .uamdsl)|*.uamdsl|UA Model Designer Solution File (* .xml)|*.xml|All files(*.*)|*.*";
+      const string Title = "UA Model Designer Solution Open/Save dialog window";
+      string _defPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), FileName);
+      Mock<IFileDialog> _IFileDialogMock = new Mock<IFileDialog>();
+      _IFileDialogMock.SetupProperty(x => x.FileName);
+      _IFileDialogMock.SetupProperty(x => x.DefaultExt);
+      _IFileDialogMock.SetupProperty(x => x.Filter);
+      _IFileDialogMock.SetupProperty(x => x.Title);
+      _IFileDialogMock.Setup(x => x.ShowDialog()).Returns(true);
+      ConfigurationManagementFixture _newItem = new ConfigurationManagementFixture(_IFileDialogMock.Object, _defPath);
+      _newItem.ShowOpenDialog();
+      _IFileDialogMock.VerifySet(x => x.DefaultExt = DefaultExt);
+      _IFileDialogMock.VerifySet(x => x.Filter = Filter);
+      _IFileDialogMock.VerifySet(x => x.Title = Title);
+      Assert.AreEqual<string>(FileName, Path.GetFileName(_IFileDialogMock.Object.FileName));
+    }
 
+    #region instrumentation
+    private class ConfigurationManagementFixture : ConfigurationManagement
+    {
+      protected override ConfigurationType Configuration => ConfigurationType.Solution;
       public ConfigurationManagementFixture(IFileDialog mock, string fileName) : base(new GraphicalUserInterfaceFixture(mock), fileName) { }
       internal void SignalChanges()
       {
@@ -77,6 +99,10 @@ public override bool Open()
       {
         throw new NotImplementedException();
       }
+      internal void ShowOpenDialog()
+      {
+        this.ShowDialogOpenFileDialog();
+      }
     }
     private class GraphicalUserInterfaceFixture : IGraphicalUserInterface
     {
@@ -93,13 +119,10 @@ public GraphicalUserInterfaceFixture(IFileDialog mock)
       public Func<IFileDialog> SaveFileDialogFuc => () => mock;
       public Func<IFolderBrowserDialog> OpenFolderBrowserDialogFunc => throw new NotImplementedException();
       public Func<string, string, bool> MessageBoxShowWarningAskYN => throw new NotImplementedException();
+      public bool UseWaitCursor { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
     }
-    // TODO Wrong default path after opening solution in the debug environment #62 - add to test
-    private const string DefaultExt = "xml";
-    private const string FileName = "UAAddressSpaceModel";
-    private const string Filter = "XML Configuration File (* .xml)|*.xml|All files(*.*)|*.*";
-    private const string Title = "UA Address Space Model";
+    #endregion
 
   }
 }

diff --git a/ModelDesigner.DesignStudio.UnitTest/IO/OPCFModelConfigurationManagementUnitTest.cs b/ModelDesigner.DesignStudio.UnitTest/IO/OPCFModelConfigurationManagementUnitTest.cs
@@ -35,6 +35,7 @@ public void ConstructorTest()
     }
     private class GraphicalUserInterface : IGraphicalUserInterface
     {
+
       private readonly IFileDialog m_Mock;
       public GraphicalUserInterface(IFileDialog @object)
       {
@@ -47,6 +48,8 @@ public GraphicalUserInterface(IFileDialog @object)
       public Func<IFileDialog> SaveFileDialogFuc => () => m_Mock;
       public Func<IFolderBrowserDialog> OpenFolderBrowserDialogFunc => throw new NotImplementedException();
       public Func<string, string, bool> MessageBoxShowWarningAskYN => throw new NotImplementedException();
+      public bool UseWaitCursor { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+
     }
   }
 }
diff --git a/ModelDesigner.DesignStudio/IO/ConfigurationManagement.cs b/ModelDesigner.DesignStudio/IO/ConfigurationManagement.cs
@@ -15,6 +15,7 @@ internal enum ConfigurationType
   {
     Project, Solution
   }
+
   /// <summary>
   /// Class to save and restore data to/from external file.
   /// This is base class and now it provides only common menu and file dialogs.
@@ -28,14 +29,18 @@ internal abstract class ConfigurationManagement
     /// </summary>
     public ConfigurationManagement(IGraphicalUserInterface graphicalUserInterface, string fileName)
     {
-      m_GraphicalUserInterface = graphicalUserInterface;
+      GraphicalUserInterface = graphicalUserInterface;
       InitializeComponent();
       DefaultFileName = fileName;
     }
     #endregion
 
     #region public
-    public abstract ConfigurationType ConfigurationType { get; }
+    /// <summary>
+    /// Gets the type of the configuration.
+    /// </summary>
+    /// <value>The type of the configuration defined in <see cref="ConfigurationType"/>.</value>
+    protected abstract ConfigurationType Configuration { get; }
     public string DefaultDirectory => Path.GetDirectoryName(DefaultFileName);
     /// <summary>
     /// Gets or sets the default name of the file.
@@ -105,7 +110,7 @@ public void SetChangesArePresent()
     public bool TestIfChangesArePresentDisplayWindowAndReturnTrueIfShouldBeContinued()
     {
       if (ChangesArePresent)
-        return m_GraphicalUserInterface.MessageBoxShowWarningAskYN(
+        return GraphicalUserInterface.MessageBoxShowWarningAskYN(
           Resources.ConfigurationManagementQuestionAboutContinuationIfChangesArePresent,
           Resources.ConfigurationManagementQuestionAboutContinuationIfChangesArePresentTitle);
       else
@@ -115,26 +120,20 @@ public bool TestIfChangesArePresentDisplayWindowAndReturnTrueIfShouldBeContinued
 
     #region private
     //var
-    private IGraphicalUserInterface m_GraphicalUserInterface;
-    //private System.Windows.Forms.ToolStripMenuItem m_TSMI_Open;
-    //private System.Windows.Forms.ToolStripMenuItem m_TSMI_Save;
-    //private System.Windows.Forms.ToolStripMenuItem m_TSMI_SaveAs;
-    //private System.Windows.Forms.ContextMenuStrip m_ContextMenuStrip;
-    //private System.Windows.Forms.ToolStripMenuItem m_TSMI_New;
+    protected IGraphicalUserInterface GraphicalUserInterface { get; private set; }
     private void RaiseChangesArePresentHasChanged()
     {
       ChangesArePresentHasChanged?.Invoke(this, EventArgs.Empty);
     }
     private bool m_ChangesArePresent = false;
     private string m_FileName;
-
     private void RaiseDefaultFileNameHasChanged()
     {
       DefaultFileNameHasChanged?.Invoke(this, EventArgs.Empty);
     }
     protected bool ShowDialogOpenFileDialog()
     {
-      using (IFileDialog _dialog = m_GraphicalUserInterface.OpenFileDialogFunc())
+      using (IFileDialog _dialog = GraphicalUserInterface.OpenFileDialogFunc())
       {
         SetupFileDialog(_dialog);
         bool _ret = _dialog.ShowDialog();
@@ -145,7 +144,7 @@ protected bool ShowDialogOpenFileDialog()
     }
     protected bool ShowDialogSaveFileDialog()
     {
-      using (IFileDialog _dialog = m_GraphicalUserInterface.SaveFileDialogFuc())
+      using (IFileDialog _dialog = GraphicalUserInterface.SaveFileDialogFuc())
       {
         SetupFileDialog(_dialog);
         bool _ret = _dialog.ShowDialog();
@@ -157,7 +156,7 @@ protected bool ShowDialogSaveFileDialog()
     private void SetupFileDialog(IFileDialog _dialog)
     {
       _dialog.FileName = this.DefaultFileName;
-      switch (ConfigurationType)
+      switch (Configuration)
       {
         case ConfigurationType.Project:
           _dialog.DefaultExt = Resources.Project_FileDialogDefaultExt;