OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 namespace UnitTests | 5 namespace UnitTests |
6 { | 6 { |
7 using System; | 7 using System; |
8 using System.IO; | 8 using System.IO; |
9 | 9 |
10 using EnvDTE; | 10 using EnvDTE; |
11 using EnvDTE80; | 11 using EnvDTE80; |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 TestUtilities.CleanUpVisualStudioInstance(dte_); | 101 TestUtilities.CleanUpVisualStudioInstance(dte_); |
102 } | 102 } |
103 | 103 |
104 /// <summary> | 104 /// <summary> |
105 /// Test method which verifies that NaCl and pepper platforms have correct d
efault properties | 105 /// Test method which verifies that NaCl and pepper platforms have correct d
efault properties |
106 /// when initialized from the Win32 platform. | 106 /// when initialized from the Win32 platform. |
107 /// </summary> | 107 /// </summary> |
108 [TestMethod] | 108 [TestMethod] |
109 public void VerifySettingsWin32Initialization() | 109 public void VerifySettingsWin32Initialization() |
110 { | 110 { |
| 111 if (TestUtilities.IsVS2012()) |
| 112 { |
| 113 // TODO(sbc): This test is unreliable under VS2012. http://crbug.com/246
253 |
| 114 Assert.Inconclusive(); |
| 115 } |
111 string solutionWin32Initialization = TestUtilities.CreateBlankValidNaClSol
ution( | 116 string solutionWin32Initialization = TestUtilities.CreateBlankValidNaClSol
ution( |
112 dte_, "ProjectSettingsTestWin32Init", "Win32", "Win32", TestContext)
; | 117 dte_, "ProjectSettingsTestWin32Init", "Win32", "Win32", TestContext)
; |
113 VerifyDefaultPepperSettings(solutionWin32Initialization); | 118 VerifyDefaultPepperSettings(solutionWin32Initialization); |
114 VerifyDefaultNaClSettings(solutionWin32Initialization); | 119 VerifyDefaultNaClSettings(solutionWin32Initialization); |
115 | 120 |
116 // Win32 inherit specific checks on the Pepper platform. | 121 // Win32 inherit specific checks on the Pepper platform. |
117 OpenSolutionAndGetProperties(solutionWin32Initialization, Strings.PepperPl
atformName); | 122 OpenSolutionAndGetProperties(solutionWin32Initialization, Strings.PepperPl
atformName); |
118 | 123 |
119 // When inheriting from Win32 preprocessor the PPAPI preprocessor definiti
on gets grouped | 124 // When inheriting from Win32 preprocessor the PPAPI preprocessor definiti
on gets grouped |
120 // into the inherited %(PreprocessorDefinitions) variable. It still exists
but doesn't appear | 125 // into the inherited %(PreprocessorDefinitions) variable. It still exists
but doesn't appear |
(...skipping 14 matching lines...) Expand all Loading... |
135 } | 140 } |
136 | 141 |
137 /// <summary> | 142 /// <summary> |
138 /// Test method which verifies that the NaCl platform has correct default pr
operties | 143 /// Test method which verifies that the NaCl platform has correct default pr
operties |
139 /// when initialized from the Pepper platform. And that the pepper platform
has the correct | 144 /// when initialized from the Pepper platform. And that the pepper platform
has the correct |
140 /// settings when initialized from the 'empty' settings. | 145 /// settings when initialized from the 'empty' settings. |
141 /// </summary> | 146 /// </summary> |
142 [TestMethod] | 147 [TestMethod] |
143 public void VerifySettingsPepperInitialization() | 148 public void VerifySettingsPepperInitialization() |
144 { | 149 { |
| 150 if (TestUtilities.IsVS2012()) |
| 151 { |
| 152 // TODO(sbc): This test is unreliable under VS2012. http://crbug.com/246
253 |
| 153 Assert.Inconclusive(); |
| 154 } |
145 string solutionPepperInitialization = TestUtilities.CreateBlankValidNaClSo
lution( | 155 string solutionPepperInitialization = TestUtilities.CreateBlankValidNaClSo
lution( |
146 dte_, | 156 dte_, |
147 "ProjectSettingsTestPepperInit", | 157 "ProjectSettingsTestPepperInit", |
148 Strings.PepperPlatformName, | 158 Strings.PepperPlatformName, |
149 Strings.PepperPlatformName, | 159 Strings.PepperPlatformName, |
150 TestContext); | 160 TestContext); |
151 VerifyDefaultPepperSettings(solutionPepperInitialization); | 161 VerifyDefaultPepperSettings(solutionPepperInitialization); |
152 VerifyDefaultNaClSettings(solutionPepperInitialization); | 162 VerifyDefaultNaClSettings(solutionPepperInitialization); |
153 | 163 |
154 // Pepper inherit specific checks on the Pepper platform. | 164 // Pepper inherit specific checks on the Pepper platform. |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 | 240 |
231 | 241 |
232 /// <summary> | 242 /// <summary> |
233 /// Test method which verifies that the Pepper platform has correct default
properties | 243 /// Test method which verifies that the Pepper platform has correct default
properties |
234 /// when initialized from the NaCl platform. And that the NaCl platform has
the correct | 244 /// when initialized from the NaCl platform. And that the NaCl platform has
the correct |
235 /// settings when initialized from the 'empty' settings. | 245 /// settings when initialized from the 'empty' settings. |
236 /// </summary> | 246 /// </summary> |
237 [TestMethod] | 247 [TestMethod] |
238 public void VerifySettingsNaClInitialization() | 248 public void VerifySettingsNaClInitialization() |
239 { | 249 { |
| 250 if (TestUtilities.IsVS2012()) |
| 251 { |
| 252 // TODO(sbc): This test is unreliable under VS2012. http://crbug.com/246
253 |
| 253 Assert.Inconclusive(); |
| 254 } |
240 string solutionNaClInitialization = TestUtilities.CreateBlankValidNaClSolu
tion( | 255 string solutionNaClInitialization = TestUtilities.CreateBlankValidNaClSolu
tion( |
241 dte_, | 256 dte_, |
242 "ProjectSettingsTestNaClInit", | 257 "ProjectSettingsTestNaClInit", |
243 Strings.NaCl64PlatformName, | 258 Strings.NaCl64PlatformName, |
244 Strings.NaCl64PlatformName, | 259 Strings.NaCl64PlatformName, |
245 TestContext); | 260 TestContext); |
246 VerifyDefaultPepperSettings(solutionNaClInitialization); | 261 VerifyDefaultPepperSettings(solutionNaClInitialization); |
247 VerifyDefaultNaClSettings(solutionNaClInitialization); | 262 VerifyDefaultNaClSettings(solutionNaClInitialization); |
248 | 263 |
249 // NaCl inherit specific checks on the Pepper platform. | 264 // NaCl inherit specific checks on the Pepper platform. |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 debug_, | 531 debug_, |
517 pageName, | 532 pageName, |
518 propertyName); | 533 propertyName); |
519 TestUtilities.AssertPropertyIsNotNullOrEmpty( | 534 TestUtilities.AssertPropertyIsNotNullOrEmpty( |
520 release_, | 535 release_, |
521 pageName, | 536 pageName, |
522 propertyName); | 537 propertyName); |
523 } | 538 } |
524 } | 539 } |
525 } | 540 } |
OLD | NEW |