Commit e012aef8 e012aef86d06d1f8cd603bfe0e0386ae2ad57d33 by Christian Gerdes

Merge

2 parents e385b4dc 54604b8a
1  1 
2 Microsoft Visual Studio Solution File, Format Version 12.00 2 Microsoft Visual Studio Solution File, Format Version 12.00
3 # Visual Studio 14 3 # Visual Studio 14
4 VisualStudioVersion = 14.0.24720.0 4 VisualStudioVersion = 14.0.25420.1
5 MinimumVisualStudioVersion = 10.0.40219.1 5 MinimumVisualStudioVersion = 10.0.40219.1
6 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8ADAFB91-C10D-42C8-8499-30B3692C27F3}" 6 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8ADAFB91-C10D-42C8-8499-30B3692C27F3}"
7 ProjectSection(SolutionItems) = preProject 7 ProjectSection(SolutionItems) = preProject
...@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ...@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
10 Local.testsettings = Local.testsettings 10 Local.testsettings = Local.testsettings
11 Notes.md = Notes.md 11 Notes.md = Notes.md
12 README.md = README.md 12 README.md = README.md
13 WIN-62BJ8PRQ3MQ.testsettings = WIN-62BJ8PRQ3MQ.testsettings
13 EndProjectSection 14 EndProjectSection
14 EndProject 15 EndProject
15 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LIL_VSTT_Plugins", "LIL_VSTT_Plugins\LIL_VSTT_Plugins.csproj", "{06A22593-601E-4386-917A-9835DE30E14E}" 16 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LIL_VSTT_Plugins", "LIL_VSTT_Plugins\LIL_VSTT_Plugins.csproj", "{06A22593-601E-4386-917A-9835DE30E14E}"
......
...@@ -86,6 +86,9 @@ ...@@ -86,6 +86,9 @@
86 <None Include="LoadTest4.loadtest"> 86 <None Include="LoadTest4.loadtest">
87 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 87 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
88 </None> 88 </None>
89 <None Include="LoadTest6.loadtest">
90 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
91 </None>
89 <None Include="WebTest2.webtest"> 92 <None Include="WebTest2.webtest">
90 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 93 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
91 </None> 94 </None>
...@@ -113,6 +116,9 @@ ...@@ -113,6 +116,9 @@
113 <None Include="WebTest1.webtest"> 116 <None Include="WebTest1.webtest">
114 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 117 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
115 </None> 118 </None>
119 <None Include="WebTest7.webtest">
120 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
121 </None>
116 </ItemGroup> 122 </ItemGroup>
117 <ItemGroup> 123 <ItemGroup>
118 <ProjectReference Include="..\LIL_VSTT_Plugins\LIL_VSTT_Plugins.csproj"> 124 <ProjectReference Include="..\LIL_VSTT_Plugins\LIL_VSTT_Plugins.csproj">
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <WebTest Name="WebTest2" Id="97416298-3dc2-4f16-a28f-75470ee03ec8" Owner="" Priority="2147483647" Enabled="True" CssProjectStructure="" CssIteration="" Timeout="0" WorkItemIds="" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010" Description="" CredentialUserName="" CredentialPassword="" PreAuthenticate="True" Proxy="default" StopOnError="False" RecordedResultFile="" ResultsLocale=""> 2 <WebTest Name="WebTest2" Id="97416298-3dc2-4f16-a28f-75470ee03ec8" Owner="" Priority="2147483647" Enabled="True" CssProjectStructure="" CssIteration="" Timeout="0" WorkItemIds="" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010" Description="" CredentialUserName="" CredentialPassword="" PreAuthenticate="True" Proxy="default" StopOnError="False" RecordedResultFile="" ResultsLocale="">
3 <Items> 3 <Items>
4 <Request Method="GET" Guid="b9a8ca3a-ceb3-4531-b567-9ee2dbd79c10" Version="1.1" Url="https://ort-api-20.test.minpension.se/medborgare/197503140555" ThinkTime="0" Timeout="300" ParseDependentRequests="True" FollowRedirects="True" RecordResult="True" Cache="False" ResponseTimeGoal="0" Encoding="utf-8" ExpectedHttpStatusCode="0" ExpectedResponseUrl="" ReportingName="" IgnoreHttpStatusCode="False" /> 4 <Request Method="GET" Guid="b9a8ca3a-ceb3-4531-b567-9ee2dbd79c10" Version="1.1" Url="https://ort-api.dev.minpension.se/medborgare/197503140555" ThinkTime="0" Timeout="300" ParseDependentRequests="True" FollowRedirects="True" RecordResult="True" Cache="False" ResponseTimeGoal="0" Encoding="utf-8" ExpectedHttpStatusCode="0" ExpectedResponseUrl="" ReportingName="" IgnoreHttpStatusCode="False" />
5 </Items> 5 </Items>
6 <WebTestPlugins> 6 <WebTestPlugins>
7 <WebTestPlugin Classname="LIL_VSTT_Plugins.ClientCertificatePlugin, LIL_VSTT_Plugins, Version=1.3.0.0, Culture=neutral, PublicKeyToken=null" DisplayName="Client Certificate" Description="(C) Copyright 2016 LIGHTS IN LINE AB&#xD;&#xA;Sätter webtestet att använda ett specifikt client cert för SSL. Certifikatet installeras automatiskt i Windows User Certificate Store."> 7 <WebTestPlugin Classname="LIL_VSTT_Plugins.ClientCertificatePlugin, LIL_VSTT_Plugins, Version=1.3.0.0, Culture=neutral, PublicKeyToken=null" DisplayName="Client Certificate" Description="(C) Copyright 2016 LIGHTS IN LINE AB&#xD;&#xA;Sätter webtestet att använda ett specifikt client cert för SSL. Certifikatet installeras automatiskt i Windows User Certificate Store.">
8 <RuleParameters> 8 <RuleParameters>
9 <RuleParameter Name="pCertificatePath" Value="C:\Temp\lightsinline_cert_key.pem" /> 9 <RuleParameter Name="pCertificatePath" Value="C:\Temp\lightsinline.pfx" />
10 <RuleParameter Name="pCertificatePathParameter" Value="" /> 10 <RuleParameter Name="pCertificatePathParameter" Value="" />
11 <RuleParameter Name="pCertificatePassword" Value="" /> 11 <RuleParameter Name="pCertificatePassword" Value="ensfyr" />
12 <RuleParameter Name="pCertificatePasswordParameter" Value="" /> 12 <RuleParameter Name="pCertificatePasswordParameter" Value="" />
13 <RuleParameter Name="pDebug" Value="False" /> 13 <RuleParameter Name="pDebug" Value="False" />
14 <RuleParameter Name="pInstallTrusted" Value="True" /> 14 <RuleParameter Name="pInstallTrusted" Value="True" />
......
1 <?xml version="1.0" encoding="utf-8"?>
2 <WebTest Name="WebTest7" Id="b81f6de6-5ea8-4211-ac7b-3c0272942501" Owner="" Priority="2147483647" Enabled="True" CssProjectStructure="" CssIteration="" Timeout="0" WorkItemIds="" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010" Description="" CredentialUserName="" CredentialPassword="" PreAuthenticate="True" Proxy="default" StopOnError="False" RecordedResultFile="" ResultsLocale="">
3 <Items>
4 <Request Method="GET" Guid="3d1817e4-021d-4bfc-b6d7-dfd8ffa7febf" Version="1.1" Url="https://www.lightsinline.se/" ThinkTime="0" Timeout="300" ParseDependentRequests="False" FollowRedirects="True" RecordResult="True" Cache="False" ResponseTimeGoal="0" Encoding="utf-8" ExpectedHttpStatusCode="0" ExpectedResponseUrl="" ReportingName="" IgnoreHttpStatusCode="False" />
5 </Items>
6 </WebTest>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <TestSettings name="WIN-62BJ8PRQ3MQ" id="99c45dea-8316-4172-81f8-090cfba87c3f" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
3 <Description>These are default test settings for a local test run.</Description>
4 <Deployment>
5 <DeploymentItem filename="TestProject1\Userdata.csv" />
6 </Deployment>
7 <RemoteController name="WIN-62BJ8PRQ3MQ.home" />
8 <Execution location="Remote" hostProcessPlatform="MSIL">
9 <TestTypeSpecific>
10 <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
11 <AssemblyResolution>
12 <TestDirectory useLoadContext="true" />
13 </AssemblyResolution>
14 </UnitTestRunConfig>
15 <WebTestRunConfiguration testTypeId="4e7599fa-5ecb-43e9-a887-cd63cf72d207">
16 <Browser name="Internet Explorer 9.0" MaxConnections="6">
17 <Headers>
18 <Header name="User-Agent" value="Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)" />
19 <Header name="Accept" value="*/*" />
20 <Header name="Accept-Language" value="{{$IEAcceptLanguage}}" />
21 <Header name="Accept-Encoding" value="GZIP" />
22 </Headers>
23 </Browser>
24 </WebTestRunConfiguration>
25 </TestTypeSpecific>
26 <AgentRule name="AllAgentsDefaultRole">
27 </AgentRule>
28 </Execution>
29 <Properties />
30 </TestSettings>
...\ No newline at end of file ...\ No newline at end of file