From afb7ebbc4034249ae452d0ee0744a5fecb0fbdee Mon Sep 17 00:00:00 2001 From: Kerry Jiang Date: Tue, 6 Nov 2012 01:41:05 +0800 Subject: [PATCH] improved Test project --- Build.Net45.bat | 4 +-- Build.bat | 8 +++--- SuperSocket.2010.NET35.sln | 17 +++++++++-- SuperSocket.2010.sln | 17 +++++++++-- SuperSocket.2012.NET40.sln | 17 +++++++++-- SuperSocket.2012.sln | 17 +++++++++-- Test/BootstrapTest.cs | 1 - Test/Config/Basic.config | 7 +++-- Test/SecureTcpSocketServerTest.cs | 12 -------- Test/Setup.cs | 18 ------------ Test/SuperSocket.Test.NET35.csproj | 45 +++++++++++++++++++++-------- Test/SuperSocket.Test.Net40.csproj | 46 +++++++++++++++++++++--------- Test/SuperSocket.Test.Net45.csproj | 46 +++++++++++++++++++++--------- 13 files changed, 169 insertions(+), 86 deletions(-) diff --git a/Build.Net45.bat b/Build.Net45.bat index 26a11e156..206aaef02 100644 --- a/Build.Net45.bat +++ b/Build.Net45.bat @@ -8,10 +8,10 @@ if not exist %fdir% ( set msbuild=%fdir%\v4.0.30319\msbuild.exe -%msbuild% SuperSocket.2012.sln /p:Configuration=Debug /t:Rebuild /p:OutputPath=..\bin\Net45\Debug +%msbuild% SuperSocket.2012.sln /p:Configuration=Debug /t:Clean;Rebuild /p:OutputPath=..\bin\Net45\Debug FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G" -%msbuild% SuperSocket.2012.sln /p:Configuration=Release /t:Rebuild /p:OutputPath=..\bin\Net45\Release +%msbuild% SuperSocket.2012.sln /p:Configuration=Release /t:Clean;Rebuild /p:OutputPath=..\bin\Net45\Release FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G" diff --git a/Build.bat b/Build.bat index a3a691041..d238f7f17 100644 --- a/Build.bat +++ b/Build.bat @@ -8,16 +8,16 @@ if not exist %fdir% ( set msbuild=%fdir%\v4.0.30319\msbuild.exe -%msbuild% SuperSocket.2010.sln /p:Configuration=Debug /t:Rebuild /p:OutputPath=..\bin\Net40\Debug +%msbuild% SuperSocket.2010.sln /p:Configuration=Debug /t:Clean;Rebuild /p:OutputPath=..\bin\Net40\Debug FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G" -%msbuild% SuperSocket.2010.sln /p:Configuration=Release /t:Rebuild /p:OutputPath=..\bin\Net40\Release +%msbuild% SuperSocket.2010.sln /p:Configuration=Release /t:Clean;Rebuild /p:OutputPath=..\bin\Net40\Release FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G" -%msbuild% SuperSocket.2010.NET35.sln /p:Configuration=Debug /t:Rebuild /p:OutputPath=..\bin\Net35\Debug +%msbuild% SuperSocket.2010.NET35.sln /p:Configuration=Debug /t:Clean;Rebuild /p:OutputPath=..\bin\Net35\Debug FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G" -%msbuild% SuperSocket.2010.NET35.sln /p:Configuration=Release /t:Rebuild /p:OutputPath=..\bin\Net35\Release +%msbuild% SuperSocket.2010.NET35.sln /p:Configuration=Release /t:Clean;Rebuild /p:OutputPath=..\bin\Net35\Release FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G" pause \ No newline at end of file diff --git a/SuperSocket.2010.NET35.sln b/SuperSocket.2010.NET35.sln index 6427b3fc3..6bb126808 100644 --- a/SuperSocket.2010.NET35.sln +++ b/SuperSocket.2010.NET35.sln @@ -36,36 +36,49 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + Test|Any CPU = Test|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B9113694-7226-4152-938D-3172B11571A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Debug|Any CPU.Build.0 = Debug|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Release|Any CPU.Build.0 = Release|Any CPU + {B9113694-7226-4152-938D-3172B11571A1}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {B9113694-7226-4152-938D-3172B11571A1}.Test|Any CPU.Build.0 = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Any CPU.ActiveCfg = Release|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Any CPU.Build.0 = Release|Any CPU + {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Test|Any CPU.Build.0 = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Any CPU.ActiveCfg = Release|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Any CPU.Build.0 = Release|Any CPU + {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Test|Any CPU.Build.0 = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Any CPU.Build.0 = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Any CPU.ActiveCfg = Release|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Any CPU.Build.0 = Release|Any CPU + {153FEF72-191C-43D9-BE71-2B351C7AC760}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {153FEF72-191C-43D9-BE71-2B351C7AC760}.Test|Any CPU.Build.0 = Debug|Any CPU {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Debug|Any CPU.Build.0 = Debug|Any CPU {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Release|Any CPU.Build.0 = Release|Any CPU + {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Test|Any CPU.Build.0 = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Any CPU.Build.0 = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Any CPU.ActiveCfg = Release|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Any CPU.Build.0 = Release|Any CPU + {01987BAC-C498-44DD-B274-62EA2506B51D}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {01987BAC-C498-44DD-B274-62EA2506B51D}.Test|Any CPU.Build.0 = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Release|Any CPU.ActiveCfg = Release|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Release|Any CPU.Build.0 = Release|Any CPU + {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Test|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SuperSocket.2010.sln b/SuperSocket.2010.sln index 1e10497c5..b5dd93ea9 100644 --- a/SuperSocket.2010.sln +++ b/SuperSocket.2010.sln @@ -36,36 +36,49 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + Test|Any CPU = Test|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B9113694-7226-4152-938D-3172B11571A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Debug|Any CPU.Build.0 = Debug|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Release|Any CPU.Build.0 = Release|Any CPU + {B9113694-7226-4152-938D-3172B11571A1}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {B9113694-7226-4152-938D-3172B11571A1}.Test|Any CPU.Build.0 = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Any CPU.ActiveCfg = Release|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Any CPU.Build.0 = Release|Any CPU + {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Test|Any CPU.Build.0 = Debug|Any CPU {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Debug|Any CPU.Build.0 = Debug|Any CPU {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Release|Any CPU.Build.0 = Release|Any CPU + {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Test|Any CPU.Build.0 = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Any CPU.ActiveCfg = Release|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Any CPU.Build.0 = Release|Any CPU + {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Test|Any CPU.Build.0 = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Any CPU.Build.0 = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Any CPU.ActiveCfg = Release|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Any CPU.Build.0 = Release|Any CPU + {153FEF72-191C-43D9-BE71-2B351C7AC760}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {153FEF72-191C-43D9-BE71-2B351C7AC760}.Test|Any CPU.Build.0 = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Any CPU.Build.0 = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Any CPU.ActiveCfg = Release|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Any CPU.Build.0 = Release|Any CPU + {01987BAC-C498-44DD-B274-62EA2506B51D}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {01987BAC-C498-44DD-B274-62EA2506B51D}.Test|Any CPU.Build.0 = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Release|Any CPU.ActiveCfg = Release|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Release|Any CPU.Build.0 = Release|Any CPU + {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Test|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SuperSocket.2012.NET40.sln b/SuperSocket.2012.NET40.sln index bf86f4521..c18e4cf1a 100644 --- a/SuperSocket.2012.NET40.sln +++ b/SuperSocket.2012.NET40.sln @@ -36,36 +36,49 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + Test|Any CPU = Test|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B9113694-7226-4152-938D-3172B11571A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Debug|Any CPU.Build.0 = Debug|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Release|Any CPU.Build.0 = Release|Any CPU + {B9113694-7226-4152-938D-3172B11571A1}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {B9113694-7226-4152-938D-3172B11571A1}.Test|Any CPU.Build.0 = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Any CPU.ActiveCfg = Release|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Any CPU.Build.0 = Release|Any CPU + {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Test|Any CPU.Build.0 = Debug|Any CPU {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Debug|Any CPU.Build.0 = Debug|Any CPU {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Release|Any CPU.Build.0 = Release|Any CPU + {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Test|Any CPU.Build.0 = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Any CPU.ActiveCfg = Release|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Any CPU.Build.0 = Release|Any CPU + {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Test|Any CPU.Build.0 = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Any CPU.Build.0 = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Any CPU.ActiveCfg = Release|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Any CPU.Build.0 = Release|Any CPU + {153FEF72-191C-43D9-BE71-2B351C7AC760}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {153FEF72-191C-43D9-BE71-2B351C7AC760}.Test|Any CPU.Build.0 = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Any CPU.Build.0 = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Any CPU.ActiveCfg = Release|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Any CPU.Build.0 = Release|Any CPU + {01987BAC-C498-44DD-B274-62EA2506B51D}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {01987BAC-C498-44DD-B274-62EA2506B51D}.Test|Any CPU.Build.0 = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Release|Any CPU.ActiveCfg = Release|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Release|Any CPU.Build.0 = Release|Any CPU + {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Test|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SuperSocket.2012.sln b/SuperSocket.2012.sln index 93e0137ca..47f4d0186 100644 --- a/SuperSocket.2012.sln +++ b/SuperSocket.2012.sln @@ -36,36 +36,49 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + Test|Any CPU = Test|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B9113694-7226-4152-938D-3172B11571A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Debug|Any CPU.Build.0 = Debug|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {B9113694-7226-4152-938D-3172B11571A1}.Release|Any CPU.Build.0 = Release|Any CPU + {B9113694-7226-4152-938D-3172B11571A1}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {B9113694-7226-4152-938D-3172B11571A1}.Test|Any CPU.Build.0 = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Any CPU.ActiveCfg = Release|Any CPU {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Release|Any CPU.Build.0 = Release|Any CPU + {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {A24F4D38-BA9C-4FD6-95B7-4980DE36131A}.Test|Any CPU.Build.0 = Debug|Any CPU {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Debug|Any CPU.Build.0 = Debug|Any CPU {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Release|Any CPU.Build.0 = Release|Any CPU + {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {BDBB6CE9-C3CE-49C1-A05E-2D7628430A02}.Test|Any CPU.Build.0 = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Any CPU.ActiveCfg = Release|Any CPU {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Release|Any CPU.Build.0 = Release|Any CPU + {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {40B77789-EA11-4C05-8F52-86711D7BCAAF}.Test|Any CPU.Build.0 = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Debug|Any CPU.Build.0 = Debug|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Any CPU.ActiveCfg = Release|Any CPU {153FEF72-191C-43D9-BE71-2B351C7AC760}.Release|Any CPU.Build.0 = Release|Any CPU + {153FEF72-191C-43D9-BE71-2B351C7AC760}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {153FEF72-191C-43D9-BE71-2B351C7AC760}.Test|Any CPU.Build.0 = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Debug|Any CPU.Build.0 = Debug|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Any CPU.ActiveCfg = Release|Any CPU {01987BAC-C498-44DD-B274-62EA2506B51D}.Release|Any CPU.Build.0 = Release|Any CPU + {01987BAC-C498-44DD-B274-62EA2506B51D}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {01987BAC-C498-44DD-B274-62EA2506B51D}.Test|Any CPU.Build.0 = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Release|Any CPU.ActiveCfg = Release|Any CPU {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Release|Any CPU.Build.0 = Release|Any CPU + {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {55BAA051-CE62-4D4A-81B6-68B042CC78E9}.Test|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Test/BootstrapTest.cs b/Test/BootstrapTest.cs index 51480e3dd..c50765772 100644 --- a/Test/BootstrapTest.cs +++ b/Test/BootstrapTest.cs @@ -35,7 +35,6 @@ private IConfigurationSource CreateBootstrap(string configFile) var fileMap = new ExeConfigurationFileMap(); var filePath = Path.Combine(@"Config", configFile); fileMap.ExeConfigFilename = filePath; - Setup.LoadConfigFileFromResource(filePath); var config = ConfigurationManager.OpenMappedExeConfiguration(fileMap, ConfigurationUserLevel.None); var configSource = config.GetSection("superSocket") as IConfigurationSource; diff --git a/Test/Config/Basic.config b/Test/Config/Basic.config index e3ce55b4f..ee0a9c54d 100644 --- a/Test/Config/Basic.config +++ b/Test/Config/Basic.config @@ -5,14 +5,15 @@ - - + - + diff --git a/Test/SecureTcpSocketServerTest.cs b/Test/SecureTcpSocketServerTest.cs index a63c448fd..489481a97 100644 --- a/Test/SecureTcpSocketServerTest.cs +++ b/Test/SecureTcpSocketServerTest.cs @@ -51,18 +51,6 @@ protected override Stream GetSocketStream(System.Net.Sockets.Socket socket) private bool ValidateRemoteCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) { - if (sslPolicyErrors != SslPolicyErrors.None) - { - Console.WriteLine("SSL Certificate Validation Error!"); - Console.WriteLine(sslPolicyErrors.ToString()); - Console.WriteLine("Chain status:"); - foreach (var s in chain.ChainStatus) - { - Console.WriteLine("\t" + s.Status + " : " + s.StatusInformation); - } - return false; - } - return true; } } diff --git a/Test/Setup.cs b/Test/Setup.cs index 33ee203b1..a26b07981 100644 --- a/Test/Setup.cs +++ b/Test/Setup.cs @@ -13,24 +13,6 @@ namespace SuperSocket.Test { public static class Setup { - public static void LoadConfigFileFromResource(string filePath) - { - var currentAssembly = typeof(Setup).Assembly; - var resourceName = currentAssembly.GetName().Name + "." + filePath.Replace(Path.DirectorySeparatorChar, '.'); - using (var stream = currentAssembly.GetManifestResourceStream(resourceName)) - { - var buffer = new byte[stream.Length]; - stream.Read(buffer, 0, buffer.Length); - - var dir = Path.GetDirectoryName(filePath); - - if (!string.IsNullOrEmpty(dir) && !Directory.Exists(dir)) - Directory.CreateDirectory(dir); - - File.WriteAllBytes(filePath, buffer); - } - } - public static string GetResourceContent(string fileName) { var currentAssembly = typeof(Setup).Assembly; diff --git a/Test/SuperSocket.Test.NET35.csproj b/Test/SuperSocket.Test.NET35.csproj index 99fb8fbea..0dae92077 100644 --- a/Test/SuperSocket.Test.NET35.csproj +++ b/Test/SuperSocket.Test.NET35.csproj @@ -109,8 +109,12 @@ - - + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -135,21 +139,38 @@ - - + + PreserveNewest + + Designer - - - + PreserveNewest + + + PreserveNewest + + + PreserveNewest + - - - - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + - + + PreserveNewest +