diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 3563d4ce..e0e2a8f0 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Reflection;
using System.Resources;
using System.Runtime.InteropServices;
@@ -42,6 +42,6 @@
[assembly: CLSCompliant(true)]
#if DEBUG
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("TweetTest.System")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("TweetTest.Unit")]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("UnitTests")]
#endif
diff --git a/TweetDuck.sln b/TweetDuck.sln
index 6e018968..9eb12e29 100644
--- a/TweetDuck.sln
+++ b/TweetDuck.sln
@@ -6,12 +6,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck", "TweetDuck.cspr
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Browser", "subprocess\TweetDuck.Browser.csproj", "{B10B0017-819E-4F71-870F-8256B36A26AA}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "tests\UnitTests.csproj", "{A958FA7A-4A2C-42A7-BFA0-159343483F4E}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Video", "video\TweetDuck.Video.csproj", "{278B2D11-402D-44B6-B6A1-8FA67DB65565}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetLib.Communication", "lib\TweetLib.Communication\TweetLib.Communication.csproj", "{72473763-4B9D-4FB6-A923-9364B2680F06}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetTest.System", "lib\TweetTest.System\TweetTest.System.csproj", "{A958FA7A-4A2C-42A7-BFA0-159343483F4E}"
+EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TweetTest.Unit", "lib\TweetTest.Unit\TweetTest.Unit.fsproj", "{EEE1071A-28FA-48B1-82A1-9CBDC5C3F2C3}"
EndProject
Global
@@ -28,10 +28,6 @@ Global
{B10B0017-819E-4F71-870F-8256B36A26AA}.Debug|x86.Build.0 = Debug|x86
{B10B0017-819E-4F71-870F-8256B36A26AA}.Release|x86.ActiveCfg = Release|x86
{B10B0017-819E-4F71-870F-8256B36A26AA}.Release|x86.Build.0 = Release|x86
- {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Debug|x86.ActiveCfg = Debug|x86
- {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Debug|x86.Build.0 = Debug|x86
- {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Release|x86.ActiveCfg = Debug|x86
- {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Release|x86.Build.0 = Debug|x86
{278B2D11-402D-44B6-B6A1-8FA67DB65565}.Debug|x86.ActiveCfg = Debug|x86
{278B2D11-402D-44B6-B6A1-8FA67DB65565}.Debug|x86.Build.0 = Debug|x86
{278B2D11-402D-44B6-B6A1-8FA67DB65565}.Release|x86.ActiveCfg = Release|x86
@@ -40,10 +36,12 @@ Global
{72473763-4B9D-4FB6-A923-9364B2680F06}.Debug|x86.Build.0 = Debug|x86
{72473763-4B9D-4FB6-A923-9364B2680F06}.Release|x86.ActiveCfg = Release|x86
{72473763-4B9D-4FB6-A923-9364B2680F06}.Release|x86.Build.0 = Release|x86
+ {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Debug|x86.ActiveCfg = Debug|x86
+ {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Debug|x86.Build.0 = Debug|x86
+ {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Release|x86.ActiveCfg = Debug|x86
{EEE1071A-28FA-48B1-82A1-9CBDC5C3F2C3}.Debug|x86.ActiveCfg = Debug|x86
{EEE1071A-28FA-48B1-82A1-9CBDC5C3F2C3}.Debug|x86.Build.0 = Debug|x86
{EEE1071A-28FA-48B1-82A1-9CBDC5C3F2C3}.Release|x86.ActiveCfg = Debug|x86
- {EEE1071A-28FA-48B1-82A1-9CBDC5C3F2C3}.Release|x86.Build.0 = Debug|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/tests/Configuration/TestUserConfig.cs b/lib/TweetTest.System/Configuration/TestUserConfig.cs
similarity index 98%
rename from tests/Configuration/TestUserConfig.cs
rename to lib/TweetTest.System/Configuration/TestUserConfig.cs
index da9160d3..8ff324f0 100644
--- a/tests/Configuration/TestUserConfig.cs
+++ b/lib/TweetTest.System/Configuration/TestUserConfig.cs
@@ -5,9 +5,9 @@
using TweetDuck.Configuration;
using TweetDuck.Core.Other;
-namespace UnitTests.Configuration{
+namespace TweetTest.Configuration{
[TestClass]
- public class TestUserConfig : UnitTestIO{
+ public class TestUserConfig : TestIO{
private static void WriteTestConfig(string file, bool withBackup){
UserConfig cfg = UserConfig.Load(file);
cfg.ZoomLevel = 123;
diff --git a/tests/Data/TestCombinedFileStream.cs b/lib/TweetTest.System/Data/TestCombinedFileStream.cs
similarity index 98%
rename from tests/Data/TestCombinedFileStream.cs
rename to lib/TweetTest.System/Data/TestCombinedFileStream.cs
index 0a754006..c258792e 100644
--- a/tests/Data/TestCombinedFileStream.cs
+++ b/lib/TweetTest.System/Data/TestCombinedFileStream.cs
@@ -4,9 +4,9 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TweetDuck.Data;
-namespace UnitTests.Data{
+namespace TweetTest.Data{
[TestClass]
- public class TestCombinedFileStream : UnitTestIO{
+ public class TestCombinedFileStream : TestIO{
[TestMethod]
public void TestNoFiles(){
using(CombinedFileStream cfs = new CombinedFileStream(File.OpenWrite("empty"))){
diff --git a/tests/Data/TestFileSerializer.cs b/lib/TweetTest.System/Data/TestFileSerializer.cs
similarity index 96%
rename from tests/Data/TestFileSerializer.cs
rename to lib/TweetTest.System/Data/TestFileSerializer.cs
index 34e7283c..2a47a272 100644
--- a/tests/Data/TestFileSerializer.cs
+++ b/lib/TweetTest.System/Data/TestFileSerializer.cs
@@ -3,9 +3,9 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TweetDuck.Data.Serialization;
-namespace UnitTests.Data{
+namespace TweetTest.Data{
[TestClass]
- public class TestFileSerializer : UnitTestIO{
+ public class TestFileSerializer : TestIO{
private enum TestEnum{
A, B, C, D, E
}
diff --git a/tests/Properties/AssemblyInfo.cs b/lib/TweetTest.System/Properties/AssemblyInfo.cs
similarity index 91%
rename from tests/Properties/AssemblyInfo.cs
rename to lib/TweetTest.System/Properties/AssemblyInfo.cs
index 094a8520..7282d3ca 100644
--- a/tests/Properties/AssemblyInfo.cs
+++ b/lib/TweetTest.System/Properties/AssemblyInfo.cs
@@ -1,14 +1,14 @@
-using System.Reflection;
+using System.Reflection;
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("UnitTests")]
+[assembly: AssemblyTitle("TweetTest.System")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("UnitTests")]
+[assembly: AssemblyProduct("TweetTest.System")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/tests/UnitTests.csproj b/lib/TweetTest.System/TweetTest.System.csproj
similarity index 96%
rename from tests/UnitTests.csproj
rename to lib/TweetTest.System/TweetTest.System.csproj
index e34ab4f5..8c74c335 100644
--- a/tests/UnitTests.csproj
+++ b/lib/TweetTest.System/TweetTest.System.csproj
@@ -6,8 +6,8 @@
<ProjectGuid>{A958FA7A-4A2C-42A7-BFA0-159343483F4E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>UnitTests</RootNamespace>
- <AssemblyName>UnitTests</AssemblyName>
+ <RootNamespace>TweetTest</RootNamespace>
+ <AssemblyName>TweetTest.System</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -50,7 +50,7 @@
<Compile Include="UnitTestIO.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\TweetDuck.csproj">
+ <ProjectReference Include="..\..\TweetDuck.csproj">
<Project>{2389a7cd-e0d3-4706-8294-092929a33a2d}</Project>
<Name>TweetDuck</Name>
</ProjectReference>
diff --git a/tests/UnitTestIO.cs b/lib/TweetTest.System/UnitTestIO.cs
similarity index 95%
rename from tests/UnitTestIO.cs
rename to lib/TweetTest.System/UnitTestIO.cs
index f39dba99..40b4501e 100644
--- a/tests/UnitTestIO.cs
+++ b/lib/TweetTest.System/UnitTestIO.cs
@@ -3,9 +3,9 @@
using System.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-namespace UnitTests{
+namespace TweetTest{
[TestClass]
- public class UnitTestIO{
+ public class TestIO{
private static readonly HashSet<string> CreatedFolders = new HashSet<string>();
[TestInitialize]