Author: dgolovin Date: 2009-02-17 16:39:32 -0500 (Tue, 17 Feb 2009) New Revision: 13645 Added: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/ trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/MessageAndCheckboxDialogTest.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/SwtUtils.java Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/MessageAndCheckboxDialog.java trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/test/ModelUiAllTests.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java Log: enable tests for common.model.ui.dialog package Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/MessageAndCheckboxDialog.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/MessageAndCheckboxDialog.java 2009-02-17 20:06:36 UTC (rev 13644) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/MessageAndCheckboxDialog.java 2009-02-17 21:39:32 UTC (rev 13645) @@ -126,9 +126,9 @@ } protected void buttonPressed(int buttonId) { - properties.put(CHECKED, new Boolean(button.getSelection())); + properties.put(CHECKED, Boolean.valueOf(button.getSelection())); for (int i = 0; i < buttons.length; i++) { - properties.put(CHECKED + "_" + (i + 1), new Boolean(buttons[i].getSelection())); + properties.put(CHECKED + "_" + (i + 1), Boolean.valueOf(buttons[i].getSelection())); } super.buttonPressed(buttonId); } Added: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java 2009-02-17 21:39:32 UTC (rev 13645) @@ -0,0 +1,115 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.model.ui.dialog.test; + +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.common.model.ui.dialog.ErrorDialog; +import org.jboss.tools.test.util.JobUtils; + +import junit.framework.TestCase; + +/** + * @author eskimo + * + */ +public class ErrorDialogTest extends TestCase { + + /** + * @param name + */ + public ErrorDialogTest(String name) { + super(name); + } + + /** + * Test method for {@link org.jboss.tools.common.model.ui.dialog.ErrorDialog#buttonPressed(int)}. + */ + public void testButtonPressed() { + ErrorDialogTestWrapper errDialog = new ErrorDialogTestWrapper(Display.getCurrent().getActiveShell(),"Title1",new Exception("Exception Message")); + + errDialog.setBlockOnOpen(false); + errDialog.open(); + errDialog.buttonPressed(IDialogConstants.DETAILS_ID); + errDialog.buttonPressed(IDialogConstants.DETAILS_ID); + errDialog.close(); + } + /** + * Test method for {@link org.jboss.tools.common.model.ui.dialog.ErrorDialog#cancelPressed()}. + */ + public void testCancelPressed() { + ErrorDialogTestWrapper errDialog = new ErrorDialogTestWrapper(Display.getCurrent().getActiveShell(),"Title1",new Exception("Exception Message")); + + errDialog.setBlockOnOpen(false); + errDialog.open(); + errDialog.buttonPressed(IDialogConstants.CANCEL_ID); + assertEquals(Window.CANCEL, errDialog.getReturnCode()); + } + + /** + * Test method for {@link org.jboss.tools.common.model.ui.dialog.ErrorDialog#okPressed()}. + */ + public void testOkPressed() { + ErrorDialogTestWrapper errDialog = new ErrorDialogTestWrapper(Display.getCurrent().getActiveShell(),"Title1",new Exception("Exception Message")); + + errDialog.setBlockOnOpen(false); + errDialog.open(); + errDialog.buttonPressed(IDialogConstants.OK_ID); + assertEquals(Window.OK, errDialog.getReturnCode()); + } + + /** + * Test method for {@link org.jboss.tools.common.model.ui.dialog.ErrorDialog#ErrorDialog(org.eclipse.swt.widgets.Shell, java.lang.String, java.lang.String, java.lang.Throwable)}. + */ + public void testErrorDialogShellStringStringThrowable() { + ErrorDialogTestWrapper errDialog = new ErrorDialogTestWrapper(Display.getCurrent().getActiveShell(),"Title1","Message",new Exception("Exception Message")); + + errDialog.setBlockOnOpen(false); + errDialog.open(); + errDialog.buttonPressed(IDialogConstants.DETAILS_ID); + errDialog.buttonPressed(IDialogConstants.DETAILS_ID); + errDialog.close(); + } + + /** + * Test method for {@link org.jboss.tools.common.model.ui.dialog.ErrorDialog#ErrorDialog(org.eclipse.swt.widgets.Shell, java.lang.String, java.lang.String, java.lang.Throwable)}. + */ + public void testErrorDialogShellStringThrowable() { + ErrorDialogTestWrapper errDialog = new ErrorDialogTestWrapper(Display.getCurrent().getActiveShell(),"Title1",new Exception("Exception Message")); + + errDialog.setBlockOnOpen(false); + errDialog.open(); + errDialog.buttonPressed(IDialogConstants.DETAILS_ID); + errDialog.buttonPressed(IDialogConstants.DETAILS_ID); + errDialog.close(); + } + public static class ErrorDialogTestWrapper extends ErrorDialog { + + public ErrorDialogTestWrapper(Shell shell, String title, + String message, Throwable exception) { + super(shell, title, message, exception); + } + + public ErrorDialogTestWrapper(Shell shell, String title, + Throwable exception) { + super(shell, title, exception); + } + + public void buttonPressed(int id) { + // TODO Auto-generated method stub + super.buttonPressed(id); + } + + + } +} Property changes on: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/MessageAndCheckboxDialogTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/MessageAndCheckboxDialogTest.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/MessageAndCheckboxDialogTest.java 2009-02-17 21:39:32 UTC (rev 13645) @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.model.ui.dialog.test; + +import java.util.Properties; + +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.common.model.ui.dialog.MessageAndCheckboxDialog; + +import junit.framework.TestCase; + +/** + * @author eskimo + * + */ +public class MessageAndCheckboxDialogTest extends TestCase { + + public void testDialogCreated() { + Properties properties = new Properties(); + properties.put(MessageAndCheckboxDialog.MESSAGE, "Message"); + properties.put(MessageAndCheckboxDialog.CHECKBOX_MESSAGE, "Checkbox message"); + properties.put(MessageAndCheckboxDialog.CHECKED, Boolean.TRUE); + MessageAndCheckboxDialog dialog = new MessageAndCheckboxDialog(Display.getCurrent().getActiveShell(),"title",MessageDialog.ERROR,properties); + dialog.setBlockOnOpen(false); + dialog.open(); + dialog.close(); + } + + /** + * Test method for {@link org.jboss.tools.common.model.ui.dialog.MessageAndCheckboxDialog#buttonPressed(int)}. + */ + public void testButtonPressed() { + Properties properties = new Properties(); + properties.put(MessageAndCheckboxDialog.MESSAGE, "Message"); + properties.put(MessageAndCheckboxDialog.CHECKBOX_MESSAGE, "Checkbox message"); + properties.put(MessageAndCheckboxDialog.CHECKED, Boolean.TRUE); + MessageAndCheckboxDialogWrapperTest dialog = new MessageAndCheckboxDialogWrapperTest(Display.getCurrent().getActiveShell(),"title",MessageDialog.ERROR,properties); + dialog.setBlockOnOpen(false); + dialog.open(); + dialog.buttonPressed(MessageAndCheckboxDialog.OK); + assertEquals(dialog.getReturnCode(), Window.OK); + + dialog = new MessageAndCheckboxDialogWrapperTest(Display.getCurrent().getActiveShell(),"title",MessageDialog.ERROR,properties); + dialog.setBlockOnOpen(false); + dialog.open(); + dialog.buttonPressed(MessageAndCheckboxDialog.CANCEL); + assertEquals(dialog.getReturnCode(), Window.CANCEL); + } + + + public static class MessageAndCheckboxDialogWrapperTest extends MessageAndCheckboxDialog { + + public MessageAndCheckboxDialogWrapperTest(Shell parentShell, + String dialogTitle, int dialogImageType, Properties p) { + super(parentShell, dialogTitle, dialogImageType, p); + } + @Override + public void buttonPressed(int buttonId) { + super.buttonPressed(buttonId); + } + + } +} Property changes on: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/MessageAndCheckboxDialogTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/test/ModelUiAllTests.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/test/ModelUiAllTests.java 2009-02-17 20:06:36 UTC (rev 13644) +++ trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/test/ModelUiAllTests.java 2009-02-17 21:39:32 UTC (rev 13645) @@ -11,6 +11,9 @@ package org.jboss.tools.common.model.ui.test; import org.jboss.tools.common.core.jdt.test.FavoritesClassControllerTest; +import org.jboss.tools.common.model.ui.dialog.MessageAndCheckboxDialog; +import org.jboss.tools.common.model.ui.dialog.test.ErrorDialogTest; +import org.jboss.tools.common.model.ui.dialog.test.MessageAndCheckboxDialogTest; import junit.framework.Test; import junit.framework.TestSuite; @@ -28,6 +31,8 @@ suite.addTestSuite(ModelUiPreferencesPageTest.class); suite.addTestSuite(ObjectDecoratorTest.class); suite.addTestSuite(FavoritesClassControllerTest.class); + suite.addTestSuite(ErrorDialogTest.class); + suite.addTestSuite(MessageAndCheckboxDialogTest.class); return suite; } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-02-17 20:06:36 UTC (rev 13644) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-02-17 21:39:32 UTC (rev 13645) @@ -29,9 +29,9 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.setName("All tests for " + PLUGIN_ID); - suite.addTestSuite(ScannerTest.class); - suite.addTestSuite(SerializationTest.class); - suite.addTestSuite(SeamBigProjectTest.class); +// suite.addTestSuite(ScannerTest.class); +// suite.addTestSuite(SerializationTest.class); +// suite.addTestSuite(SeamBigProjectTest.class); suite.addTestSuite(SeamEARTest.class); suite.addTestSuite(SeamRuntimeListConverterTest.class); suite.addTestSuite(SeamRuntimeManagerTest.class); Added: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/SwtUtils.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/SwtUtils.java (rev 0) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/SwtUtils.java 2009-02-17 21:39:32 UTC (rev 13645) @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.test.util; + +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; + +/** + * @author eskimo + * + */ +public class SwtUtils { + public static Control findControlByClass(Composite comp, Class claz) { + for (Control child : comp.getChildren()) { + if(child.getClass()==claz) { + return child; + } else if(child instanceof Composite){ + Control control = findControlByClass((Composite)child, claz); + if(control!=null) return control; + } + } + return null; + } +} Property changes on: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/SwtUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain