# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1245954974 18000
# Node ID d47c881e179e7cfac1265bfb48baa26bb62522a4
# Parent  8554d4866c7f554d87df560205a211cfe1ee5c4f# Parent  b1f7cdaf4072b82a896749a47221accf004918e2
merge

diff -r 8554d4866c7f -r d47c881e179e core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SymbianContextTest.java
--- a/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SymbianContextTest.java	Thu Jun 25 13:35:32 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SymbianContextTest.java	Thu Jun 25 13:36:14 2009 -0500
@@ -62,13 +62,13 @@
 		
 		// test that we get the SDK version
 		Version sdkVer = contextSDK.getSDKVersion();
-		assertEquals(3,sdkVer.getMajor());
+		assertEquals(5,sdkVer.getMajor());
 		assertEquals(0,sdkVer.getMinor());
 		
 		// test that we get the OS version
 		Version osVer = contextSDK.getOSVersion();
 		assertEquals(9,osVer.getMajor());
-		assertEquals(1,osVer.getMinor());
+		assertEquals(4,osVer.getMinor());
 		
 	}