6 files changed, 25 insertions, 2 deletions
diff --git a/project2/ice/iceDaemon.cpp b/project2/ice/iceDaemon.cpp
index cd752b8..860cd86 100644
--- a/project2/ice/iceDaemon.cpp
+++ b/project2/ice/iceDaemon.cpp
@@ -17,6 +17,7 @@
 #include <execContext.h>
 #include <misc.h>
 #include <exceptions.h>
+#include "appInstance.h"
 
 std::string IceDaemon::adapterName;
 std::string IceDaemon::adapterEndpoint;
@@ -177,7 +178,7 @@ IceDaemon::GetComponentCompiler(const std::string & slice, const IceCompile::Dep
 void
 IceDaemon::ClearSlice()
 {
-	ScriptReader::clearCache();
+	AppInstance::current().clearScriptCache();
 	libs.clear();
 }
 
diff --git a/project2/ice/iceDataSource.cpp b/project2/ice/iceDataSource.cpp
index 0493a58..7871500 100644
--- a/project2/ice/iceDataSource.cpp
+++ b/project2/ice/iceDataSource.cpp
@@ -4,6 +4,7 @@
 #include <scripts.h>
 #include <logger.h>
 #include <Ice/Ice.h>
+#include "appInstance.h"
 
 IceBase::Libs IceDataSource::libs;
 IceDataSource::Proxies IceDataSource::proxies;
@@ -35,7 +36,7 @@ IceDataSource::GetComponentCompiler(const std::string & slice, const IceCompile:
 void
 IceDataSource::ClearSlice()
 {
-	ScriptReader::clearCache();
+	AppInstance::current().clearScriptCache();
 	libs.clear();
 	proxies.clear();
 }
diff --git a/project2/ice/unittests/testClient.cpp b/project2/ice/unittests/testClient.cpp
index 3b3c790..97acd0b 100644
--- a/project2/ice/unittests/testClient.cpp
+++ b/project2/ice/unittests/testClient.cpp
@@ -13,6 +13,7 @@
 #include <scopeObject.h>
 #include <unittest.h>
 #include <unittestComplex.h>
+#include <appInstance.h>
 
 #define XSTR(s) STR(s)
 #define STR(s) #s
@@ -152,6 +153,9 @@ unloadTests()
 }
 
 void test_client_run(const boost::filesystem::path & tmpdir);
+
+BOOST_FIXTURE_TEST_SUITE( Core, AppInstance );
+
 BOOST_AUTO_TEST_CASE( test_client )
 {
 	const boost::filesystem::path tmpdir = "/tmp/ut/project2.slice-client";
@@ -163,6 +167,8 @@ BOOST_AUTO_TEST_CASE( test_client )
 	boost::filesystem::remove_all(tmpdir);
 }
 
+BOOST_AUTO_TEST_SUITE_END();
+
 void test_client_run(const boost::filesystem::path & tmpdir)
 {
 	BOOST_TEST_CHECKPOINT("Configure, compile, link, load");
diff --git a/project2/ice/unittests/testClientCompile.cpp b/project2/ice/unittests/testClientCompile.cpp
index 944af60..3b27d63 100644
--- a/project2/ice/unittests/testClientCompile.cpp
+++ b/project2/ice/unittests/testClientCompile.cpp
@@ -8,6 +8,7 @@
 #include <scripts.h>
 #include <testScriptHost.h>
 #include <scopeObject.h>
+#include <appInstance.h>
 
 #define XSTR(s) STR(s)
 #define STR(s) #s
@@ -40,6 +41,8 @@ unloadTests()
 	BOOST_REQUIRE_THROW(ElementLoader::getFor("UnitTest-SimpleInterface-SomeRowsParams"), NotSupported);
 }
 
+BOOST_FIXTURE_TEST_SUITE( Core, AppInstance );
+
 BOOST_AUTO_TEST_CASE( compile_client_full )
 {
 	TestOptionsSource::LoadTestOptions({ });
@@ -120,3 +123,5 @@ BOOST_AUTO_TEST_CASE( compile_client_slicer )
 	boost::filesystem::remove_all(tmpdir);
 }
 
+BOOST_AUTO_TEST_SUITE_END();
+
diff --git a/project2/ice/unittests/testDaemon.cpp b/project2/ice/unittests/testDaemon.cpp
index 4e48413..a01782e 100644
--- a/project2/ice/unittests/testDaemon.cpp
+++ b/project2/ice/unittests/testDaemon.cpp
@@ -8,6 +8,7 @@
 #include <task.h>
 #include <logger.h>
 #include <variables.h>
+#include <appInstance.h>
 
 #define XSTR(s) STR(s)
 #define STR(s) #s
@@ -195,6 +196,8 @@ unloadTests()
 	BOOST_REQUIRE_THROW(IceDaemonAdapterHandlerLoader::createNew("UnitTest-SimpleInterface", NULL), NotSupported);
 }
 
+BOOST_FIXTURE_TEST_SUITE( Core, AppInstance );
+
 BOOST_AUTO_TEST_CASE( test_daemon )
 {
 	const boost::filesystem::path tmpdir = "/tmp/ut/project2.slice-daemon";
@@ -227,3 +230,5 @@ BOOST_AUTO_TEST_CASE( test_daemon )
 	boost::filesystem::remove_all(tmpdir);
 }
 
+BOOST_AUTO_TEST_SUITE_END();
+
diff --git a/project2/ice/unittests/testDaemonCompile.cpp b/project2/ice/unittests/testDaemonCompile.cpp
index a49719f..02c64d6 100644
--- a/project2/ice/unittests/testDaemonCompile.cpp
+++ b/project2/ice/unittests/testDaemonCompile.cpp
@@ -4,6 +4,7 @@
 #include <testOptionsSource.h>
 #include <exceptions.h>
 #include <iceDaemon.h>
+#include <appInstance.h>
 
 #define XSTR(s) STR(s)
 #define STR(s) #s
@@ -28,6 +29,8 @@ unloadTests()
 	BOOST_REQUIRE_THROW(IceDaemonAdapterHandlerLoader::createNew("UnitTest-SimpleInterface", NULL), NotSupported);
 }
 
+BOOST_FIXTURE_TEST_SUITE( Core, AppInstance );
+
 BOOST_AUTO_TEST_CASE( compile_daemon_full )
 {
 	const boost::filesystem::path tmpdir = "/tmp/ut/project2.slice-daemonCompile/full";
@@ -102,3 +105,5 @@ BOOST_AUTO_TEST_CASE( compile_daemon_slicer )
 	boost::filesystem::remove_all(tmpdir);
 }
 
+BOOST_AUTO_TEST_SUITE_END();
+