Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
6119936
Prepared NUnit and began migrating some tests, added basic AppVeyor c…
Roemer Dec 18, 2015
314a99c
Migrated ColorTests
Roemer Dec 18, 2015
7f1091e
Migrated CheckboxTests
Roemer Dec 18, 2015
3a96e96
Fixed some test app paths
Roemer Dec 19, 2015
83ed257
Migrated ScreenObject UITests (but ignored for now)
Roemer Dec 19, 2015
0200485
Renamed UIItemIdAppXmlConfiguration to IUIItemIdAppXmlConfiguration s…
Roemer Dec 19, 2015
f8f175d
Migrated more tests...
Roemer Dec 19, 2015
bbef760
Migrated TodoAppTests
Roemer Dec 19, 2015
2e87eca
Removed some unused references
Roemer Dec 19, 2015
6f37e16
Migrated remaining InputControl Tests
Roemer Dec 19, 2015
183af35
Migrated ListControl Tests
Roemer Dec 19, 2015
24bf02d
Migrated MenuItem Tests
Roemer Dec 19, 2015
d4636d3
Migrated Splitter Tests, removed some unused files
Roemer Dec 19, 2015
12ba83d
Migrated Table Tests, added missing files
Roemer Dec 19, 2015
b208560
Migrated TreeItem Tests (there are some problems because they are exp…
Roemer Dec 19, 2015
d50e5a5
Migrated StripControl Tests
Roemer Dec 19, 2015
c4b236b
Change AutomationElementXTest.cs to nunit
Dec 20, 2015
f5feed2
Fixed formatting and removed setter for FrameworkId
Dec 20, 2015
2e3f66a
Forgot to include change to csproj for file name change
Dec 20, 2015
2209e78
Merge pull request #343 from maxinfet/nunit-automationelementxtest
Roemer Dec 20, 2015
20a4ef3
Added some localization (FindBrowseButton now works in German as well)
Roemer Dec 20, 2015
2d8733a
Migrated the remaining control tests
Roemer Dec 20, 2015
a73a3c3
Migrated factory and input devices tests
Roemer Dec 20, 2015
1985972
More UI migrations
Roemer Dec 20, 2015
5c37acd
Migrated last test from PR 346, removed xUnit
Roemer Dec 20, 2015
d74d9b7
Adjusted appveyor configuration
Roemer Dec 20, 2015
cac3080
Switched nuget to the newer automatic package restore
Roemer Dec 20, 2015
8638e2e
Removed the obsolete .nuget folder
Roemer Dec 20, 2015
aa4f835
Added some virtual keywords
Roemer Dec 20, 2015
4671810
Ignore some failing tests from Silverlight
Roemer Dec 20, 2015
a6e3152
Stabilized teardown, added log info for application start
Roemer Dec 20, 2015
30bcce3
Added build status
Roemer Dec 20, 2015
698c488
Added WPF testapplication to ScreenObjects.UITests
Roemer Dec 20, 2015
4b51f62
Removed unnecessary logging
Roemer Dec 20, 2015
c6ae865
Added image for latest test status
Roemer Dec 21, 2015
1b4aab5
Fixed some tests
Roemer Dec 21, 2015
f54627b
Migrated UnitTests
Roemer Dec 21, 2015
fa48717
Migrated Web ui Tests, xunit is gone now :)
Roemer Dec 21, 2015
784af0e
Removed some unused files, added script to run all nunit tests
Roemer Dec 22, 2015
b65c4a4
Ignored some tests
Roemer Dec 22, 2015
88f9376
Some Test adjustments
Roemer Dec 22, 2015
4152e72
Removed invalid artefacts from appveyor
Roemer Dec 22, 2015
eaa9669
Changed RunTests to use the nunit file
Roemer Dec 22, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Project white has been inactive for some time, but still has many users and is a

TestStack has brought this project into it's offering to try and breathe some life into Project White.

## Build Status
[![Build status](https://ci.appveyor.com/api/projects/status/3nq9oblpevt0uu0l/branch/nunit?svg=true)](https://ci.appveyor.com/project/RomanBaeriswyl/white-9yaco/branch/nunit)
[![Test status](http://flauschig.ch/batch.php?type=tests&account=RomanBaeriswyl&slug=white-9yaco)](https://ci.appveyor.com/project/RomanBaeriswyl/white-9yaco/branch/nunit)

## Contributing
White needs contributors to keep improving. There is plenty to do:

Expand Down
15 changes: 0 additions & 15 deletions RunUITests.cmd

This file was deleted.

12 changes: 12 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 1.0.{build}
init:
- ps:
install:
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-desktop.ps1'))
before_build:
- cmd: nuget restore src\TestStack.White.sln
build:
project: src\TestStack.White.sln
verbosity: minimal
on_finish:
- ps: if (Test-Path -path c:\FailedTestsScreenshots) { Get-ChildItem c:\FailedTestsScreenshots\*.* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }}
6 changes: 0 additions & 6 deletions src/.nuget/NuGet.Config

This file was deleted.

Binary file removed src/.nuget/NuGet.exe
Binary file not shown.
136 changes: 0 additions & 136 deletions src/.nuget/NuGet.targets

This file was deleted.

4 changes: 0 additions & 4 deletions src/.nuget/packages.config

This file was deleted.

11 changes: 2 additions & 9 deletions src/Samples/Todo.Core/Todo.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>69a6bdb9</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
Expand Down Expand Up @@ -55,19 +54,13 @@
<Compile Include="NotifyPropertyChanged.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="..\..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.24.0\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.24.0\build\Fody.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

2 changes: 1 addition & 1 deletion src/Samples/Wpf/WpfTodo.UITests/Screens/UITestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public abstract class UITestBase : IDisposable

protected UITestBase()
{
var directoryName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var directoryName = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath);
var markpadLocation = Path.Combine(directoryName, @"WpfTodo.exe");
Application = Application.Launch(markpadLocation);
}
Expand Down
27 changes: 15 additions & 12 deletions src/Samples/Wpf/WpfTodo.UITests/TodoAppTests.cs
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
using System;
using NUnit.Framework;
using System;
using System.IO;
using System.Linq;
using System.Reflection;
using TestStack.White.Configuration;
using TestStack.White.Factory;
using TestStack.White.ScreenObjects.Services;
using TestStack.White.ScreenObjects.Sessions;
using WpfTodo.UITests.Screens;
using Xunit;

namespace WpfTodo.UITests
{
[TestFixture]
public class TodoAppTests : UITestBase
{
[Fact]
public void Automate()
[Test]
public void AutomateTest()
{
var workConfiguration =
new WorkConfiguration
{
ArchiveLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
Name = "WpfTodo"
};
var workPath = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath);
var workConfiguration = new WorkConfiguration
{
ArchiveLocation = workPath,
Name = "WpfTodo"
};

CoreAppXmlConfiguration.Instance.WorkSessionLocation = new DirectoryInfo(workPath);
using (var workSession = new WorkSession(workConfiguration, new NullWorkEnvironment()))
{
var screenRepository = workSession.Attach(Application);
Expand All @@ -36,8 +39,8 @@ public void Automate()
newTaskScreen.Create();

var tasks = mainWindow.Tasks.ToList();
Assert.Equal(1, tasks.Count);
Assert.Equal(title, tasks[0].Title);
Assert.That(tasks, Has.Count.EqualTo(1));
Assert.That(tasks[0].Title, Is.EqualTo(title));
}
}
}
Expand Down
19 changes: 7 additions & 12 deletions src/Samples/Wpf/WpfTodo.UITests/WpfTodo.UITests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -33,16 +32,13 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core">
<HintPath>..\..\..\packages\Castle.Core.3.3.0\lib\net40-client\Castle.Core.dll</HintPath>
<Reference Include="nunit.framework">
<HintPath>..\..\..\packages\NUnit.3.0.1\lib\net40\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="UIAutomationClient" />
<Reference Include="UIAutomationTypes" />
<Reference Include="xunit">
<HintPath>..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand All @@ -53,10 +49,6 @@
<Compile Include="TodoAppTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\TestStack.White.Reporting\TestStack.White.Reporting.csproj">
<Project>{19FC2A6E-1C39-4DB8-AABF-A234FD6BC3FE}</Project>
<Name>TestStack.White.Reporting</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\TestStack.White.ScreenObjects\TestStack.White.ScreenObjects.csproj">
<Project>{FCD3E92F-FEE9-414D-A460-09F7F685B83E}</Project>
<Name>TestStack.White.ScreenObjects</Name>
Expand All @@ -77,13 +69,16 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

3 changes: 1 addition & 2 deletions src/Samples/Wpf/WpfTodo.UITests/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.3.0" targetFramework="net40" />
<package id="xunit" version="1.9.2" targetFramework="net40" />
<package id="NUnit" version="3.0.1" targetFramework="net40" />
</packages>
11 changes: 2 additions & 9 deletions src/Samples/Wpf/WpfTodo/WpfTodo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>a50d3576</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
Expand Down Expand Up @@ -119,19 +118,13 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="..\..\..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\..\..\packages\Fody.1.24.0\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Fody.1.24.0\build\Fody.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

Loading