Merge branch 'feature/Framework_management' into develop

twinkle-tools · Apr 25, 2020 · 7b084e9 · 7b084e9
2 parents dac61aa + 2fdf81f
commit 7b084e9
Show file tree

Hide file tree

Showing 16 changed files with 512 additions and 591 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,6 @@ and support existing ones.
 
 ###### View class
 ```
-[View(alias: "Main Google page")]
 public class MainGooglePage:View
 {
     public MainGooglePage()
@@ -97,20 +96,12 @@ public class Button:Control
 ```
 [TestFixture]
 public class Hooks
-{
-    private TwinkleView _twinkleView;
-        
-    [SetUp]
-    public void SetUp()
-    {
-        _twinkleView = new TwinkleView();
-    }
-        
+{ 
     [Test]
     public void ExecuteOperationWithPreHook()
     {
-        _twinkleView.GetView<MainGooglePage>().SearchInput.SetValue("value");
-        _twinkleView.GetView<MainGooglePage>().SearchInGoogle.Click();
+        TwinkleView.GetView<MainGooglePage>().SearchInput.SetValue("value");
+        TwinkleView.GetView<MainGooglePage>().SearchInGoogle.Click();
     }        
 }
 ```

diff --git a/Twinkle.View.Test/Infrastructure/Controls/Button.cs b/Twinkle.View.Test/Infrastructure/Controls/Button.cs
@@ -4,10 +4,6 @@ namespace Twinkle.View.Test.Infrastructure.Controls
 {
     public class Button:Control
     {
-        public Button(string alias, string xpath, string css, TwinkleView twinkleView) : base(alias, xpath, css, twinkleView)
-        {
-        }
-
         [Operation(Alias = "Click")]
         public void Click()
         {

diff --git a/Twinkle.View.Test/Infrastructure/Controls/TextBox.cs b/Twinkle.View.Test/Infrastructure/Controls/TextBox.cs
@@ -1,14 +1,9 @@
-using System;
 using Twinkle.View.Attributes;
 
 namespace Twinkle.View.Test.Infrastructure.Controls
 {
     public class TextBox:Control
     {
-        public TextBox(string alias, string xpath, string css, TwinkleView twinkleView) : base(alias, xpath, css, twinkleView)
-        {
-        }
-
         [Operation(Alias = "SetValue")]
         public void SetValue(string value)
         {

diff --git a/Twinkle.View.Test/Infrastructure/Views/MainGooglePage.cs b/Twinkle.View.Test/Infrastructure/Views/MainGooglePage.cs
@@ -5,7 +5,6 @@
 
 namespace Twinkle.View.Test.Infrastructure.Views
 {
-    [View(alias: "Main Google page")]
     public class MainGooglePage:View
     {
         public MainGooglePage()

diff --git a/Twinkle.View.Test/Tests/Hooks.cs b/Twinkle.View.Test/Tests/Hooks.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using NUnit.Framework;
 using Twinkle.View.Test.Infrastructure.Views;
 
@@ -7,32 +8,25 @@ namespace Twinkle.View.Test.Tests
     [TestFixture]
     public class Hooks
     {
-        private TwinkleView _twinkleView;
-
-        [SetUp]
-        public void SetUp()
-        {
-            _twinkleView = new TwinkleView();
-        }
-
         [Test]
         public void ExecuteOperationWithPreHook()
         {
-            var exceptionPre = Assert.Throws<Exception>(() => _twinkleView.GetView<MainGooglePage>().SearchInput.SetValue("value"));
+            TwinkleView.Context.Set("threadId", Thread.CurrentThread.ManagedThreadId);
+            var exceptionPre = Assert.Throws<Exception>(() => TwinkleView.GetView<MainGooglePage>().SearchInput.SetValue("value"));
             Assert.That(exceptionPre.Message.Equals("before set value for search input"));
         }
 
         [Test]
         public void ExecuteOperationWithPostHook()
         {
-            var exception = Assert.Throws<Exception>(() => _twinkleView.GetView<MainGooglePage>().SearchInput.GetValue());
+            var exception = Assert.Throws<Exception>(() => TwinkleView.GetView<MainGooglePage>().SearchInput.GetValue());
             Assert.That(exception.Message.Equals("after get value for search input"));
         }
 
         [Test]
         public void ExecuteOperationWithoutHook()
         {
-            Assert.DoesNotThrow(() => _twinkleView.GetView<MainGooglePage>().SearchInGoogle.Click());
+            Assert.DoesNotThrow(() => TwinkleView.GetView<MainGooglePage>().SearchInGoogle.Click());
         }
     }
 }
diff --git a/Twinkle.View.Test/TwinkleViewSettings.json b/Twinkle.View.Test/TwinkleViewSettings.json
@@ -11,6 +11,6 @@
     "dll_containing_controls": "Twinkle.View.Test"
   },
   "common": {
-    "logging_enable": false
+    "logging_enable": true
   }
 }
diff --git a/Twinkle.View/Attributes/OperationAttribute.cs b/Twinkle.View/Attributes/OperationAttribute.cs
@@ -21,7 +21,7 @@ public class OperationAttribute : TwinkleBaseAttribute, IMethodDecorator
         /// Alias operations
         /// </summary>
         public string Alias { get; set; }
-        
+
         /// <summary>
         /// Control method marked with Operation attribute
         /// </summary>
@@ -51,7 +51,7 @@ public void OnEntry()
         {
             //todo Check configuration parameter "automatic_view_detection"
             ClearActiveViews();
-            ((TwinkleView)_instanse.GetType().GetProperty("TwinkleView").GetValue(_instanse)).GetActiveViews();
+            TwinkleView.InternalTwinkleView.GetActiveViews();
             FindHooks(true);
         }
 
@@ -60,7 +60,7 @@ public void OnEntry()
         /// </summary>
         private void ClearActiveViews()
         {
-            var activeViews = ((TwinkleView)_instanse.GetType().GetProperty("TwinkleView").GetValue(_instanse)).SystemContext.Views.ActiveViews;
+            var activeViews = TwinkleView.InternalTwinkleView.SystemContext.Views.ActiveViews;
             if (activeViews != null)
                 activeViews.Clear();
         }

diff --git a/Twinkle.View/Control.cs b/Twinkle.View/Control.cs
@@ -8,15 +8,5 @@ public abstract class Control
         public string XPath { get; set; }
         public string Css { get; set; }
         public List<Hook> Hooks { get; set; }
-        public TwinkleView TwinkleView { get; set; }
-
-        public Control(string alias, string xpath, string css, TwinkleView twinkleView)
-        {
-            Alias = alias;
-            XPath = xpath;
-            Css = css;
-            TwinkleView = twinkleView;
-        }
-
     }
 }
diff --git a/Twinkle.View/Infrastructure/GlobalConfiguraionFramework.cs b/Twinkle.View/Infrastructure/GlobalConfiguraionFramework.cs
@@ -6,14 +6,14 @@
 
 namespace Twinkle.View.Infrastructure
 {
-    internal class GlobalConfiguraionFramework
+    public class GlobalConfiguraionFramework
     {
-        internal bool AutomaticViewDetection { get; set; }
-        internal List<string> DllContainingViews { get; set; }
-        internal List<string> DllContainingControls { get; set; }
-        internal int SearchControlNumberOfRetries { get; set; }
-        internal int SearchControlTimeBetweenRetries { get; set; }
-        internal bool LoggingEnable { get; set; }
+        public bool AutomaticViewDetection { get; internal set; }
+        public List<string> DllContainingViews { get; internal set; }
+        public List<string> DllContainingControls { get; internal set; }
+        public int SearchControlNumberOfRetries { get; internal set; }
+        public int SearchControlTimeBetweenRetries { get; internal set; }
+        public bool LoggingEnable { get; internal set; }
 
         public GlobalConfiguraionFramework(IConfiguration config)
         {