Skip to content

Fix tests when GTA isnt built with the sln #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spebl merged 3 commits into from
Aug 28, 2017
Merged

Fix tests when GTA isnt built with the sln #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63a5268
add nuget command line to a tafgt projects packages config so it gets…
spebl Aug 17, 2017
302f940
change gta to tafgt to see if it fixes tets runs
spebl Aug 18, 2017
c164120
template abstract console integration tests to work when only tafgt i…
spebl Aug 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...Common/AbstractConsoleIntegrationTests.cs → ...mon/AbstractConsoleIntegrationTests.cs.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
// This file has been modified by Microsoft on 6/2017.
<#@ template language="c#" hostspecific="true" #>
<#@ output extension=".cs" #>
<#@ parameter type="System.String" name="TestAdapterFlavor" #>
// This file has been modified by Microsoft on 8/2017.

using System.Collections.Generic;
using System.IO;
Expand Down Expand Up @@ -44,7 +47,11 @@ public static void GetDirectories(out string testAdapterDir, out string testSolu
match.Success.Should().BeTrue();
string binariesPath = match.Groups[1].Value;
string debugOrRelease = match.Groups[2].Value;
<# if (TestAdapterFlavor == "GTA") { #>
testAdapterDir = Path.Combine(binariesPath, "GoogleTestAdapter", debugOrRelease, "Packaging.GTA");
<# } else if (TestAdapterFlavor == "TAfGT") { #>
testAdapterDir = Path.Combine(binariesPath, "GoogleTestAdapter", debugOrRelease, "Packaging.TAfGT");
<# } #>
testSolutionFile = Path.Combine(binariesPath, @"..\..\SampleTests\SampleTests.sln");
}

Expand Down
1 change: 1 addition & 0 deletions GoogleTestAdapter/VsPackage.TAfGT/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net45" developmentDependency="true" />
<package id="Microsoft.TestPlatform.ObjectModel" version="15.0.1" targetFramework="net46" />
<package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="15.0.26510-d15rel" targetFramework="net46" />
<package id="NuGet.CommandLine" version="3.5.0" targetFramework="net46" developmentDependency="true" />
</packages>
4 changes: 4 additions & 0 deletions ResolveTTs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<Generator>TextTemplatingFileGenerator</Generator>
<OutputFileName>app.config</OutputFileName>
</Content>
<Content Include="GoogleTestAdapter\Tests.Common\AbstractConsoleIntegrationTests.cs.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<OutputFileName>AbstractConsoleIntegrationTests.cs</OutputFileName>
</Content>
<Content Include="GoogleTestAdapter\VsPackage.GTA.Tests.Unit\app.config.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<OutputFileName>app.config</OutputFileName>
Expand Down