# HG changeset patch # User Ed Swartz # Date 1262706134 21600 # Node ID 68ec3f10b98119e207801396d305f4c72a9f8960 # Parent 952b6f67894a61c02709215edcd73bcaf50dc41b Split test for debuggability and restrict # of contexts per SDK to 4 to improve speed diff -r 952b6f67894a -r 68ec3f10b981 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 Mon Jan 04 11:11:25 2010 -0600 +++ b/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SymbianContextTest.java Tue Jan 05 09:42:14 2010 -0600 @@ -49,28 +49,39 @@ assertTrue(sdkList.size() > 0); for (ISymbianSDK sdk : sdkList) { - if (sdk.getName().equals("S60_5th_Edition_SDK_v1.0")) { - // test that we get the SDK version - Version sdkVer = sdk.getSDKVersion(); - assertEquals(5,sdkVer.getMajor()); - assertEquals(0,sdkVer.getMinor()); - - // test that we get the OS version - Version osVer = sdk.getOSVersion(); - assertEquals(9,osVer.getMajor()); - assertEquals(4,osVer.getMinor()); - } - - SymbianBuildContext context = new SymbianBuildContext(sdk, "WINSCW", "UDEB"); - ISymbianSDK contextSDK = context.getSDK(); - - assertEquals(sdk, contextSDK); - - // test that get get the macros - List platMacros = contextSDK.getPlatformMacros("WINSCW"); - assertTrue("WINSCW platform macros should be > 0", platMacros.size() > 0); + doTestSDK(sdk); } } + + /** + * @param sdk + */ + private void doTestSDK(ISymbianSDK sdk) { + if (sdk.getName().equals("S60_5th_Edition_SDK_v1.0")) { + // test that we get the SDK version + Version sdkVer = sdk.getSDKVersion(); + assertEquals(5,sdkVer.getMajor()); + assertEquals(0,sdkVer.getMinor()); + + // test that we get the OS version + Version osVer = sdk.getOSVersion(); + assertEquals(9,osVer.getMajor()); + assertEquals(4,osVer.getMinor()); + } + + SymbianBuildContext context = new SymbianBuildContext(sdk, "WINSCW", "UDEB"); + ISymbianSDK contextSDK = context.getSDK(); + + assertEquals(sdk, contextSDK); + + // test that we can get the macros for valid SDKs + // (if the default of 0.0, then we never fetch macros) + if (sdk.getOSVersion().compareTo(new Version(0, 0, 0)) > 0) { + List platMacros = contextSDK.getPlatformMacros("WINSCW"); + if (platMacros.size() == 0) + fail("WINSCW platform macros should be > 0"); + } + } }