Skip to content

Added project and item templates (#177) #181

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

Open
csoltenborn wants to merge 38 commits into
base: develop
Choose a base branch
from
Open

Added project and item templates (#177) #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c60ccbd
added Google Test project and item templates (#177)
csoltenborn Nov 10, 2017
25ffa5c
added wizard to select projects under test
csoltenborn Nov 11, 2017
80d923a
added project template for adding DLL project containing Google Test
csoltenborn Nov 12, 2017
48c61dd
SampleTests project wizard now reuses gtest DLL
csoltenborn Nov 12, 2017
5f23a5d
gtest DLL project template has own wizard now
csoltenborn Nov 13, 2017
12ed249
refactoring
csoltenborn Nov 13, 2017
0ec4c2e
project wizard can now deal with arbitrary names and locations of gte…
csoltenborn Nov 25, 2017
87129dd
ProjectTemplate now uses correct PublicKeyToken in release mode
csoltenborn Nov 25, 2017
46f2c6a
improvements to templates
csoltenborn Nov 26, 2017
5843b75
Merge branch 'develop' into #177_Templates
csoltenborn Dec 7, 2017
7e62ad8
Merge branch 'develop' into #177_Templates
csoltenborn Dec 9, 2017
ffce31e
Merge branch 'develop' into #177_Templates
csoltenborn Mar 9, 2018
f15655d
added template support for Google Mock
csoltenborn Mar 10, 2018
cbe3946
Merge branch 'develop' into #177_Templates
csoltenborn Mar 10, 2018
57fdd23
debugging build
csoltenborn Mar 10, 2018
86065c8
trying to fix CI build
csoltenborn Mar 10, 2018
3b6762b
added logging for template wizards
csoltenborn Mar 11, 2018
97a473e
wizard logging now respects VS options
csoltenborn Mar 12, 2018
9c13ae3
gtest dll template also uses existing cpp project to determine toolset
csoltenborn Mar 14, 2018
f07ade5
gtest project can be selected
csoltenborn Mar 24, 2018
0edafa9
Merge branch 'develop' into #177_Templates
csoltenborn Apr 24, 2018
acf6e20
Merge branch 'develop' into #177_Templates
csoltenborn May 10, 2018
a0e255c
Merge branch 'develop' into #177_Templates
csoltenborn Jun 22, 2018
cfd6769
Merge branch 'develop' into #177_Templates
csoltenborn Jul 2, 2018
d5d1071
Merge branch 'develop' into #177_Templates
csoltenborn Jul 14, 2018
6188ad5
Merge branch 'develop' into #177_Templates
csoltenborn Jul 17, 2018
adc2695
Merge branch 'develop' into #177_Templates
csoltenborn Jul 19, 2018
e84b560
Merge branch 'develop' into #177_Templates
csoltenborn Apr 28, 2019
3305083
updated gtest/gmock to 1.8.1
csoltenborn May 1, 2019
0a3ba3d
added missing project reference
csoltenborn May 1, 2019
cb2faae
added support for VS2019
csoltenborn May 1, 2019
0461668
all projects are offered as gtest projects
csoltenborn May 1, 2019
8d0c101
gtest project can be created as dynamic or static library
csoltenborn May 1, 2019
1fd3b19
Google Mock is now optional
csoltenborn May 2, 2019
0a325cb
Merge branch 'develop' into #177_Templates
csoltenborn May 5, 2019
2b1192d
Merge branch 'develop' into #177_Templates
csoltenborn Oct 19, 2019
7a806ff
proper main.cpp is generated in case gmock is not included in gtest p…
csoltenborn Nov 2, 2019
c22cf46
Merge branch 'develop' into #177_Templates
csoltenborn Mar 1, 2020
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
4 changes: 2 additions & 2 deletions GoogleTestAdapter/Core/Resources/GTA_Traits_1.8.0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
__VA_ARGS__)


# define TYPED_TEST_TRAITS(CaseName, TestName, ...) \
#define TYPED_TEST_TRAITS(CaseName, TestName, ...) \
template <typename gtest_TypeParam_> \
class GTEST_TEST_CLASS_NAME_(CaseName, TestName) \
: public CaseName<gtest_TypeParam_> { \
Expand All @@ -168,7 +168,7 @@ void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
void GTEST_TEST_CLASS_NAME_(CaseName, TestName)<gtest_TypeParam_>::TestBody()


# define TYPED_TEST_P_TRAITS(CaseName, TestName, ...) \
#define TYPED_TEST_P_TRAITS(CaseName, TestName, ...) \
namespace GTEST_CASE_NAMESPACE_(CaseName) { \
template <typename gtest_TypeParam_> \
class TestName : public CaseName<gtest_TypeParam_> { \
Expand Down
46 changes: 46 additions & 0 deletions GoogleTestAdapter/GoogleTestAdapter.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DllTests", "..\SampleTests\DllDependentProject\DllDependentProject.vcxproj", "{2E3221EB-86DA-427D-84EC-DEFD3F966D9A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Packaging.GTA", "Packaging.GTA\Packaging.GTA.csproj", "{4735D8CC-FA30-432D-854C-2984A7DA5DD2}"
ProjectSection(ProjectDependencies) = postProject
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689} = {6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}
{08615BA7-8C16-49C5-84EA-85EB16D60FAA} = {08615BA7-8C16-49C5-84EA-85EB16D60FAA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SemaphoreExe", "SemaphoreExe\SemaphoreExe.vcxproj", "{F48AD2EC-96B3-41C6-9F89-3542EC7A3D43}"
EndProject
Expand Down Expand Up @@ -144,6 +148,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FakeGtestDllApplication", "
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FakeGtestDllApplication-x64", "FakeGtestDll\FakeGtestDllApplication-x64.vcxproj", "{05C435E1-603C-4402-B28C-E54932F3131C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectTemplate_GTA", "ProjectTemplate_GTA\ProjectTemplate_GTA.csproj", "{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewProjectWizard.GTA", "NewProjectWizard.GTA\NewProjectWizard.GTA.csproj", "{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectTemplate.GTA.GoogleTest", "ProjectTemplate.GTA.GoogleTest\ProjectTemplate.GTA.GoogleTest.csproj", "{08615BA7-8C16-49C5-84EA-85EB16D60FAA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{883EFE71-6B36-4813-B1DB-80D9B972B8D5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Donations", "Donations", "{58B6EF41-D226-40A9-A959-0543270D572F}"
Expand Down Expand Up @@ -603,6 +613,42 @@ Global
{8067A10E-AEBA-4C92-AC17-7D8526E91E58}.Release|x64.Build.0 = Release|x64
{8067A10E-AEBA-4C92-AC17-7D8526E91E58}.Release|x86.ActiveCfg = Release|Win32
{8067A10E-AEBA-4C92-AC17-7D8526E91E58}.Release|x86.Build.0 = Release|Win32
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Debug|x64.ActiveCfg = Debug|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Debug|x64.Build.0 = Debug|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Debug|x86.ActiveCfg = Debug|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Debug|x86.Build.0 = Debug|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Release|Any CPU.Build.0 = Release|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Release|x64.ActiveCfg = Release|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Release|x64.Build.0 = Release|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Release|x86.ActiveCfg = Release|Any CPU
{6025D96C-B1A8-4E30-8FD7-5E0A88C6D689}.Release|x86.Build.0 = Release|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Debug|x64.ActiveCfg = Debug|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Debug|x64.Build.0 = Debug|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Debug|x86.ActiveCfg = Debug|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Debug|x86.Build.0 = Debug|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Release|Any CPU.Build.0 = Release|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Release|x64.ActiveCfg = Release|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Release|x64.Build.0 = Release|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Release|x86.ActiveCfg = Release|Any CPU
{AC5C0BF4-A5CB-4445-B5DD-6F43F8F0C726}.Release|x86.Build.0 = Release|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Debug|x64.ActiveCfg = Debug|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Debug|x64.Build.0 = Debug|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Debug|x86.ActiveCfg = Debug|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Debug|x86.Build.0 = Debug|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Release|Any CPU.Build.0 = Release|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Release|x64.ActiveCfg = Release|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Release|x64.Build.0 = Release|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Release|x86.ActiveCfg = Release|Any CPU
{08615BA7-8C16-49C5-84EA-85EB16D60FAA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 1 addition & 0 deletions GoogleTestAdapter/NewProjectWizard.GTA/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Key.snk
185 changes: 185 additions & 0 deletions GoogleTestAdapter/NewProjectWizard.GTA/CreateGtestProjectDialog.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 65 additions & 0 deletions GoogleTestAdapter/NewProjectWizard.GTA/CreateGtestProjectDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using NewProjectWizard.GTA.Helpers;

namespace NewProjectWizard.GTA
{
public partial class CreateGtestProjectDialog : Form
{
private class Item
{
public ProjectExtensions.ConfigurationType ConfigurationType { get; }

public Item(ProjectExtensions.ConfigurationType configurationType)
{
ConfigurationType = configurationType;
}

public override string ToString()
{
switch (ConfigurationType)
{
case ProjectExtensions.ConfigurationType.Static:
return "Static (.lib)";
case ProjectExtensions.ConfigurationType.Dynamic:
return "Dynamic (.dll)";
default:
throw new InvalidOperationException($"Unknown literal {ConfigurationType}");
}
}
}

public ProjectExtensions.ConfigurationType ConfigurationType
{
get => ((Item)gtestProjectComboBox.SelectedItem).ConfigurationType;
set => gtestProjectComboBox.SelectedItem = _configurationTypes2Items[value];
}

public bool IncludeGoogleMock
{
get => includeGoogleMockCheckBox.Checked;
set => includeGoogleMockCheckBox.Checked = value;
}

private readonly IDictionary<ProjectExtensions.ConfigurationType, Item> _configurationTypes2Items = new Dictionary<ProjectExtensions.ConfigurationType, Item>();

public CreateGtestProjectDialog()
{
InitializeComponent();

foreach (ProjectExtensions.ConfigurationType configurationType in Enum.GetValues(typeof(ProjectExtensions.ConfigurationType)))
{
var item = new Item(configurationType);
_configurationTypes2Items.Add(configurationType, item);
gtestProjectComboBox.Items.Add(item);
}
}

private void okButton_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
Close();
}
}
}
Loading