Skip to content

Commit 54a27a1

Browse files
stgatesstgates
committed
Some fixes for websocket winrt tests to move over to using WebSocket++ as test server.
1 parent 40ce666 commit 54a27a1

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

‎Release/tests/Functional/websockets/client/authentication_tests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace tests { namespace functional { namespace websocket { namespace client
3737
SUITE(authentication_tests)
3838
{
3939

40-
void auth_helper(test_websocket_server& server, utility::string_t username = U(""), utility::string_t password = U(""))
40+
void auth_helper(test_websocket_server& server, const utility::string_t &username = U(""), const utility::string_t &password = U(""))
4141
{
4242
server.set_http_handler([username, password](test_http_request& request)
4343
{
@@ -61,7 +61,7 @@ void auth_helper(test_websocket_server& server, utility::string_t username = U("
6161
}
6262

6363
// connect without credentials, when the server expects credentials
64-
TEST_FIXTURE(uri_address, auth_no_credentials, "Ignore:Linux", "NYI", "Ignore:Apple", "NYI")
64+
TEST_FIXTURE(uri_address, auth_no_credentials, "Ignore", "245", "Ignore:Linux", "NYI", "Ignore:Apple", "NYI")
6565
{
6666
test_websocket_server server;
6767
websocket_client client;
@@ -70,7 +70,7 @@ TEST_FIXTURE(uri_address, auth_no_credentials, "Ignore:Linux", "NYI", "Ignore:Ap
7070
}
7171

7272
// Connect with credentials
73-
TEST_FIXTURE(uri_address, auth_with_credentials, "Ignore:Linux", "NYI", "Ignore:Apple", "NYI")
73+
TEST_FIXTURE(uri_address, auth_with_credentials, "Ignore", "245", "Ignore:Linux", "NYI", "Ignore:Apple", "NYI")
7474
{
7575
test_websocket_server server;
7676
websocket_client_config config;

‎Release/tests/Functional/websockets/client/proxy_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ TEST_FIXTURE(uri_address, no_proxy_options_on_winrt)
4242
{
4343
websocket_client_config config;
4444
config.set_proxy(web::web_proxy::use_auto_discovery);
45-
websocket_client client(m_uri, config);
46-
VERIFY_THROWS(client.connect().wait(), websocket_exception);
45+
websocket_client client(config);
46+
VERIFY_THROWS(client.connect(m_uri).wait(), websocket_exception);
4747
}
4848
#endif
4949

‎Release/tests/Functional/websockets/dirs.proj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
44

5-
<ProjectFile Include="utilities\dirs.proj"/>
6-
<ProjectFile Include="client\dirs.proj"/>
5+
<ItemGroup>
6+
<ProjectFile Include="utilities\dirs.proj"/>
7+
<ProjectFile Include="client\dirs.proj"/>
8+
</ItemGroup>
79

810
<Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
911

‎Release/tests/Functional/websockets/utilities/VS11.winrt/websockets_test_utilities110.winrt.vcxproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<PrecompiledHeader>Use</PrecompiledHeader>
6767
<Optimization>Disabled</Optimization>
6868
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBSOCKETTESTUTILITY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
69-
<AdditionalIncludeDirectories>..\$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
69+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);$(WebsocketppIncludeDir);..\include</AdditionalIncludeDirectories>
7070
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
7171
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
7272
<CompileAsWinRT>true</CompileAsWinRT>
@@ -84,7 +84,7 @@
8484
<PrecompiledHeader>Use</PrecompiledHeader>
8585
<Optimization>Disabled</Optimization>
8686
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBSOCKETTESTUTILITY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
87-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
87+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);$(WebsocketppIncludeDir);..\include</AdditionalIncludeDirectories>
8888
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
8989
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
9090
<CompileAsWinRT>true</CompileAsWinRT>
@@ -104,7 +104,7 @@
104104
<FunctionLevelLinking>true</FunctionLevelLinking>
105105
<IntrinsicFunctions>true</IntrinsicFunctions>
106106
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBSOCKETTESTUTILITY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
107+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);$(WebsocketppIncludeDir);..\include</AdditionalIncludeDirectories>
108108
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
109109
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
110110
<CompileAsWinRT>true</CompileAsWinRT>
@@ -126,7 +126,7 @@
126126
<FunctionLevelLinking>true</FunctionLevelLinking>
127127
<IntrinsicFunctions>true</IntrinsicFunctions>
128128
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBSOCKETTESTUTILITY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
129-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include</AdditionalIncludeDirectories>
129+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);$(WebsocketppIncludeDir);..\include</AdditionalIncludeDirectories>
130130
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
131131
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
132132
<CompileAsWinRT>true</CompileAsWinRT>
@@ -167,5 +167,12 @@
167167
</ItemGroup>
168168
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
169169
<ImportGroup Label="ExtensionTargets">
170+
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
171+
<Import Project="$(PackagesRoot)\boost_system-vc110.1.55.0.16\build\native\boost_system-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc110.1.55.0.16\build\native\boost_system-vc110.targets')" />
172+
<Import Project="$(PackagesRoot)\boost_date_time-vc110.1.55.0.16\build\native\boost_date_time-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc110.1.55.0.16\build\native\boost_date_time-vc110.targets')" />
173+
<Import Project="$(PackagesRoot)\boost_regex-vc110.1.55.0.16\build\native\boost_regex-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc110.1.55.0.16\build\native\boost_regex-vc110.targets')" />
174+
<Import Project="$(PackagesRoot)\boost_thread-vc110.1.55.0.16\build\native\boost_thread-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_thread-vc110.1.55.0.16\build\native\boost_thread-vc110.targets')" />
175+
<Import Project="$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets')" />
176+
<Import Project="$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets')" />
170177
</ImportGroup>
171178
</Project>

‎Release/tests/Functional/websockets/utilities/vs11/websockets_test_utilities110.vcxproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,6 @@
9090
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9191
</Link>
9292
</ItemDefinitionGroup>
93-
<!-- If testing against a VS installation, need to include the libs. -->
94-
<ItemDefinitionGroup Condition="'$(BuildAgainstVSInstallation)'!=''">
95-
<Link>
96-
<AdditionalLibraryDirectories>$(CasablancaVSLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
97-
</Link>
98-
<Link>
99-
<GenerateDebugInformation>true</GenerateDebugInformation>
100-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
101-
</Link>
102-
</ItemDefinitionGroup>
10393
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
10494
<ClCompile>
10595
<Optimization>Disabled</Optimization>

0 commit comments

Comments
 (0)