diff -r f1112f777ce9 -r 96906a986c3b testdev/ite/test/com.nokia.testfw.codegen.ui.test/src/com/nokia/testfw/codegen/ui/templates/TemplateBuilderFactoryTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testdev/ite/test/com.nokia.testfw.codegen.ui.test/src/com/nokia/testfw/codegen/ui/templates/TemplateBuilderFactoryTest.java	Tue Mar 30 14:39:29 2010 +0800
@@ -0,0 +1,59 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+package com.nokia.testfw.codegen.ui.templates;
+
+import com.nokia.testfw.codegen.templates.CMDTemplateBuilder;
+import com.nokia.testfw.codegen.templates.TemplateBuilder;
+import com.nokia.testfw.codegen.templates.TemplateBuilderFactory;
+
+import junit.framework.TestCase;
+
+public class TemplateBuilderFactoryTest extends TestCase {
+
+	public void testNewCMDTemplateBuilder() {
+		System.setProperty(TemplateBuilderFactory.TEMPLATEBUILDERCLASS,
+				CMDTemplateBuilder.class.getName());
+		TemplateBuilderFactory factory = TemplateBuilderFactory.newInstance();
+		TemplateBuilder builder = null;
+		try {
+			builder = factory.newTemplateBuilder();
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail("creating CMDTemplateBuilder failed.");
+		}
+		assertTrue(builder instanceof CMDTemplateBuilder);
+		System.setProperty(TemplateBuilderFactory.TEMPLATEBUILDERCLASS,
+				TemplateBuilderFactory.DEFAULTTEMPLATEBUILDERCLASS);
+	}
+
+	public void testNewEclipseTemplateBuilder() {
+		System.setProperty(TemplateBuilderFactory.TEMPLATEBUILDERCLASS,
+				EclipseTemplateBuilder.class.getName());
+		TemplateBuilderFactory factory = TemplateBuilderFactory.newInstance();
+		TemplateBuilder builder = null;
+		try {
+			builder = factory.newTemplateBuilder();
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail("creating EclipseTemplateBuilder failed.");
+		}
+		assertTrue(builder instanceof EclipseTemplateBuilder);
+		System.setProperty(TemplateBuilderFactory.TEMPLATEBUILDERCLASS,
+				TemplateBuilderFactory.DEFAULTTEMPLATEBUILDERCLASS);
+	}
+}