Update unit tests for extension settings change

tests/_tests.lua

@@ -109,6 +109,7 @@ return {
 	"actions/vstudio/vc2010/test_excluded_configs.lua",
 	"actions/vstudio/vc2010/test_extension_settings.lua",
 	"actions/vstudio/vc2010/test_extension_targets.lua",
+	"actions/vstudio/vc2010/test_language_settings.lua",
 	"actions/vstudio/vc2010/test_language_targets.lua",
 	"actions/vstudio/vc2010/test_floatingpoint.lua",
 	"actions/vstudio/vc2010/test_globals.lua",

tests/actions/vstudio/vc2010/test_extension_settings.lua

@@ -4,7 +4,7 @@
 -- Copyright (c) 2014 Jason Perkins and the Premake project
 --
 
-	local suite = test.declare("vs2010_import_settings")
+	local suite = test.declare("vs2010_extension_settings")
 	local vc2010 = premake.vstudio.vc2010
 	local project = premake.project
 
@@ -34,7 +34,6 @@
 	function suite.structureIsCorrect_onDefaultValues()
 		prepare()
 		test.capture [[
-<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 <ImportGroup Label="ExtensionSettings">
 </ImportGroup>
 		]]
@@ -50,7 +49,6 @@
 		rules { "MyRules", "MyOtherRules" }
 		prepare()
 		test.capture [[
-<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 <ImportGroup Label="ExtensionSettings">
 	<Import Project="MyRules.props" />
 	<Import Project="MyOtherRules.props" />
@@ -68,7 +66,6 @@
 		location "build"
 		prepare()
 		test.capture [[
-<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 <ImportGroup Label="ExtensionSettings">
 	<Import Project="..\MyRules.props" />
 </ImportGroup>

tests/actions/vstudio/vc2010/test_language_settings.lua

@@ -0,0 +1,39 @@
+--
+-- tests/actions/vstudio/vc2010/test_language_settings.lua
+-- Check the import language settings block of a VS 2010 project.
+-- Copyright (c) 2014 Jason Perkins and the Premake project
+--
+
+	local suite = test.declare("vs2010_language_settings")
+	local vc2010 = premake.vstudio.vc2010
+	local project = premake.project
+
+
+--
+-- Setup
+--
+
+	local wks
+
+	function suite.setup()
+		rule "MyRules"
+		rule "MyOtherRules"
+		wks = test.createWorkspace()
+	end
+
+	local function prepare()
+		local prj = test.getproject(wks)
+		vc2010.importLanguageSettings(prj)
+	end
+
+
+--
+-- Writes language settings.
+--
+
+	function suite.structureIsCorrect()
+		prepare()
+		test.capture [[
+<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+		]]
+	end