Skip to content

Commit e08d890

Browse files
AndMuAndMu
committed
Fixing tests
1 parent 29d8dc0 commit e08d890

5 files changed

Lines changed: 35 additions & 124 deletions

File tree

‎src/Wikiled.YiScanner.Tests/App.config‎

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

‎src/Wikiled.YiScanner.Tests/Client/Predicates/NewFilesPredicateTests.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ public void CanDownload()
2121
var result = instance.CanDownload(null, "Test.file", DateTime.Now);
2222
Assert.IsFalse(result);
2323
result = instance.CanDownload(DateTime.Now, "Test.file", DateTime.Now);
24-
Assert.IsFalse(result);
24+
Assert.IsTrue(result);
2525
result = instance.CanDownload(null, "Test.file", DateTime.Now);
2626
Assert.IsFalse(result);
27+
instance.Downloaded("Test.file");
28+
result = instance.CanDownload(DateTime.Now, "Test.file", DateTime.Now);
29+
Assert.IsFalse(result);
2730

2831
result = instance.CanDownload(DateTime.Now, "Test2.file", DateTime.Now);
2932
Assert.IsTrue(result);

‎src/Wikiled.YiScanner.Tests/Properties/AssemblyInfo.cs‎

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

‎src/Wikiled.YiScanner.Tests/Wikiled.YiScanner.Tests.csproj‎

Lines changed: 31 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,43 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{2B74D4F5-00E8-4B28-8D18-45BB2B519396}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<RootNamespace>Wikiled.YiScanner.Tests</RootNamespace>
10-
<AssemblyName>Wikiled.YiScanner.Tests</AssemblyName>
11-
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<PlatformTarget>AnyCPU</PlatformTarget>
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<PlatformTarget>AnyCPU</PlatformTarget>
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
</PropertyGroup>
34-
<PropertyGroup>
35-
<StartupObject />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>NET462</TargetFramework>
5+
<RuntimeIdentifier>win7-x86</RuntimeIdentifier>
366
</PropertyGroup>
7+
8+
<ItemGroup Condition="'$(TargetFramework)' == 'NET462'">
9+
<PackageReference Include="Wikiled.Core.Utility">
10+
<Version>2.1.17</Version>
11+
</PackageReference>
12+
</ItemGroup>
13+
3714
<ItemGroup>
38-
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
40-
</Reference>
41-
<Reference Include="Moq, Version=4.7.142.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Moq.4.7.142\lib\net45\Moq.dll</HintPath>
43-
</Reference>
44-
<Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
45-
<HintPath>..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
46-
</Reference>
47-
<Reference Include="System" />
48-
<Reference Include="System.Configuration" />
49-
<Reference Include="System.Core" />
50-
<Reference Include="System.Xml.Linq" />
51-
<Reference Include="System.Data.DataSetExtensions" />
52-
<Reference Include="Microsoft.CSharp" />
53-
<Reference Include="System.Data" />
54-
<Reference Include="System.Net.Http" />
55-
<Reference Include="System.Xml" />
15+
<PackageReference Include="Accord.Video.FFMPEG" Version="3.8.0" />
16+
<PackageReference Include="FluentFTP" Version="19.1.2" />
17+
<PackageReference Include="Moq" Version="4.7.145" />
18+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
19+
<PackageReference Include="NUnit" Version="3.9.0" />
20+
<PackageReference Include="System.Reactive.Linq" Version="3.1.1" />
21+
<PackageReference Include="System.Reactive.PlatformServices" Version="3.1.1" />
22+
<PackageReference Include="Topshelf" Version="4.0.3" />
5623
</ItemGroup>
24+
5725
<ItemGroup>
58-
<Compile Include="Client\Predicates\NewFilesPredicateTests.cs" />
59-
<Compile Include="Client\VideoHeaderExtensionsTests.cs" />
60-
<Compile Include="Client\VideoHeaderTests.cs" />
61-
<Compile Include="Destinations\CompressedDestinationTests.cs" />
62-
<Compile Include="Properties\AssemblyInfo.cs" />
26+
<ProjectReference Include="..\YiScanner\Wikiled.YiScanner.csproj" />
6327
</ItemGroup>
28+
6429
<ItemGroup>
65-
<None Include="App.config" />
66-
<None Include="packages.config" />
30+
<Reference Include="System.ComponentModel.DataAnnotations" />
6731
</ItemGroup>
32+
6833
<ItemGroup>
69-
<ProjectReference Include="..\YiScanner\Wikiled.YiScanner.csproj">
70-
<Project>{EB6ADB38-1ABE-45AA-BA10-61EA56FE484E}</Project>
71-
<Name>Wikiled.YiScanner</Name>
72-
</ProjectReference>
34+
<Folder Include="Properties\" />
7335
</ItemGroup>
36+
7437
<ItemGroup>
75-
<Content Include="Data\Test.txt">
38+
<None Update="Data\Test.txt">
7639
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
77-
</Content>
40+
</None>
7841
</ItemGroup>
79-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
80-
</Project>
42+
43+
</Project>

‎src/Wikiled.YiScanner.Tests/packages.config‎

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

0 commit comments

Comments
 (0)