# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1283985254 18000
# Node ID e807f63ea52a9d3be3754e18e73512ed6ef73ec1
# Parent  3482df86a51d77a6cee2e3c89da4dffd98144465# Parent  da3ecb4146dda67b358201ad94b816211efe469a
Merge commit

diff -r 3482df86a51d -r e807f63ea52a core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/TestCarbideSDKCache.java
--- a/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/TestCarbideSDKCache.java	Wed Sep 08 17:21:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/TestCarbideSDKCache.java	Wed Sep 08 17:34:14 2010 -0500
@@ -65,6 +65,7 @@
 	
 	public void testCacheCreation() throws Exception {
 		final TestSDKManager manager = new TestSDKManager();
+		((AbstractSDKManager)manager).init();
 		manager.clearCache();
 		IJobChangeListener listener = new IJobChangeListener() {
 			
@@ -96,6 +97,7 @@
 
 	public void testCacheModification() throws Exception {
 		final TestSDKManager manager = new TestSDKManager();
+		((AbstractSDKManager)manager).init();
 		manager.scanSDKs();
 		manager.getScanJob().join();
 		assertTrue(manager.getSDKList().isEmpty() == manager.getCache().isEmpty());
@@ -119,6 +121,7 @@
 		assertNull(SDKCacheUtils.getCache().getCache(SBSv2QueryUtils.PRODUCT_CACHE_KEY));
 		assertNull(SDKCacheUtils.getCache().getCache(SBSv2QueryUtils.CONFIG_CACHE_KEY));
 		final TestSDKManager manager = new TestSDKManager();
+		((AbstractSDKManager)manager).init();
 		manager.scanSDKs();
 		manager.getScanJob().join();
 		assertNull(SDKCacheUtils.getCache().getCache(SBSv2QueryUtils.ALIAS_CACHE_KEY));