Skip to content

Commit f07c5e3

Browse files
apdevelopapdevelop
committed
Solution converted to VS2013; code cleanup
1 parent c262ac1 commit f07c5e3

15 files changed

Lines changed: 178 additions & 65 deletions

‎Src/ScreenGrid.Models.Tests/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

Src/ScreenGrid.Models.Tests/FlatImageTests.cs renamed to Src/ScreenGrid.Tests/FlatImageTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void GetHorizontalStripeTest()
1515
const int width = 64;
1616
const int height = 48;
1717

18-
var flatImage = LoadFlatImageFromResource("ScreenGrid.Models.Tests.Resources.ImageSimple.png");
18+
var flatImage = LoadFlatImageFromResource("ScreenGrid.Tests.Resources.ImageSimple.png");
1919

2020
Assert.AreEqual(width, flatImage.Width);
2121
Assert.AreEqual(height, flatImage.Height);
@@ -30,7 +30,7 @@ public void GetHorizontalStripeTest()
3030
[Test]
3131
public void GetDerivativeTest()
3232
{
33-
var flatImage = LoadFlatImageFromResource("ScreenGrid.Models.Tests.Resources.ImageSimple.png");
33+
var flatImage = LoadFlatImageFromResource("ScreenGrid.Tests.Resources.ImageSimple.png");
3434
var stripeMiddle = flatImage.GetHorizontalStripe(flatImage.Height / 2);
3535

3636
var dMiddle = FlatImage.GetDerivative(stripeMiddle);
@@ -44,7 +44,7 @@ public void GetDerivativeTest()
4444
[Test]
4545
public void FindBordersTest()
4646
{
47-
var flatImage = LoadFlatImageFromResource("ScreenGrid.Models.Tests.Resources.ImageSimple.png");
47+
var flatImage = LoadFlatImageFromResource("ScreenGrid.Tests.Resources.ImageSimple.png");
4848

4949
const int minimalSegmentLength = 8;
5050
var step = flatImage.Height / 8;
@@ -63,7 +63,7 @@ public void FindBordersTest()
6363
[Test]
6464
public void FindBoundsOfInnerImage()
6565
{
66-
var flatImage = LoadFlatImageFromResource("ScreenGrid.Models.Tests.Resources.ImageSimple.png");
66+
var flatImage = LoadFlatImageFromResource("ScreenGrid.Tests.Resources.ImageSimple.png");
6767

6868
var result = flatImage.FindBoundsOfInnerImage();
6969

Src/ScreenGrid.Models.Tests/IntegerSegmentTests.cs renamed to Src/ScreenGrid.Tests/IntegerSegmentTests.cs

File renamed without changes.

Src/ScreenGrid.Models.Tests/Properties/AssemblyInfo.cs renamed to Src/ScreenGrid.Tests/Properties/AssemblyInfo.cs

File renamed without changes.

Src/ScreenGrid.Models.Tests/Properties/Resources.Designer.cs renamed to Src/ScreenGrid.Tests/Properties/Resources.Designer.cs

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Src/ScreenGrid.Models.Tests/Properties/Resources.resx renamed to Src/ScreenGrid.Tests/Properties/Resources.resx

File renamed without changes.

Src/ScreenGrid.Models.Tests/Resources/ImageSimple.png renamed to Src/ScreenGrid.Tests/Resources/ImageSimple.png

File renamed without changes.

Src/ScreenGrid.Models.Tests/ScreenGrid.Models.Tests.csproj renamed to Src/ScreenGrid.Tests/ScreenGrid.Tests.csproj

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<ProjectGuid>{966E6B4D-8A28-4CC1-AAD5-933F7B3E5F97}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>ScreenGrid.Models.Tests</RootNamespace>
12-
<AssemblyName>ScreenGrid.Models.Tests</AssemblyName>
11+
<RootNamespace>ScreenGrid.Tests</RootNamespace>
12+
<AssemblyName>ScreenGrid.Tests</AssemblyName>
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
</PropertyGroup>
@@ -32,9 +32,9 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
36-
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\packages\NUnit.3.2.1\lib\net40\nunit.framework.dll</HintPath>
35+
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
36+
<HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
37+
<Private>True</Private>
3838
</Reference>
3939
<Reference Include="System" />
4040
<Reference Include="System.Core" />
@@ -50,9 +50,7 @@
5050
<DesignTime>True</DesignTime>
5151
<DependentUpon>Resources.resx</DependentUpon>
5252
</Compile>
53-
</ItemGroup>
54-
<ItemGroup>
55-
<None Include="packages.config" />
53+
<Compile Include="ScreenGridViewModelTests.cs" />
5654
</ItemGroup>
5755
<ItemGroup>
5856
<EmbeddedResource Include="Properties\Resources.resx">
@@ -69,6 +67,12 @@
6967
<Name>ScreenGrid</Name>
7068
</ProjectReference>
7169
</ItemGroup>
70+
<ItemGroup>
71+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
72+
</ItemGroup>
73+
<ItemGroup>
74+
<None Include="packages.config" />
75+
</ItemGroup>
7276
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7377
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7478
Other similar extension points exist, see Microsoft.Common.targets.

‎Src/ScreenGrid.Tests/ScreenGridViewModelTests.cs‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
using System;
2+
3+
using NUnit.Framework;
4+
5+
using ScreenGrid.Models;
6+
using ScreenGrid.ViewModels;
7+
8+
namespace ScreenGrid.Tests
9+
{
10+
[TestFixture]
11+
class ScreenGridViewModelTests
12+
{
13+
[Test]
14+
public void SelectOctaneRenderStandaloneMainWindowSuccess()
15+
{
16+
var list = new[]
17+
{
18+
new NativeWindowState { Handle = new IntPtr(0x000E0780), ClassName = "JUCE_158f853ded5", Width = 217, Height = 363 },
19+
new NativeWindowState { Handle = new IntPtr(0x00050786), ClassName = "JUCE_158f853ded5", Width = 1032, Height = 795 },
20+
new NativeWindowState { Handle = new IntPtr(0x0003053A), ClassName = "ToDoListFrame", Width = 1205, Height = 814 },
21+
new NativeWindowState { Handle = new IntPtr(0x000703D6), ClassName = "MozillaWindowClass", Width = 936, Height = 742 },
22+
new NativeWindowState { Handle = new IntPtr(0x000602F4), ClassName = "Internet Explorer_Hidden", Width = 0, Height = 0 },
23+
};
24+
25+
var result = ScreenGridViewModel.SelectOctaneRenderStandaloneMainWindow(list, "JUCE_158f853ded5");
26+
27+
Assert.AreEqual(1032, result.Width);
28+
}
29+
30+
[Test]
31+
public void SelectOctaneRenderStandaloneMainWindowAnother()
32+
{
33+
var list = new[]
34+
{
35+
new NativeWindowState { Handle = new IntPtr(0x000703D6), ClassName = "MozillaWindowClass", Width = 936, Height = 742 },
36+
new NativeWindowState { Handle = new IntPtr(0x000E0780), ClassName = "JUCE_158f853ded5", Width = 217, Height = 363 },
37+
new NativeWindowState { Handle = new IntPtr(0x00050786), ClassName = "JUCE_158f853ded5", Width = 1032, Height = 795 },
38+
new NativeWindowState { Handle = new IntPtr(0x0003053A), ClassName = "ToDoListFrame", Width = 1205, Height = 814 },
39+
new NativeWindowState { Handle = new IntPtr(0x000602F4), ClassName = "Internet Explorer_Hidden", Width = 0, Height = 0 },
40+
};
41+
42+
var result = ScreenGridViewModel.SelectOctaneRenderStandaloneMainWindow(list, "JUCE_158f853ded5");
43+
44+
Assert.IsNull(result);
45+
}
46+
}
47+
}

‎Src/ScreenGrid.Tests/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NUnit" version="3.5.0" targetFramework="net40" />
4+
</packages>

0 commit comments

Comments
 (0)