3 files changed, 11 insertions, 11 deletions
diff --git a/project2/basics/caches/memoryCache.cpp b/project2/basics/caches/memoryCache.cpp
index 16bdfa8..6e5aab6 100644
--- a/project2/basics/caches/memoryCache.cpp
+++ b/project2/basics/caches/memoryCache.cpp
@@ -42,9 +42,9 @@ class MemoryCache : public RowSetCache {
 				{
 				}
 
-				void execute(const Glib::ustring&, const RowProcessorCallback & rp, ExecContext *) const {
+				void execute(const Glib::ustring&, const RowProcessorCallback & rp, ExecContext * ec) const {
 					for (const DataCache::value_type & mcr : dataCache) {
-						mcr->process(rp, false);
+						mcr->process(ec, rp, false);
 					}
 				}
 
diff --git a/project2/basics/unittests/testLibraries.cpp b/project2/basics/unittests/testLibraries.cpp
index b77b671..e48d77e 100644
--- a/project2/basics/unittests/testLibraries.cpp
+++ b/project2/basics/unittests/testLibraries.cpp
@@ -4,11 +4,11 @@
 #include <testOptionsSource.h>
 #include <exceptions.h>
 #include <library.h>
-#include <appInstance.h>
+#include <testAppInstance.h>
 
 const auto self = boost::filesystem::canonical("/proc/self/exe");
 
-BOOST_FIXTURE_TEST_SUITE( Core, AppInstance );
+BOOST_FIXTURE_TEST_SUITE( Core, TestAppInstance );
 
 BOOST_AUTO_TEST_CASE( load_missing_library )
 {
diff --git a/project2/basics/unittests/testViews.cpp b/project2/basics/unittests/testViews.cpp
index a74c9e3..a2ea224 100644
--- a/project2/basics/unittests/testViews.cpp
+++ b/project2/basics/unittests/testViews.cpp
@@ -5,10 +5,10 @@
 #include <testOptionsSource.h>
 #include <testScriptHost.h>
 #include <definedDirs.h>
-#include <appInstance.h>
+#include <testAppInstance.h>
 
 boost::intrusive_ptr<TestScriptHost>
-executeRowViewTest(const boost::filesystem::path & script, const boost::filesystem::path & expected)
+executeRowViewTest(ExecContext * ec, const boost::filesystem::path & script, const boost::filesystem::path & expected)
 {
 	TestOptionsSource::LoadTestOptions({
 			{ "common.datasourceRoot", RootDir.string() },
@@ -18,27 +18,27 @@ executeRowViewTest(const boost::filesystem::path & script, const boost::filesyst
 	ScriptReaderPtr r = new XmlScriptParser(script);
 	boost::intrusive_ptr<TestScriptHost> sr = new TestScriptHost(r);
 	BOOST_TEST_CHECKPOINT("Execute");
-	sr->process(NULL);
+	sr->process(ec);
 	BOOST_TEST_CHECKPOINT("Compare");
 	BOOST_REQUIRE_EQUAL(sr->GetPresenterData(), expected);
 	return sr;
 }
 
-BOOST_FIXTURE_TEST_SUITE( Core, AppInstance );
+BOOST_FIXTURE_TEST_SUITE( Core, TestAppInstance );
 
 BOOST_AUTO_TEST_CASE( test_rowview_unsetcolumns )
 {
-	executeRowViewTest(RootDir / "test_rowview_unsetcolumns.xml", RootDir / "expected" / "test_rowview_unsetcolumns.log");
+	executeRowViewTest(this, RootDir / "test_rowview_unsetcolumns.xml", RootDir / "expected" / "test_rowview_unsetcolumns.log");
 }
 
 BOOST_AUTO_TEST_CASE( test_rowview_nocolumns )
 {
-	executeRowViewTest(RootDir / "test_rowview_nocolumns.xml", RootDir / "expected" / "test_rowview_nocolumns.log");
+	executeRowViewTest(this, RootDir / "test_rowview_nocolumns.xml", RootDir / "expected" / "test_rowview_nocolumns.log");
 }
 
 BOOST_AUTO_TEST_CASE( test_rowview_columns )
 {
-	executeRowViewTest(RootDir / "test_rowview_columns.xml", RootDir / "expected" / "test_rowview_columns.log");
+	executeRowViewTest(this, RootDir / "test_rowview_columns.xml", RootDir / "expected" / "test_rowview_columns.log");
 }
 
 BOOST_AUTO_TEST_SUITE_END();