Author: dgolovin Date: 2010-11-03 19:03:45 -0400 (Wed, 03 Nov 2010) New Revision: 26239 Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/references/ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/references/CDIPreferencePageTest.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencePage.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java Log: CDI PreferencePage tests Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencePage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencePage.java 2010-11-03 22:13:24 UTC (rev 26238) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencePage.java 2010-11-03 23:03:45 UTC (rev 26239) @@ -22,6 +22,11 @@ * @author Alexey Kazakov */ public class CDIPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { + + /** + * @see plugin.xml descriptor for ID + */ + public static final String ID = "org.jboss.tools.common.model.ui.cdi"; @Override protected Control createContents(Composite parent) { Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2010-11-03 22:13:24 UTC (rev 26238) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2010-11-03 23:03:45 UTC (rev 26239) @@ -11,6 +11,7 @@ package org.jboss.tools.cdi.ui.test; import org.eclipse.jdt.internal.core.JavaModelManager; +import org.jboss.tools.cdi.ui.test.references.CDIPreferencePageTest; import org.jboss.tools.cdi.ui.test.wizard.NewCDIWizardTest; import junit.framework.Test; @@ -28,6 +29,7 @@ TestSuite suite = new TestSuite("CDI UI Tests"); suite.addTestSuite(CATest.class); suite.addTestSuite(NewCDIWizardTest.class); + suite.addTestSuite(CDIPreferencePageTest.class); return suite; } } \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/references/CDIPreferencePageTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/references/CDIPreferencePageTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/references/CDIPreferencePageTest.java 2010-11-03 23:03:45 UTC (rev 26239) @@ -0,0 +1,28 @@ +package org.jboss.tools.cdi.ui.test.references; + +import junit.framework.TestCase; + +import org.eclipse.jface.preference.PreferenceDialog; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.dialogs.PreferencesUtil; +import org.jboss.tools.cdi.ui.preferences.CDIPreferencePage; +import org.jboss.tools.cdi.ui.preferences.CDISettingsPreferencePage; +import org.jboss.tools.cdi.ui.preferences.CDIValidatorPreferencePage; +import org.jboss.tools.test.util.PreferencePageAbstractTest; + + +public class CDIPreferencePageTest extends PreferencePageAbstractTest{ + + + + public void testCDIPreferencePageIsCreated() { + PreferenceDialog prefDialog = createPreferenceDialog(CDIPreferencePage.ID); + assertTrue("Selected page is not an instance of CDIPreferencePage", isPreferencePageIsCreated(CDISettingsPreferencePage.ID, CDIPreferencePage.class)); + + } + + public void testCDIValidatorPreferencePageIsCreated() { + PreferenceDialog prefDialog = createPreferenceDialog(CDIValidatorPreferencePage.PREF_ID); + assertTrue("Selected page is not an instance of CDIPreferencePage", isPreferencePageIsCreated(CDIValidatorPreferencePage.PREF_ID, CDIValidatorPreferencePage.class)); + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/references/CDIPreferencePageTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java 2010-11-03 23:03:45 UTC (rev 26239) @@ -0,0 +1,33 @@ +package org.jboss.tools.test.util; + +import org.eclipse.jface.preference.PreferenceDialog; +import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.dialogs.PreferencesUtil; +import junit.framework.TestCase; + +public class PreferencePageAbstractTest extends TestCase { + + public boolean isPreferencePageIsCreated(String id, Class expectedInstance) { + PreferenceDialog prefDialog = createPreferenceDialog(id); + + try { + prefDialog.setBlockOnOpen(false); + prefDialog.open(); + + Object selectedPage = prefDialog.getSelectedPage(); + return expectedInstance.isInstance(selectedPage); //$NON-NLS-1$ + } finally { + prefDialog.close(); + } + + } + + public static PreferenceDialog createPreferenceDialog(String pageId) { + PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), pageId, new String[] {pageId}, null); + dialog.setBlockOnOpen(false); + return dialog; + } + +} Property changes on: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain