Author: yradtsevich Date: 2010-11-10 15:33:40 -0500 (Wed, 10 Nov 2010) New Revision: 26436 Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ExternalizeCommandTest.java Log: https://jira.jboss.org/browse/JBIDE-7489 : org.jboss.tools.jst.jsp.test.ca.ExternalizeCommandTest failure - changed test to fire selection actions Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ExternalizeCommandTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ExternalizeCommandTest.java 2010-11-10 20:06:53 UTC (rev 26435) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ExternalizeCommandTest.java 2010-11-10 20:33:40 UTC (rev 26436) @@ -18,6 +18,7 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; +import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.TestProjectProvider; @@ -54,22 +55,28 @@ */ public void testExternalizeCommand(){ IEditorPart editorPart = WorkbenchUtils.openEditor(project.getName()+"/WebContent/pages/extCommandTest.xhtml"); //$NON-NLS-1$ - if(editorPart instanceof JSPMultiPageEditor){ - JSPMultiPageEditor jspMultiPageEditor= (JSPMultiPageEditor) editorPart; - StyledText textWidget = jspMultiPageEditor.getSourceEditor().getTextViewer().getTextWidget(); - textWidget.setCaretOffset(0); - assertEquals("Ext command should be disabled with current selection",false,externalizeCommand.isEnabled()); //$NON-NLS-1$ - textWidget.setCaretOffset(2); - assertEquals("Ext command should be disabled with current selection",false,externalizeCommand.isEnabled()); //$NON-NLS-1$ - textWidget.setCaretOffset(15); - assertEquals("Ext command should be enabled with current selection",true,externalizeCommand.isEnabled()); //$NON-NLS-1$ - textWidget.setCaretOffset(2); - assertEquals("Ext command should be disabled with current selection",false,externalizeCommand.isEnabled()); //$NON-NLS-1$ - TestUtil.closeAllEditors(); - assertEquals("Ext command should be disabled without opened editor",false,externalizeCommand.isEnabled()); //$NON-NLS-1$ - }else{ - fail("Should be opened JSPMultiPage Editor"); //$NON-NLS-1$ - } + assertTrue("Should be opened JSPMultiPage Editor", editorPart instanceof JSPMultiPageEditor); //$NON-NLS-1$ + + JSPMultiPageEditor jspMultiPageEditor= (JSPMultiPageEditor) editorPart; + StructuredTextViewer textViewer = jspMultiPageEditor.getSourceEditor().getTextViewer(); + + textViewer.setSelectedRange(0, 0); + checkExternalizeCommand(false); + textViewer.setSelectedRange(2, 0); + checkExternalizeCommand(false); + textViewer.setSelectedRange(15, 0); + checkExternalizeCommand(true); + textViewer.setSelectedRange(2, 0); + checkExternalizeCommand(false); + + TestUtil.closeAllEditors(); + checkExternalizeCommand(false); } + + private void checkExternalizeCommand(boolean requiredState) { + TestUtil.waitForIdle(TestUtil.MAX_IDLE * 100); + assertEquals("Externalize Command has incorrect enabled state", //$NON-NLS-1$ + requiredState,externalizeCommand.isEnabled()); + } }