Skip to content

Commit 7ca8fb1

Browse files
codingadventurescodingadventures
committed
re categorize some unit tests to integration tests
1 parent 29781c5 commit 7ca8fb1

8 files changed

Lines changed: 28 additions & 40 deletions

File tree

‎Src/BridgeVs.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BridgeVs.DynamicVisualizer.
1111
EndProject
1212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BridgeVs.Build", "Build\BridgeVs.Build.csproj", "{276F3935-E0CA-450F-A55F-AED56DC2024E}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BridgeVs.Build.UnitTest", "..\Test\LINQBridgeVs.Test\BuildTasks.Test\BridgeVs.Build.UnitTest.csproj", "{5030F9B8-D21E-456D-8A92-F92567D11104}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BridgeVs.Build.IntegrationTest", "..\Test\LINQBridgeVs.Test\BuildTasks.Test\BridgeVs.Build.IntegrationTest.csproj", "{5030F9B8-D21E-456D-8A92-F92567D11104}"
1515
EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model.UnitTest", "..\Test\LINQBridgeVs.Test\Model.Test\Model.UnitTest.csproj", "{8A5E73F6-2093-4669-9C09-BEAB033BE56C}"
1717
EndProject
@@ -211,7 +211,7 @@ Global
211211
{DEECC213-180D-4C4E-A44B-5785F1C0FB73} = {EA910CEE-7C65-4583-8023-3447FED3E854}
212212
{07B00FDB-0426-4FAA-8C5E-DACDF7D03EDC} = {EA910CEE-7C65-4583-8023-3447FED3E854}
213213
{C6798D16-89F5-4BFF-8B62-2BE6D4BBC192} = {444AAEB8-BD13-4C6D-A906-984CAA695393}
214-
{5030F9B8-D21E-456D-8A92-F92567D11104} = {DEECC213-180D-4C4E-A44B-5785F1C0FB73}
214+
{5030F9B8-D21E-456D-8A92-F92567D11104} = {07B00FDB-0426-4FAA-8C5E-DACDF7D03EDC}
215215
{8A5E73F6-2093-4669-9C09-BEAB033BE56C} = {EA910CEE-7C65-4583-8023-3447FED3E854}
216216
{1B82F962-5D04-42B6-8D18-7AA8E8FB615F} = {D80D7CE8-68F4-4C7A-85C8-91179E86FA66}
217217
{DDF44401-F193-46B8-BA6C-A3DE88BAED46} = {DEECC213-180D-4C4E-A44B-5785F1C0FB73}

‎Src/Build/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
// You can specify all the values or you can default the Build and Revision Numbers
6161
// by using the '*' as shown below:
6262
// [assembly: AssemblyVersion("1.0.*")]
63-
[assembly: InternalsVisibleTo("BridgeVs.Build.UnitTest")]
63+
[assembly: InternalsVisibleTo("BridgeVs.Build.IntegrationTest")]
6464

6565
[assembly: AssemblyVersion("1.0.*")]
6666
[assembly: AssemblyFileVersion("1.0.0.0")]

Test/LINQBridgeVs.Test/BuildTasks.Test/BridgeVs.Build.UnitTest.csproj renamed to Test/LINQBridgeVs.Test/BuildTasks.Test/BridgeVs.Build.IntegrationTest.csproj

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<ProjectGuid>{5030F9B8-D21E-456D-8A92-F92567D11104}</ProjectGuid>
77
<OutputType>Library</OutputType>
88
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>BridgeVs.Build.UnitTest</RootNamespace>
10-
<AssemblyName>BridgeVs.Build.UnitTest</AssemblyName>
9+
<RootNamespace>BridgeVs.Build.IntegrationTest</RootNamespace>
10+
<AssemblyName>BridgeVs.Build.IntegrationTest</AssemblyName>
1111
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -37,7 +37,6 @@
3737
<Reference Include="Microsoft.VisualStudio.DebuggerVisualizers, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
3838
<HintPath>..\..\..\Src\packages\VSSDK.DebuggerVisualizers.11.0.4\lib\net20\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
3939
<Private>True</Private>
40-
<Private>False</Private>
4140
</Reference>
4241
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
4342
<HintPath>..\..\..\Src\packages\Mono.Cecil.0.9.6.4\lib\net40\Mono.Cecil.dll</HintPath>
@@ -52,23 +51,11 @@
5251
<HintPath>..\..\..\Src\packages\Mono.Cecil.0.9.6.4\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
5352
</Reference>
5453
<Reference Include="System" />
55-
<Reference Include="System.Core">
56-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
57-
</Reference>
5854
<Reference Include="System.Windows.Forms" />
5955
</ItemGroup>
60-
<Choose>
61-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
62-
<ItemGroup>
63-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
64-
</ItemGroup>
65-
</When>
66-
<Otherwise>
67-
<ItemGroup>
68-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
69-
</ItemGroup>
70-
</Otherwise>
71-
</Choose>
56+
<ItemGroup>
57+
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
58+
</ItemGroup>
7259
<ItemGroup>
7360
<Compile Include="SInjectionBuildTest.cs" />
7461
<Compile Include="MapperBuildTest.cs" />
@@ -109,7 +96,9 @@
10996
</ItemGroup>
11097
<ItemGroup>
11198
<None Include="app.config" />
112-
<None Include="packages.config" />
99+
<None Include="packages.config">
100+
<SubType>Designer</SubType>
101+
</None>
113102
</ItemGroup>
114103
<Choose>
115104
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">

‎Test/LINQBridgeVs.Test/BuildTasks.Test/CleanBuildTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
66
using Model.UnitTest;
77

8-
namespace BridgeVs.Build.UnitTest
8+
namespace BridgeVs.Build.IntegrationTest
99
{
1010
[TestClass]
1111
public class CleanBuildTest
@@ -29,7 +29,7 @@ public static void Init(TestContext context)
2929
}
3030

3131
[TestMethod]
32-
[TestCategory("UnitTest")]
32+
[TestCategory("IntegrationTest")]
3333
public void Clean_BuildTask_Test_V11_Should_Succeed()
3434
{
3535
const string vsVersion = "11.0";
@@ -55,7 +55,7 @@ public void Clean_BuildTask_Test_V11_Should_Succeed()
5555

5656

5757
[TestMethod]
58-
[TestCategory("UnitTest")]
58+
[TestCategory("IntegrationTest")]
5959
public void Clean_BuildTask_Test_V12_Should_Succeed()
6060
{
6161
const string vsVersion = "12.0";
@@ -79,7 +79,7 @@ public void Clean_BuildTask_Test_V12_Should_Succeed()
7979
}
8080

8181
[TestMethod]
82-
[TestCategory("UnitTest")]
82+
[TestCategory("IntegrationTest")]
8383
public void Clean_BuildTask_Test_V14_Should_Succeed()
8484
{
8585
const string vsVersion = "14.0";
@@ -104,7 +104,7 @@ public void Clean_BuildTask_Test_V14_Should_Succeed()
104104
}
105105

106106
[TestMethod]
107-
[TestCategory("UnitTest")]
107+
[TestCategory("IntegrationTest")]
108108
public void Clean_BuildTask_Test_V15_Should_Succeed()
109109
{
110110
const string vsVersion = "15.0";

‎Test/LINQBridgeVs.Test/BuildTasks.Test/MapperBuildTest.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@
2323
// OTHER DEALINGS IN THE SOFTWARE.
2424
#endregion
2525

26-
using System.Reflection;
26+
using System.IO;
2727
using BridgeVs.Build.Tasks;
2828
using BridgeVs.Build.Util;
2929
using Microsoft.VisualStudio.TestTools.UnitTesting;
3030
using Model.UnitTest;
31-
using System.IO;
3231

33-
namespace BridgeVs.Build.UnitTest
32+
namespace BridgeVs.Build.IntegrationTest
3433
{
3534
[TestClass]
3635
public class MapperBuildTest
@@ -97,7 +96,7 @@ public static void Cleanup()
9796
}
9897

9998
[TestMethod]
100-
[TestCategory("UnitTest")]
99+
[TestCategory("IntegrationTest")]
101100
public void Mapper_Build_Test_V11_Should_Succeed()
102101
{
103102
MapperBuildTask mapper = new MapperBuildTask
@@ -114,7 +113,7 @@ public void Mapper_Build_Test_V11_Should_Succeed()
114113
}
115114

116115
[TestMethod]
117-
[TestCategory("UnitTest")]
116+
[TestCategory("IntegrationTest")]
118117
public void Mapper_Build_Test_V12_Should_Succeed()
119118
{
120119
MapperBuildTask mapper = new MapperBuildTask
@@ -130,7 +129,7 @@ public void Mapper_Build_Test_V12_Should_Succeed()
130129
Assert.IsTrue(File.Exists(Path.Combine(TargetInstallationPath(VsVersion12), DotNetAssemblyName(VsVersion12))), $"DotNet Debugger Visualizer {DotNetAssemblyName(VsVersion12)} hasn't been created ");
131130
}
132131
[TestMethod]
133-
[TestCategory("UnitTest")]
132+
[TestCategory("IntegrationTest")]
134133
public void Mapper_Build_Test_V14_Should_Succeed()
135134
{
136135
MapperBuildTask mapper = new MapperBuildTask
@@ -147,7 +146,7 @@ public void Mapper_Build_Test_V14_Should_Succeed()
147146
Assert.IsTrue(File.Exists(Path.Combine(TargetInstallationPath(VsVersion14), DotNetAssemblyName(VsVersion14))), $"DotNet Debugger Visualizer {DotNetAssemblyName(VsVersion14)} hasn't been created ");
148147
}
149148
[TestMethod]
150-
[TestCategory("UnitTest")]
149+
[TestCategory("IntegrationTest")]
151150
public void Mapper_Build_Test_V15_Should_Succeed()
152151
{
153152
MapperBuildTask mapper = new MapperBuildTask

‎Test/LINQBridgeVs.Test/BuildTasks.Test/SInjectionBuildTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.VisualStudio.TestTools.UnitTesting;
44
using Model.UnitTest;
55

6-
namespace BridgeVs.Build.UnitTest
6+
namespace BridgeVs.Build.IntegrationTest
77
{
88
[TestClass]
99
public class SInjectionBuildTest

‎Test/LINQBridgeVs.Test/BuildTasks.Test/SomeTypes.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace BridgeVs.Build.UnitTest
1+
namespace BridgeVs.Build.IntegrationTest
22
{
33
public class TypeA { }
44
public class TypeB { }

‎Test/LINQBridgeVs.Test/BuildTasks.Test/VisualizerAttributeInjectorTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Microsoft.VisualStudio.TestTools.UnitTesting;
88
using Mono.Cecil;
99

10-
namespace BridgeVs.Build.UnitTest
10+
namespace BridgeVs.Build.IntegrationTest
1111
{
1212
[TestClass]
1313
public class VisualizerAttributeInjectorTest
@@ -23,7 +23,7 @@ public static void Init(TestContext context)
2323
}
2424

2525
[TestMethod]
26-
[TestCategory("UnitTest")]
26+
[TestCategory("IntegrationTest")]
2727
public void Visualizer_MapType_Should_Create_DegguberVisualizerAttribute_OfType_This_In_Target_Assembly()
2828
{
2929
string debuggerVisualizerTargetName = Path.Combine(_thisAssemblyDirectoryName, "TestA.dll");
@@ -43,7 +43,7 @@ public void Visualizer_MapType_Should_Create_DegguberVisualizerAttribute_OfType_
4343
}
4444

4545
[TestMethod]
46-
[TestCategory("UnitTest")]
46+
[TestCategory("IntegrationTest")]
4747
public void Visualizer_MapType_Should_Create_DegguberVisualizerAttribute_OfType_IList_In_Target_Assembly()
4848
{
4949
string debuggerVisualizerTargetName = Path.Combine(_thisAssemblyDirectoryName, "TestB.dll");
@@ -64,7 +64,7 @@ public void Visualizer_MapType_Should_Create_DegguberVisualizerAttribute_OfType_
6464

6565

6666
[TestMethod]
67-
[TestCategory("UnitTest")]
67+
[TestCategory("IntegrationTest")]
6868
public void Visualizer_MapTypeFromAssembly_Should_Map_All_Types()
6969
{
7070
string debuggerVisualizerTargetName = Path.Combine(_thisAssemblyDirectoryName, "TestC.dll");

0 commit comments

Comments
 (0)