更新代码示例

Actions/MyAction.cs

@@ -12,11 +12,11 @@ namespace Kivii.Test.WebDriver
     internal class MyJsAction:ActionBase
     {
         public string Js { get; set; }
-        public override string Execute(Manager manager)
+        public override string Execute(Window window)
         {
             try
             {
-                var value=manager.ExecuteScript(Js);
+                var value=window.ExecuteScript(Js);
                 return value;
             }
             catch (Exception ex)

Kivii.Test.WebDriver.csproj

@@ -35,8 +35,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Kivii.WebDriver.V4.7, Version=4.15.2023.11030, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Kivii.WebDriver.4.15.2023.11030\lib\net47\Kivii.WebDriver.V4.7.dll</HintPath>
+    <Reference Include="Kivii.WebDriver.V4.7, Version=4.15.2023.11040, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Kivii.WebDriver.4.15.2023.11040\lib\net47\Kivii.WebDriver.V4.7.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -69,6 +69,7 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tests\MouseTest.cs" />
+    <Compile Include="Tests\ReferenceTest.cs" />
     <Compile Include="Tests\WeatherTest.cs" />
     <EmbeddedResource Include="FrmMain.resx">
       <DependentUpon>FrmMain.cs</DependentUpon>

Tests/MouseTest.cs

@@ -10,9 +10,9 @@ namespace Kivii.Test.WebDriver.Tests
 {
     internal class MouseTest
     {
-        public static WebPage Get()
+        public static Window Get()
         {
-            var rtns = new WebPage(null);
+            var rtns = new Window(null);
 
             //rtns.Url = "https://www.baidu.com";//这个配置可通过NavigateAction进行
 
@@ -21,7 +21,7 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new NavigateAction();
                 action.Name = "跳转网站";
                 action.Url = "http://www.cacs.mofcom.gov.cn/cacscms/view/notice/zhtbomrasff#";
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -30,7 +30,7 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new MouseAction();
                 action.Type = MouseActionType.Pause;
                 action.DurationMilliseconds = 2000;
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -39,7 +39,7 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new MouseAction();
                 action.Type = MouseActionType.Click;
                 action.Target = new ElementFinder("//*[@id=\"zhtbomrasff\"]");
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -48,7 +48,7 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new MouseAction();
                 action.Type = MouseActionType.Pause;
                 action.DurationMilliseconds = 2000;
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -57,7 +57,7 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new MouseAction();
                 action.Type = MouseActionType.Click;
                 action.Target = new ElementFinder("//*[@id=\"zhtbomrapex\"]");
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -66,7 +66,7 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new MouseAction();
                 action.Type = MouseActionType.Pause;
                 action.DurationMilliseconds = 2000;
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -75,7 +75,7 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new MouseAction();
                 action.Type = MouseActionType.Click;
                 action.Target = new ElementFinder("//*[@id=\"zhtbmg\"]");
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -84,7 +84,7 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new MouseAction();
                 action.Type = MouseActionType.Pause;
                 action.DurationMilliseconds = 2000;
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -93,7 +93,7 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new MouseAction();
                 action.Type = MouseActionType.Click;
                 action.Target = new ElementFinder("//*[@id=\"zhtbomrasff\"]");
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -101,7 +101,7 @@ namespace Kivii.Test.WebDriver.Tests
             {
                 var action = new MouseAction();
                 action.Type = MouseActionType.Perform;
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
             return rtns;

Tests/ReferenceTest.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Kivii.Test.WebDriver.Tests
+{
+    /// <summary>
+    /// 本对象是通过manager.SetReference()的方法注入到Manager中
+    /// 在Manager的ExecuteScript时，就可以使用到本类的内置方法
+    /// </summary>
+    internal class ReferenceTest
+    {
+    }
+}

Tests/WeatherTest.cs

@@ -10,17 +10,17 @@ namespace Kivii.Test.WebDriver.Tests
 {
     internal class WeatherTest
     {
-        public static WebPage Get()
+        public static Window Get()
         {
-            var rtns = new WebPage(null);
+            var rtns = new Window(null);
             //autoPage.Url = "https://www.baidu.com";//生成DEMO时不需要
             #region 第一步，在输入框内输入内容
             {
                 var action = new InputAction();
                 action.Name = "输入查询内容";
                 action.InputValue = "最近天气";
-                action.ElementFinder = new ElementFinder("kw", "id");
-                rtns.Actions.Add(action);
+                action.Target = new ElementFinder("kw", "id");
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -28,8 +28,8 @@ namespace Kivii.Test.WebDriver.Tests
             {
                 var action = new ClickAction();
                 action.Name = "百度一下";
-                action.ElementFinder = new ElementFinder("su", "id");
-                rtns.Actions.Add(action);
+                action.Target = new ElementFinder("su", "id");
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -38,9 +38,9 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new OutputAction();
                 action.Name = "取当前城市";
                 //使用XPath
-                action.ElementFinder = new ElementFinder("/html/body/div[3]/div[3]/div[1]/div[3]/div[1]/div/div/div[1]/div/div[1]/div[2]/div[1]/div[1]/div/div[1]");
+                action.Target = new ElementFinder("/html/body/div[3]/div[3]/div[1]/div[3]/div[1]/div/div/div[1]/div/div[1]/div[2]/div[1]/div[1]/div/div[1]");
                 action.Attributes.Add("innerText", "所在城市");
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -49,9 +49,9 @@ namespace Kivii.Test.WebDriver.Tests
                 var action = new OutputAction();
                 action.Name = "取天气";
                 //使用XPath
-                action.ElementFinder = new ElementFinder(".weather-main-temp_6CEpK > span:nth-child(1)", "css");
+                action.Target = new ElementFinder(".weather-main-temp_6CEpK > span:nth-child(1)", "css");
                 action.Attributes.Add("innerText", "天气");
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
 
@@ -61,7 +61,7 @@ namespace Kivii.Test.WebDriver.Tests
                 action.Name = "测试JS返回";
                 //使用XPath
                 action.Js = "return '测试JS返回';";
-                rtns.Actions.Add(action);
+                rtns.AddAction(action);
             }
             #endregion
             return rtns;

packages.config

 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Kivii.WebDriver" version="4.15.2023.11030" targetFramework="net472" />
+  <package id="Kivii.WebDriver" version="4.15.2023.11040" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
   <package id="Selenium.Support" version="4.15.0" targetFramework="net472" />
   <package id="Selenium.WebDriver" version="4.15.0" targetFramework="net472" />