1 files changed, 20 insertions, 19 deletions

diff --git a/src/actions/vs200x/tests/vs200x_xml_tests.cpp b/src/actions/vs200x/tests/vs200x_xml_tests.cpp
index 9616b99..cc9ce36 100644
--- a/src/actions/vs200x/tests/vs200x_xml_tests.cpp
+++ b/src/actions/vs200x/tests/vs200x_xml_tests.cpp
@@ -8,6 +8,7 @@
 #include "actions/tests/action_tests.h"
 extern "C" {
 #include "actions/vs200x/vs200x.h"
+#include "base/env.h"
 }
 
 
@@ -19,57 +20,57 @@ SUITE(action)
 
 	TEST_FIXTURE(FxAction, ElementEnd_SlashBracket_Vs2002)
 	{
-		session_set_action(sess, "vs2002");
-		vs200x_element_end(sess, strm, 0, "/>");
+		env_set_action("vs2002");
+		vs200x_element_end(strm, 0, "/>");
 		CHECK_EQUAL("/>\n", buffer);
 	}
 
 	TEST_FIXTURE(FxAction, ElementEnd_SlashBracket_Vs2003)
 	{
-		session_set_action(sess, "vs2003");
-		vs200x_element_end(sess, strm, 0, "/>");
+		env_set_action("vs2003");
+		vs200x_element_end(strm, 0, "/>");
 		CHECK_EQUAL("/>\n", buffer);
 	}
 
 	TEST_FIXTURE(FxAction, ElementEnd_SlashBracket_Vs2005)
 	{
-		session_set_action(sess, "vs2005");
-		vs200x_element_end(sess, strm, 0, "/>");
+		env_set_action("vs2005");
+		vs200x_element_end(strm, 0, "/>");
 		CHECK_EQUAL("\n/>\n", buffer);
 	}
 
 	TEST_FIXTURE(FxAction, ElementEnd_SlashBracket_Vs2008)
 	{
-		session_set_action(sess, "vs2008");
-		vs200x_element_end(sess, strm, 0, "/>");
+		env_set_action("vs2008");
+		vs200x_element_end(strm, 0, "/>");
 		CHECK_EQUAL("\n/>\n", buffer);
 	}
 
 	TEST_FIXTURE(FxAction, ElementEnd_Bracket_Vs2002)
 	{
-		session_set_action(sess, "vs2002");
-		vs200x_element_end(sess, strm, 0, ">");
+		env_set_action("vs2002");
+		vs200x_element_end(strm, 0, ">");
 		CHECK_EQUAL(">\n", buffer);
 	}
 
 	TEST_FIXTURE(FxAction, ElementEnd_Bracket_Vs2003)
 	{
-		session_set_action(sess, "vs2003");
-		vs200x_element_end(sess, strm, 0, ">");
+		env_set_action("vs2003");
+		vs200x_element_end(strm, 0, ">");
 		CHECK_EQUAL(">\n", buffer);
 	}
 
 	TEST_FIXTURE(FxAction, ElementEnd_Bracket_Vs2005)
 	{
-		session_set_action(sess, "vs2005");
-		vs200x_element_end(sess, strm, 0, ">");
+		env_set_action("vs2005");
+		vs200x_element_end(strm, 0, ">");
 		CHECK_EQUAL("\n\t>\n", buffer);
 	}
 
 	TEST_FIXTURE(FxAction, ElementEnd_Bracket_Vs2008)
 	{
-		session_set_action(sess, "vs2008");
-		vs200x_element_end(sess, strm, 0, ">");
+		env_set_action("vs2008");
+		vs200x_element_end(strm, 0, ">");
 		CHECK_EQUAL("\n\t>\n", buffer);
 	}
 
@@ -80,21 +81,21 @@ SUITE(action)
 
 	TEST_FIXTURE(FxAction, Attribute_OnLevel0)
 	{
-		session_set_action(sess, "vs2002");
+		env_set_action("vs2002");
 		vs200x_attribute(strm, 0, "ProjectType", "Visual C++");
 		CHECK_EQUAL("\nProjectType=\"Visual C++\"", buffer);
 	}
 
 	TEST_FIXTURE(FxAction, Attribute_OnLevel3)
 	{
-		session_set_action(sess, "vs2002");
+		env_set_action("vs2002");
 		vs200x_attribute(strm, 3, "ProjectType", "Visual C++");
 		CHECK_EQUAL("\n\t\t\tProjectType=\"Visual C++\"", buffer);
 	}
 
 	TEST_FIXTURE(FxAction, Attribute_IsEscaped)
 	{
-		session_set_action(sess, "vs2002");
+		env_set_action("vs2002");
 		vs200x_attribute(strm, 1, "PreprocessorSymbols", "DEBUG;MSG=\"Hello\";TRACE");
 		CHECK_EQUAL("\n\tPreprocessorSymbols=\"DEBUG;MSG="Hello";TRACE\"", buffer);
 	}