WinGui: Rename interop library to match naming convention. Remove some old test files that are not used.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6947 b64f7644-9d1e-0410-96f1-a4d463321fa5

12 files changed, 6 insertions, 320 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index e3436d19f..a14112886 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -184,9 +184,9 @@
     </EmbeddedResource>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\HandBrake.Interop\HandBrakeInterop\HandBrakeInterop.csproj">

+    <ProjectReference Include="..\HandBrake.Interop\HandBrakeInterop\HandBrake.Interop.csproj">

       <Project>{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}</Project>

-      <Name>HandBrakeInterop</Name>

+      <Name>HandBrake.Interop</Name>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup />

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/EncodeJobsPersist.cs b/win/CS/HandBrake.Interop/HandBrakeInterop.Test/EncodeJobsPersist.cs
deleted file mode 100644
index 37ca233c4..000000000
--- a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/EncodeJobsPersist.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.IO;

-using System.Linq;

-using System.Text;

-using System.Xml;

-using System.Xml.Linq;

-using System.Xml.Serialization;

-using HandBrake.Interop;

-using HandBrake.Interop.Model;

-

-namespace HandBrakeInterop.Test

-{

-	public static class EncodeJobsPersist

-	{

-		private static XmlSerializer xmlSerializer = new XmlSerializer(typeof(EncodeJob));

-

-		public static EncodeJob GetJob(string jobName)

-		{

-			XDocument doc = XDocument.Load(jobName + ".xml");

-			using (XmlReader reader = doc.CreateReader())

-			{

-				var job = xmlSerializer.Deserialize(reader) as EncodeJob;

-

-

-

-				return job;

-			}

-		}

-	}

-}

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/HandBrakeInterop.Test.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop.Test/HandBrakeInterop.Test.csproj
deleted file mode 100644
index 5b7a8b72c..000000000
--- a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/HandBrakeInterop.Test.csproj
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>

-    </ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{D721824C-CAFA-40B1-83C9-83E4B1215D60}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>HandBrakeInterop.Test</RootNamespace>

-    <AssemblyName>HandBrakeInterop.Test</AssemblyName>

-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

-    <Reference Include="System" />

-    <Reference Include="System.Core">

-      <RequiredTargetFramework>3.5</RequiredTargetFramework>

-    </Reference>

-    <Reference Include="System.Xml" />

-    <Reference Include="System.Xml.Linq" />

-  </ItemGroup>

-  <ItemGroup>

-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">

-      <Visible>False</Visible>

-    </CodeAnalysisDependentAssemblyPaths>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="EncodeJobsPersist.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="TestEncodes.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\HandBrakeInterop\HandBrakeInterop.csproj">

-      <Project>{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}</Project>

-      <Name>HandBrakeInterop</Name>

-    </ProjectReference>

-  </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.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/Properties/AssemblyInfo.cs b/win/CS/HandBrake.Interop/HandBrakeInterop.Test/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2352dc269..000000000
--- a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("HandBrakeInterop.Test")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("Microsoft")]

-[assembly: AssemblyProduct("HandBrakeInterop.Test")]

-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("2731c894-c1fc-4690-9557-aa56591b17ab")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestEncodes.cs b/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestEncodes.cs
deleted file mode 100644
index 3e625a986..000000000
--- a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestEncodes.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;

-using System.IO;

-using System.Text;

-using System.Collections.Generic;

-using System.Linq;

-using System.Threading;

-using HandBrake.Interop;

-using HandBrake.Interop.Model;

-using HandBrake.Interop.Model.Encoding;

-using Microsoft.VisualStudio.TestTools.UnitTesting;

-

-namespace HandBrakeInterop.Test

-{

-	[TestClass]

-	public class TestEncodes

-	{

-		public const string OutputVideoDirectoryName = "OutputVideos";

-		private static readonly string OutputVideoDirectory = Path.Combine(Environment.CurrentDirectory, OutputVideoDirectoryName);

-

-		private ManualResetEvent resetEvent = new ManualResetEvent(false);

-

-		[ClassInitialize]

-		public static void Init(TestContext context)

-		{

-			EnsureOutputVideoDirectoryExists();

-

-			FileInfo[] files = new DirectoryInfo(OutputVideoDirectory).GetFiles();

-			foreach (FileInfo file in files)

-			{

-				file.Delete();

-			}

-		}

-

-		[TestMethod]

-		public void Normal()

-		{

-			this.RunJob("Normal");

-		}

-

-		private void RunJob(string jobName)

-		{

-			this.resetEvent.Reset();

-

-			EncodeJob job = EncodeJobsPersist.GetJob("Normal");

-

-			if (job.SourceType == SourceType.VideoFolder)

-			{

-				job.SourcePath = Path.Combine(Environment.CurrentDirectory, Path.GetFileName(job.SourcePath));

-			}

-

-			if (job.SourceType == SourceType.File)

-			{

-				job.SourcePath = Path.Combine(Environment.CurrentDirectory, Path.GetFileName(job.SourcePath));

-			}
-
-			string extension;
-			if (job.EncodingProfile.OutputFormat == Container.Mkv)
-			{
-				extension = ".mkv";
-			}
-			else

-			{

-				extension = ".mp4";

-			}

-

-			job.OutputPath = Path.Combine(OutputVideoDirectory, jobName + extension);

-

-			var instance = new HandBrakeInstance();

-			instance.Initialize(0);

-			instance.ScanCompleted += (sender, e) =>

-			{

-				this.resetEvent.Set();

-			};

-

-			instance.StartScan(job.SourcePath, 10);

-			this.resetEvent.WaitOne();

-

-			this.resetEvent.Reset();

-			instance.EncodeCompleted += (sender, e) =>

-			{

-				Assert.IsFalse(e.Error);

-				this.resetEvent.Set();

-			};

-

-			instance.StartEncode(job);

-			this.resetEvent.WaitOne();

-

-			Assert.IsTrue(File.Exists(job.OutputPath));

-

-			var fileInfo = new FileInfo(job.OutputPath);

-			Assert.IsTrue(fileInfo.Length > 1024);

-		}

-

-		private static void EnsureOutputVideoDirectoryExists()

-		{

-			if (!Directory.Exists(OutputVideoDirectory))

-			{

-				Directory.CreateDirectory(OutputVideoDirectory);

-			}

-		}

-	}

-}

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestFiles/Jobs/Normal.xml b/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestFiles/Jobs/Normal.xml
deleted file mode 100644
index b717a7c36..000000000
--- a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestFiles/Jobs/Normal.xml
+++ /dev/null
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.sln b/win/CS/HandBrake.Interop/HandBrakeInterop.sln
deleted file mode 100644
index 194b8f5a9..000000000
--- a/win/CS/HandBrake.Interop/HandBrakeInterop.sln
+++ /dev/null
@@ -1,52 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeInterop", "HandBrakeInterop\HandBrakeInterop.csproj", "{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeInterop.Test", "HandBrakeInterop.Test\HandBrakeInterop.Test.csproj", "{D721824C-CAFA-40B1-83C9-83E4B1215D60}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F9A6B796-8476-4F7D-BD4E-A1B73A42E2F7}"

-	ProjectSection(SolutionItems) = preProject

-		HandBrakeInterop.vsmdi = HandBrakeInterop.vsmdi

-		Local.testsettings = Local.testsettings

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(TestCaseManagementSettings) = postSolution

-		CategoryFile = HandBrakeInterop.vsmdi

-	EndGlobalSection

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Mixed Platforms = Debug|Mixed Platforms

-		Debug|x64 = Debug|x64

-		Debug|x86 = Debug|x86

-		Release|Mixed Platforms = Release|Mixed Platforms

-		Release|x64 = Release|x64

-		Release|x86 = Release|x86

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|Mixed Platforms.Build.0 = Debug|x86

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x64.ActiveCfg = Debug|x64

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x64.Build.0 = Debug|x64

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.ActiveCfg = Debug|x86

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.Build.0 = Debug|x86

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.ActiveCfg = Release|x86

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.Build.0 = Release|x86

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x64.ActiveCfg = Release|x64

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x64.Build.0 = Release|x64

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x86.ActiveCfg = Release|x86

-		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x86.Build.0 = Release|x86

-		{D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

-		{D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

-		{D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|x64.ActiveCfg = Debug|Any CPU

-		{D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|x64.Build.0 = Debug|Any CPU

-		{D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|x86.ActiveCfg = Debug|Any CPU

-		{D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

-		{D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|Mixed Platforms.Build.0 = Release|Any CPU

-		{D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|x64.ActiveCfg = Release|Any CPU

-		{D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|x86.ActiveCfg = Release|Any CPU

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.vsmdi b/win/CS/HandBrake.Interop/HandBrakeInterop.vsmdi
deleted file mode 100644
index bbe274502..000000000
--- a/win/CS/HandBrake.Interop/HandBrakeInterop.vsmdi
+++ /dev/null
@@ -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="5e2e1c3b-c045-4781-88b7-8fd6b6c6596b" 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>
\ No newline at end of file
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrake.Interop.csproj
index 133620409..133620409 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrake.Interop.csproj
diff --git a/win/CS/HandBrake.Interop/Local.testsettings b/win/CS/HandBrake.Interop/Local.testsettings
deleted file mode 100644
index a371a9d4a..000000000
--- a/win/CS/HandBrake.Interop/Local.testsettings
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<TestSettings name="Local" id="5e2e1c3b-c045-4781-88b7-8fd6b6c6596b" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">

-  <Description>These are default test settings for a local test run.</Description>

-  <Deployment>

-    <DeploymentItem filename="..\Lib\x64\hb.dll" />

-    <DeploymentItem filename="HandBrakeInterop.Test\TestFiles\Videos\" />

-    <DeploymentItem filename="HandBrakeInterop.Test\TestFiles\Jobs\" />

-  </Deployment>

-  <Execution hostProcessPlatform="MSIL">

-    <TestTypeSpecific>

-      <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">

-        <AssemblyResolution>

-          <TestDirectory useLoadContext="true" />

-        </AssemblyResolution>

-      </UnitTestRunConfig>

-    </TestTypeSpecific>

-    <AgentRule name="LocalMachineDefaultRole">

-    </AgentRule>

-  </Execution>

-</TestSettings>
\ No newline at end of file
diff --git a/win/CS/HandBrake10.sln b/win/CS/HandBrake10.sln
index 395e71bac..59cc0e38c 100644
--- a/win/CS/HandBrake10.sln
+++ b/win/CS/HandBrake10.sln
@@ -1,13 +1,13 @@
 

 Microsoft Visual Studio Solution File, Format Version 12.00

 # Visual Studio 2013

-VisualStudioVersion = 12.0.30723.0

+VisualStudioVersion = 12.0.31101.0

 MinimumVisualStudioVersion = 10.0.40219.1

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServices", "HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeInterop", "HandBrake.Interop\HandBrakeInterop\HandBrakeInterop.csproj", "{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Interop", "HandBrake.Interop\HandBrakeInterop\HandBrake.Interop.csproj", "{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}"

 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5CB7BC74-449C-4E95-98AB-E1E4387E514B}"

 	ProjectSection(SolutionItems) = preProject

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index b7d4a8a85..681bd9d1b 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -535,9 +535,9 @@
       <Project>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</Project>

       <Name>HandBrake.ApplicationServices</Name>

     </ProjectReference>

-    <ProjectReference Include="..\HandBrake.Interop\HandBrakeInterop\HandBrakeInterop.csproj">

+    <ProjectReference Include="..\HandBrake.Interop\HandBrakeInterop\HandBrake.Interop.csproj">

       <Project>{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}</Project>

-      <Name>HandBrakeInterop</Name>

+      <Name>HandBrake.Interop</Name>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>