Improving test infra

NeutroniumCore · Aug 12, 2016 · 5f29942 · 5f29942
1 parent 2b97dae
commit 5f29942
Show file tree

Hide file tree

Showing 39 changed files with 243 additions and 94 deletions.
diff --git a/HTML.WPF.Component/Internal/HTMLControlBase.xaml.cs b/HTML.WPF.Component/Internal/HTMLControlBase.xaml.cs
@@ -33,7 +33,6 @@ public partial class HTMLControlBase : IWebViewLifeCycleManager, IDisposable
 
         public bool DebugContext => IsDebug;
         public Uri Source => _WPFDoubleBrowserNavigator.Url;
-        public bool IsLoadInjectionSuported => _WPFDoubleBrowserNavigator.HTMLWindow is IHTMLModernWindow;
 
         public bool IsDebug
         {

diff --git a/JavascriptEngine/VueUiFrameworkManager/VueUiFramework.csproj b/JavascriptEngine/VueUiFrameworkManager/VueUiFramework.csproj
@@ -30,6 +30,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/MVVM.CEFGlue.sln b/MVVM.CEFGlue.sln
diff --git a/Tests/Awesomium/MVVM.Awesomium.TestInfra/AwesomiumWindowTestEnvironment.cs b/Tests/Awesomium/MVVM.Awesomium.TestInfra/AwesomiumWindowTestEnvironment.cs
@@ -1,7 +1,7 @@
 using HTMLEngine.Awesomium;
 using HTML_WPF.Component;
 using IntegratedTest.Infra.Window;
-using IntegratedTest.JavascriptUIFramework;
+using UIFrameworkTesterHelper;
 using KnockoutUIFramework;
 using KnockoutUIFramework.Test.TestHtml;
 using MVVM.HTML.Core.JavascriptUIFramework;

diff --git a/Tests/Awesomium/MVVM.Awesomium.TestInfra/AwesomiumWindowlessSharedJavascriptEngine.cs b/Tests/Awesomium/MVVM.Awesomium.TestInfra/AwesomiumWindowlessSharedJavascriptEngine.cs
@@ -16,7 +16,6 @@ internal class AwesomiumWindowlessSharedJavascriptEngine : IWindowlessJavascript
         private readonly IJavascriptUIFrameworkManager _JavascriptUIFrameworkManager;
         private readonly TaskCompletionSource<object> _EndTaskCompletionSource;
         private IWebView _CurrentWebView;
-        public bool AllowEarlyScriptInjection => false;
 
         public AwesomiumWindowlessSharedJavascriptEngine(IJavascriptUIFrameworkManager javascriptUIFrameworkManager)
         {
@@ -36,8 +35,7 @@ private async Task InitAsync(string ipath)
             WebCore.QueueWork( () => 
             {
                 _CurrentWebView = WebCore.CreateWebView(500, 500);
-                ipath = ipath ?? "javascript\\index.html";
-                var uri = new Uri($"{Assembly.GetExecutingAssembly().GetPath()}\\{ipath}");
+                var uri = new Uri(ipath);
                 _CurrentWebView.Source = uri;
                 WebView = new AwesomiumWebView(_CurrentWebView);
                 var htmlWindowProvider = new AwesomiumTestHTMLWindowProvider(WebView, uri);

diff --git a/...mium/MVVM.Awesomium.Window.Integrated.Tests/MVVM.Awesomium.Window.Integrated.Tests.csproj b/...mium/MVVM.Awesomium.Window.Integrated.Tests/MVVM.Awesomium.Window.Integrated.Tests.csproj
@@ -108,6 +108,10 @@
       <Project>{3a9a7bf2-46ab-46b6-af62-9822181cf6ca}</Project>
       <Name>KnockoutUIFramework.Test</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\UIFrameworkTesterHelper\UIFrameworkTesterHelper.csproj">
+      <Project>{d6f39e8c-bf8f-454e-8512-b46be149c339}</Project>
+      <Name>UIFrameworkTesterHelper</Name>
+    </ProjectReference>
     <ProjectReference Include="..\MVVM.Awesomium.TestInfra\MVVM.Awesomium.TestInfra.csproj">
       <Project>{8955b9f6-b6e5-4fef-a5ab-90c35afb9cc6}</Project>
       <Name>MVVM.Awesomium.TestInfra</Name>

diff --git a/...M.Awesomium.Windowless.Integrated.Tests/MVVM.Awesomium.Windowless.Integrated.Tests.csproj b/...M.Awesomium.Windowless.Integrated.Tests/MVVM.Awesomium.Windowless.Integrated.Tests.csproj
@@ -102,6 +102,14 @@
       <Project>{36e61349-9c50-405a-b082-8b9340cb4e61}</Project>
       <Name>IntegratedTest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\KnockoutUIFramework.Test\KnockoutUIFramework.Test.csproj">
+      <Project>{3a9a7bf2-46ab-46b6-af62-9822181cf6ca}</Project>
+      <Name>KnockoutUIFramework.Test</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\UIFrameworkTesterHelper\UIFrameworkTesterHelper.csproj">
+      <Project>{d6f39e8c-bf8f-454e-8512-b46be149c339}</Project>
+      <Name>UIFrameworkTesterHelper</Name>
+    </ProjectReference>
     <ProjectReference Include="..\MVVM.Awesomium.TestInfra\MVVM.Awesomium.TestInfra.csproj">
       <Project>{8955b9f6-b6e5-4fef-a5ab-90c35afb9cc6}</Project>
       <Name>MVVM.Awesomium.TestInfra</Name>

diff --git a/Tests/CefGlue/CefGlue.TestInfra/CefGlueWindowlessSharedJavascriptEngine.cs b/Tests/CefGlue/CefGlue.TestInfra/CefGlueWindowlessSharedJavascriptEngine.cs
@@ -23,8 +23,6 @@ public CefGlueWindowlessSharedJavascriptEngine(IJavascriptUIFrameworkManager jav
             _JavascriptUIFrameworkManager = javascriptUIFrameworkManager;
         }
 
-        public bool AllowEarlyScriptInjection => true;
-
         public void Init(string path)
         {
             var cc = InitTask(path).Result;
@@ -35,7 +33,7 @@ public void Init(string path)
 
         public HTMLViewEngine ViewEngine { get; private set; }
 
-        private Task<IHTMLWindowProvider> InitTask(string ipath)
+        private Task<IHTMLWindowProvider> InitTask(string fullpath)
         {
             TaskCompletionSource<IHTMLWindowProvider> tcs = new TaskCompletionSource<IHTMLWindowProvider>();
             Task.Run(async () =>
@@ -50,8 +48,8 @@ private Task<IHTMLWindowProvider> InitTask(string ipath)
                 // Initialize some the cust interactions with the browser process.
                 var cefClient = new TestCefClient();
 
-                ipath = ipath ?? "javascript\\index.html";
-                string fullpath = $"{Assembly.GetExecutingAssembly().GetPath()}\\{ipath}";
+                //ipath = ipath ?? "javascript\\index.html";
+                //string fullpath = $"{Assembly.GetExecutingAssembly().GetPath()}\\{ipath}";
 
                 // Start up the browser instance.
                 CefBrowserHost.CreateBrowser(cefWindowInfo, cefClient, cefBrowserSettings, fullpath);

diff --git a/Tests/CefGlue/CefGlue.TestInfra/CefWindowTestEnvironment.cs b/Tests/CefGlue/CefGlue.TestInfra/CefWindowTestEnvironment.cs
@@ -1,7 +1,7 @@
 using HTMLEngine.CefGlue;
 using HTML_WPF.Component;
 using IntegratedTest.Infra.Window;
-using IntegratedTest.JavascriptUIFramework;
+using UIFrameworkTesterHelper;
 using KnockoutUIFramework;
 using KnockoutUIFramework.Test.TestHtml;
 using MVVM.HTML.Core.JavascriptUIFramework;

diff --git a/Tests/CefGlue/CefGlue.Window.Integrated.Tests/CefGlue.Window.Integrated.Tests.csproj b/Tests/CefGlue/CefGlue.Window.Integrated.Tests/CefGlue.Window.Integrated.Tests.csproj
@@ -126,6 +126,11 @@
       <Project>{3a9a7bf2-46ab-46b6-af62-9822181cf6ca}</Project>
       <Name>KnockoutUIFramework.Test</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\UIFrameworkTesterHelper\UIFrameworkTesterHelper.csproj">
+      <Project>{d6f39e8c-bf8f-454e-8512-b46be149c339}</Project>
+      <Name>UIFrameworkTesterHelper</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\CefGlue.TestInfra\CefGlue.TestInfra.csproj">
       <Project>{947cc0fa-7f1c-4cf9-a908-1a29ed232f19}</Project>
       <Name>CefGlue.TestInfra</Name>

diff --git a/Tests/CefGlue/CefGlue.Windowless.Integrated.Tests/CefGlue.Windowless.Integrated.Tests.csproj b/Tests/CefGlue/CefGlue.Windowless.Integrated.Tests/CefGlue.Windowless.Integrated.Tests.csproj
@@ -124,6 +124,14 @@
       <Project>{36e61349-9c50-405a-b082-8b9340cb4e61}</Project>
       <Name>IntegratedTest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\KnockoutUIFramework.Test\KnockoutUIFramework.Test.csproj">
+      <Project>{3a9a7bf2-46ab-46b6-af62-9822181cf6ca}</Project>
+      <Name>KnockoutUIFramework.Test</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\UIFrameworkTesterHelper\UIFrameworkTesterHelper.csproj">
+      <Project>{d6f39e8c-bf8f-454e-8512-b46be149c339}</Project>
+      <Name>UIFrameworkTesterHelper</Name>
+    </ProjectReference>
     <ProjectReference Include="..\CefGlue.TestInfra\CefGlue.TestInfra.csproj">
       <Project>{947cc0fa-7f1c-4cf9-a908-1a29ed232f19}</Project>
       <Name>CefGlue.TestInfra</Name>

diff --git a/Tests/ChromiumFX/ChromiumFX.TestInfra/ChromiumFXWindowKoTestEnvironment.cs b/Tests/ChromiumFX/ChromiumFX.TestInfra/ChromiumFXWindowKoTestEnvironment.cs
@@ -1,12 +1,12 @@
 using HTMEngine.ChromiumFX;
 using HTML_WPF.Component;
 using IntegratedTest.Infra.Window;
-using IntegratedTest.JavascriptUIFramework;
 using KnockoutUIFramework;
 using KnockoutUIFramework.Test.TestHtml;
 using MVVM.HTML.Core.JavascriptUIFramework;
+using UIFrameworkTesterHelper;
 
-namespace ChromiumFX.TestInfra 
+namespace ChromiumFX.TestInfra
 {
     public class ChromiumFXWindowKoTestEnvironment : WindowTestEnvironment 
     {

diff --git a/Tests/ChromiumFX/ChromiumFX.TestInfra/ChromiumFXWindowVueTestEnvironment.cs b/Tests/ChromiumFX/ChromiumFX.TestInfra/ChromiumFXWindowVueTestEnvironment.cs
@@ -1,7 +1,7 @@
 using HTMEngine.ChromiumFX;
 using HTML_WPF.Component;
 using IntegratedTest.Infra.Window;
-using IntegratedTest.JavascriptUIFramework;
+using UIFrameworkTesterHelper;
 using MVVM.HTML.Core.JavascriptUIFramework;
 using VueUiFramework;
 using VueUiFramework.Test.TestHtml;

diff --git a/Tests/ChromiumFX/ChromiumFX.TestInfra/ChromiumFXWindowlessJavascriptEngine.cs b/Tests/ChromiumFX/ChromiumFX.TestInfra/ChromiumFXWindowlessJavascriptEngine.cs
@@ -22,7 +22,6 @@ public class ChromiumFXWindowlessJavascriptEngine : IWindowlessJavascriptEngine
 
         public HTMLViewEngine ViewEngine { get; private set;  }
         public IWebView WebView { get; private set; }
-        public bool AllowEarlyScriptInjection => true;
 
         internal ChromiumFXWindowlessJavascriptEngine(WpfThread wpfThread, Task<ChromiumFXWebView> chromiumFxWebViewTask, IJavascriptUIFrameworkManager frameWork) 
         {
@@ -33,8 +32,6 @@ internal ChromiumFXWindowlessJavascriptEngine(WpfThread wpfThread, Task<Chromium
 
         public void Init(string path) 
         {
-            //path = path ?? "javascript\\index.html";
-            path = $"{Assembly.GetExecutingAssembly().GetPath()}\\{path}";
             InitAsync(path).Wait();
         }
 

diff --git a/...s/ChromiumFX/ChromiumFX.Window.Integrated.Tests/ChromiumFX.Window.Integrated.Tests.csproj b/...s/ChromiumFX/ChromiumFX.Window.Integrated.Tests/ChromiumFX.Window.Integrated.Tests.csproj
@@ -10,10 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ChromiumFX.Window.Integrated.Tests</RootNamespace>
     <AssemblyName>ChromiumFX.Window.Integrated.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -32,6 +33,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ChromiumFX, Version=3.2526.3.0, Culture=neutral, processorArchitecture=x86">
       <HintPath>..\..\..\packages\Unofficial.Chromiumfx.3.2526.3\lib\ChromiumFX.dll</HintPath>
@@ -96,6 +115,10 @@
       <Project>{36e61349-9c50-405a-b082-8b9340cb4e61}</Project>
       <Name>IntegratedTest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\UIFrameworkTesterHelper\UIFrameworkTesterHelper.csproj">
+      <Project>{d6f39e8c-bf8f-454e-8512-b46be149c339}</Project>
+      <Name>UIFrameworkTesterHelper</Name>
+    </ProjectReference>
     <ProjectReference Include="..\ChromiumFX.TestInfra\ChromiumFX.TestInfra.csproj">
       <Project>{a82d4195-0f75-48b3-8e43-5be90d061c6c}</Project>
       <Name>ChromiumFX.TestInfra</Name>

diff --git a/...umFX/ChromiumFX.Windowless.Integrated.Tests/ChromiumFX.Windowless.Integrated.Tests.csproj b/...umFX/ChromiumFX.Windowless.Integrated.Tests/ChromiumFX.Windowless.Integrated.Tests.csproj
@@ -313,6 +313,10 @@
       <Project>{3a9a7bf2-46ab-46b6-af62-9822181cf6ca}</Project>
       <Name>KnockoutUIFramework.Test</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\UIFrameworkTesterHelper\UIFrameworkTesterHelper.csproj">
+      <Project>{d6f39e8c-bf8f-454e-8512-b46be149c339}</Project>
+      <Name>UIFrameworkTesterHelper</Name>
+    </ProjectReference>
     <ProjectReference Include="..\ChromiumFX.TestInfra\ChromiumFX.TestInfra.csproj">
       <Project>{a82d4195-0f75-48b3-8e43-5be90d061c6c}</Project>
       <Name>ChromiumFX.TestInfra</Name>

diff --git a/Tests/HTML_WPF.Component.Test/HTML_WPF.Component.Test.csproj b/Tests/HTML_WPF.Component.Test/HTML_WPF.Component.Test.csproj
@@ -32,6 +32,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="FluentAssertions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.dll</HintPath>

diff --git a/Tests/IntegratedTest/Infra/Window/IWindowTestEnvironment.cs b/Tests/IntegratedTest/Infra/Window/IWindowTestEnvironment.cs
@@ -1,8 +1,8 @@
 using System;
-using IntegratedTest.JavascriptUIFramework;
 using MVVM.HTML.Core.JavascriptUIFramework;
+using UIFrameworkTesterHelper;
 
-namespace IntegratedTest.Infra.Window 
+namespace IntegratedTest.Infra.Window
 {
     public interface IWindowTestEnvironment : IDisposable
     {

diff --git a/Tests/IntegratedTest/Infra/Window/WindowTestEnvironment.cs b/Tests/IntegratedTest/Infra/Window/WindowTestEnvironment.cs
@@ -1,9 +1,9 @@
 using System;
 using HTML_WPF.Component;
-using IntegratedTest.JavascriptUIFramework;
 using MVVM.HTML.Core.JavascriptUIFramework;
+using UIFrameworkTesterHelper;
 
-namespace IntegratedTest.Infra.Window 
+namespace IntegratedTest.Infra.Window
 {
     public abstract class WindowTestEnvironment : IWindowTestEnvironment 
     {

diff --git a/Tests/IntegratedTest/Infra/Windowless/IWindowlessJavascriptEngine.cs b/Tests/IntegratedTest/Infra/Windowless/IWindowlessJavascriptEngine.cs
@@ -6,7 +6,6 @@ namespace IntegratedTest.Infra.Windowless
 {
     public interface IWindowlessJavascriptEngine : IDisposable 
     {
-        bool AllowEarlyScriptInjection { get; }
         void Init(string path);
         HTMLViewEngine ViewEngine { get; }
         IWebView WebView { get; }

diff --git a/Tests/IntegratedTest/Infra/Windowless/IntegratedWindowLess_TestBase.cs b/Tests/IntegratedTest/Infra/Windowless/IntegratedWindowLess_TestBase.cs
@@ -6,6 +6,7 @@
 using MVVM.HTML.Core.JavascriptEngine.JavascriptObject;
 using MVVM.HTML.Core.JavascriptEngine.Window;
 using Xunit.Abstractions;
+using UIFrameworkTesterHelper;
 
 namespace IntegratedTest.Infra.Windowless
 {
@@ -43,7 +44,7 @@ protected void Test(Action act, TestContext ipath= TestContext.Index)
         public IDisposable Tester(TestContext context = TestContext.Index)
         {
             var tester = _TestEnvironment.Build();
-            var path = _TestEnvironment.HtmlProvider.GetHtlmPath(context, tester.AllowEarlyScriptInjection);
+            var path = _TestEnvironment.HtmlProvider.GetHtlmPath(context);
             tester.Init(path);
             _ViewEngine = tester.ViewEngine;
             _WebView = tester.WebView;

diff --git a/Tests/IntegratedTest/Infra/Windowless/TestInContext.cs b/Tests/IntegratedTest/Infra/Windowless/TestInContext.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using IntegratedTest.JavascriptUIFramework;
+using UIFrameworkTesterHelper;
 using MVVM.HTML.Core;
 using MVVM.HTML.Core.Binding;
 

diff --git a/Tests/IntegratedTest/Infra/Windowless/TestInContextAsync.cs b/Tests/IntegratedTest/Infra/Windowless/TestInContextAsync.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Threading.Tasks;
-using IntegratedTest.JavascriptUIFramework;
 using MVVM.HTML.Core;
 using MVVM.HTML.Core.Binding;
+using UIFrameworkTesterHelper;
 
 namespace IntegratedTest.Infra.Windowless
 {

diff --git a/Tests/IntegratedTest/Infra/Windowless/WindowlessTestEnvironment.cs b/Tests/IntegratedTest/Infra/Windowless/WindowlessTestEnvironment.cs
@@ -3,6 +3,7 @@
 using MVVM.HTML.Core.JavascriptEngine.JavascriptObject;
 using MVVM.HTML.Core.JavascriptEngine.Window;
 using MVVM.HTML.Core.JavascriptUIFramework;
+using UIFrameworkTesterHelper;
 
 namespace IntegratedTest.Infra.Windowless 
 {

diff --git a/Tests/IntegratedTest/IntegratedTest.csproj b/Tests/IntegratedTest/IntegratedTest.csproj
@@ -99,8 +99,6 @@
     <Compile Include="JavascriptUIFramework\FrameworkTestContext.cs" />
     <Compile Include="Infra\Windowless\TestInContextAsync.cs" />
     <Compile Include="Infra\Windowless\TestIUIDispatcher.cs" />
-    <Compile Include="JavascriptUIFramework\ITestHtmlProvider.cs" />
-    <Compile Include="JavascriptUIFramework\TestContext.cs" />
     <Compile Include="TestData\SimpleViewModel.cs" />
     <Compile Include="Tests\Windowless\Test_WebView_Dispatcher.cs" />
     <Compile Include="Tests\Windowless\Test_ConvertToJSO.cs" />
@@ -145,6 +143,11 @@
       <Project>{e35b9010-5429-4ffe-a788-e9c40e743e9c}</Project>
       <Name>MVVM.ViewModel</Name>
     </ProjectReference>
+    <ProjectReference Include="..\UIFrameworkTesterHelper\UIFrameworkTesterHelper.csproj">
+      <Project>{d6f39e8c-bf8f-454e-8512-b46be149c339}</Project>
+      <Name>UIFrameworkTesterHelper</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="javascript\src\Koaddon.js">

diff --git a/Tests/IntegratedTest/JavascriptUIFramework/FrameworkTestContext.cs b/Tests/IntegratedTest/JavascriptUIFramework/FrameworkTestContext.cs
@@ -1,6 +1,7 @@
 using System;
 using MVVM.HTML.Core.JavascriptEngine.JavascriptObject;
 using MVVM.HTML.Core.JavascriptUIFramework;
+using UIFrameworkTesterHelper;
 
 namespace IntegratedTest.JavascriptUIFramework 
 {

diff --git a/Tests/IntegratedTest/JavascriptUIFramework/ITestHtmlProvider.cs b/Tests/IntegratedTest/JavascriptUIFramework/ITestHtmlProvider.cs