diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 06:02:56 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 06:02:56 +0000 |
| commit | 5290aaa39b51aa27d3f64fba3bc5fff6a08e3a26 (patch) | |
| tree | 3d8b2b8c80612b8c4f5666ab9bb4fb0f4440cb02 /chrome | |
| parent | 6718396a176de7efdab274a06df93dcd03d84088 (diff) | |
| download | chromium_src-5290aaa39b51aa27d3f64fba3bc5fff6a08e3a26.zip chromium_src-5290aaa39b51aa27d3f64fba3bc5fff6a08e3a26.tar.gz chromium_src-5290aaa39b51aa27d3f64fba3bc5fff6a08e3a26.tar.bz2 | |
Retry to checkin a version of gmock, modified to use our boost_tuple in VS2005.
This checkin adds gmock, and a small example of how to write a gmock-based unittest.
Original Review URL: http://codereview.chromium.org/113807
Review URL: http://codereview.chromium.org/115846
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.sln | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/chrome/chrome.sln b/chrome/chrome.sln index 887b0c4..65ada5c 100644 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -657,6 +657,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base_unittests", "..\base\b {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} {C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD} {CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D} + {F9D886ED-B09F-4B74-932F-D8E4691E6B7F} = {F9D886ED-B09F-4B74-932F-D8E4691E6B7F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_tests", "test\plugin\plugin_tests.vcproj", "{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}" @@ -1644,6 +1645,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_common", "..\web EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utility", "utility\utility.vcproj", "{4D2B38E6-65FF-4F97-B88A-E441DF54EBF7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\testing\gmock.vcproj", "{F9D886ED-B09F-4B74-932F-D8E4691E6B7F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmockmain", "..\testing\gmockmain.vcproj", "{1B231A30-92B6-A027-DDBA-A0682336765E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_unittests", "..\app\app_unittests.vcproj", "{B4D59AE8-8D2F-97E1-A8E9-6D2826729530}" ProjectSection(ProjectDependencies) = postProject @@ -1765,6 +1769,14 @@ Global {1846F110-8263-413F-9924-36F64DD8FE41}.Release|Mixed Platforms.Build.0 = Release|Win32 {1846F110-8263-413F-9924-36F64DD8FE41}.Release|Win32.ActiveCfg = Release|Win32 {1846F110-8263-413F-9924-36F64DD8FE41}.Release|Win32.Build.0 = Release|Win32 + {1B231A30-92B6-A027-DDBA-A0682336765E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {1B231A30-92B6-A027-DDBA-A0682336765E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {1B231A30-92B6-A027-DDBA-A0682336765E}.Debug|Win32.ActiveCfg = Debug|Win32 + {1B231A30-92B6-A027-DDBA-A0682336765E}.Debug|Win32.Build.0 = Debug|Win32 + {1B231A30-92B6-A027-DDBA-A0682336765E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {1B231A30-92B6-A027-DDBA-A0682336765E}.Release|Mixed Platforms.Build.0 = Release|Win32 + {1B231A30-92B6-A027-DDBA-A0682336765E}.Release|Win32.ActiveCfg = Release|Win32 + {1B231A30-92B6-A027-DDBA-A0682336765E}.Release|Win32.Build.0 = Release|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -3063,6 +3075,14 @@ Global {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Mixed Platforms.Build.0 = Release|Win32 {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.ActiveCfg = Release|Win32 {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.Build.0 = Release|Win32 + {F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Debug|Win32.ActiveCfg = Debug|Win32 + {F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Debug|Win32.Build.0 = Debug|Win32 + {F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Release|Mixed Platforms.Build.0 = Release|Win32 + {F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Release|Win32.ActiveCfg = Release|Win32 + {F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Release|Win32.Build.0 = Release|Win32 {FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -3118,6 +3138,7 @@ Global {1832A374-8A74-4F9E-B536-69A699B3E165} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {1846F110-8263-413F-9924-36F64DD8FE41} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {1AFC1EC3-24FA-4260-B099-76319EC9977A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} + {1B231A30-92B6-A027-DDBA-A0682336765E} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} {21C76E6E-8B38-44D6-8148-B589C13B9554} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B} {21E22961-22BF-4493-BD3A-868F93DA5179} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE} @@ -3274,6 +3295,7 @@ Global {F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {F7790A54-4078-4E4A-8231-818BE9FB1F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} + {F9D886ED-B09F-4B74-932F-D8E4691E6B7F} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} {FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4} |