mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 14:32:35 +01:00
Feature/test run settings (#3975)
* Test removal of local.testsettings * Simplify settings * Fix variable name + remove class attribute * Add "DeploymentItem" attribute back * display info when running "build_helpers.bat" * again... * mote test * More logging * Revert build_helpers.bat * Undo some test changes * test failed test * Fix unit test again * more testing * Remove hardcoded hunspell dll files + re-add test category for spell checker test * work * Work on unit tests
This commit is contained in:
Nikolaj Olsson
GitHub
parent
e199d5228c
commit
47a813ae34
@ -118,14 +118,19 @@ namespace Nikse.SubtitleEdit.Core
|
||||
private static string GetBaseDirectory()
|
||||
{
|
||||
var assembly = System.Reflection.Assembly.GetEntryAssembly() ?? System.Reflection.Assembly.GetExecutingAssembly();
|
||||
|
||||
return Path.GetDirectoryName(assembly.Location) + Path.DirectorySeparatorChar;
|
||||
}
|
||||
|
||||
private static string GetDataDirectory()
|
||||
{
|
||||
var appDataRoamingPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Subtitle Edit");
|
||||
// hack for unit tests
|
||||
var assembly = System.Reflection.Assembly.GetEntryAssembly() ?? System.Reflection.Assembly.GetExecutingAssembly();
|
||||
if (assembly.Location.Contains("subtitleedit\\src\\TestResults"))
|
||||
{
|
||||
return assembly.Location.Substring(0, assembly.Location.IndexOf("subtitleedit\\src\\TestResults")) + @"subtitleedit\src\Test\bin\Debug";
|
||||
}
|
||||
|
||||
var appDataRoamingPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Subtitle Edit");
|
||||
if (IsRunningOnLinux || IsRunningOnMac)
|
||||
{
|
||||
if (!Directory.Exists(appDataRoamingPath) && !File.Exists(Path.Combine(BaseDirectory, ".PACKAGE-MANAGER")))
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<TestSettings name="Local" id="7d261dd1-82d4-4d46-aba1-c2579198fcfd" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
|
||||
<Description>These are default test settings for a local test run.</Description>
|
||||
<Deployment>
|
||||
<DeploymentItem filename="packages\NHunspell.1.2.5554.16953\content\Hunspellx64.dll" />
|
||||
<DeploymentItem filename="packages\NHunspell.1.2.5554.16953\content\Hunspellx86.dll" />
|
||||
</Deployment>
|
||||
<Execution>
|
||||
<TestTypeSpecific>
|
||||
<UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
|
||||
<AssemblyResolution>
|
||||
<TestDirectory useLoadContext="true" />
|
||||
</AssemblyResolution>
|
||||
</UnitTestRunConfig>
|
||||
</TestTypeSpecific>
|
||||
<AgentRule name="LocalMachineDefaultRole">
|
||||
</AgentRule>
|
||||
</Execution>
|
||||
<Properties />
|
||||
</TestSettings>
|
||||
@ -1,20 +1,13 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26430.14
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.29728.190
|
||||
MinimumVisualStudioVersion = 14.0.23107.0
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubtitleEdit", "SubtitleEdit.csproj", "{511A5B59-1C35-4719-8536-23B19AF9B21A}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77} = {DBD4656C-5F40-4067-A70B-C4460DE20F77}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{766101A0-80D5-4560-BFF7-73F1559B4C47}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
Local.testsettings = Local.testsettings
|
||||
SubtitleEdit.vsmdi = SubtitleEdit.vsmdi
|
||||
TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateAssemblyInfo", "UpdateAssemblyInfo\UpdateAssemblyInfo.csproj", "{DBD4656C-5F40-4067-A70B-C4460DE20F77}"
|
||||
@ -23,9 +16,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateLanguageFiles", "Upda
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateResourceScript", "UpdateResourceScript\UpdateResourceScript.csproj", "{2CB9698C-F0A8-42FF-8938-DE047292D5FE}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{E5F70420-EF49-403E-851F-700953769937}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibSE", "..\libse\LibSE.csproj", "{3E3CB28F-3A7B-430F-9EB3-0D6C1E53B753}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSE", "..\libse\LibSE.csproj", "{3E3CB28F-3A7B-430F-9EB3-0D6C1E53B753}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77} = {DBD4656C-5F40-4067-A70B-C4460DE20F77}
|
||||
{36BCA2A7-EE6B-45FD-AF90-D3F76A84DA76} = {36BCA2A7-EE6B-45FD-AF90-D3F76A84DA76}
|
||||
@ -73,6 +64,9 @@ Global
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {E12BDE22-B6A4-4AB6-AF96-F3C0F89C15EC}
|
||||
EndGlobalSection
|
||||
GlobalSection(TestCaseManagementSettings) = postSolution
|
||||
CategoryFile = SubtitleEdit.vsmdi
|
||||
EndGlobalSection
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
|
||||
<TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
|
||||
<RunConfiguration id="7d261dd1-82d4-4d46-aba1-c2579198fcfd" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
</TestList>
|
||||
</TestLists>
|
||||
@ -1,12 +1,12 @@
|
||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
using System;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Xml;
|
||||
using System.Xml.Linq;
|
||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
|
||||
namespace Test
|
||||
namespace Test.Dictionaries
|
||||
{
|
||||
[TestClass]
|
||||
public class XmlDictionariesTest
|
||||
File diff suppressed because it is too large
Load Diff
@ -38,6 +38,9 @@
|
||||
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="NHunspell, Version=1.2.5554.16953, Culture=neutral, PublicKeyToken=1ac793ea843b4366, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NHunspell.1.2.5554.16953\lib\net\NHunspell.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
@ -60,7 +63,7 @@
|
||||
<Compile Include="Logic\NetflixQualityCheckTest.cs" />
|
||||
<Compile Include="Logic\Ocr\BinaryOcrTest.cs" />
|
||||
<Compile Include="Core\HtmlUtilTest.cs" />
|
||||
<Compile Include="FixCommonErrorsTest.cs" />
|
||||
<Compile Include="FixCommonErrors\FixCommonErrorsTest.cs" />
|
||||
<Compile Include="Logic\LanguageTest.cs" />
|
||||
<Compile Include="Logic\BluRaySup\BluRaySupParserTest.cs" />
|
||||
<Compile Include="Logic\BluRaySup\ToolBoxTest.cs" />
|
||||
@ -82,7 +85,7 @@
|
||||
<Compile Include="Logic\Forms\RemoveTextForHearImpairedTest.cs" />
|
||||
<Compile Include="Logic\SubtitleFormats\SubtitleFormatsTest.cs" />
|
||||
<Compile Include="Logic\UtilitiesTest.cs" />
|
||||
<Compile Include="XmlDictionariesTest.cs" />
|
||||
<Compile Include="Dictionaries\XmlDictionariesTest.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\libse\LibSE.csproj">
|
||||
@ -153,6 +156,10 @@
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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.
|
||||
|
||||
4
src/Test/packages.config
Normal file
4
src/Test/packages.config
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="NHunspell" version="1.2.5554.16953" targetFramework="net40" />
|
||||
</packages>
|
||||
@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<TestSettings name="Trace and Test Impact" id="94b587cd-0638-492b-8419-0a2fd0605172" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
|
||||
<Description>These are test settings for Trace and Test Impact.</Description>
|
||||
<Execution>
|
||||
<TestTypeSpecific />
|
||||
<AgentRule name="Execution Agents">
|
||||
</AgentRule>
|
||||
</Execution>
|
||||
</TestSettings>
|
||||
@ -22,7 +22,6 @@ namespace UpdateAssemblyInfo
|
||||
}
|
||||
};
|
||||
p.OutputDataReceived += OutputDataReceived;
|
||||
|
||||
try
|
||||
{
|
||||
p.Start();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user