Author: dgolovin Date: 2011-11-21 17:49:23 -0500 (Mon, 21 Nov 2011) New Revision: 36514 Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/TestNPEinPreviewJbide10178.java Log: fix for missing 110 tests from vpe component after switching vpe to preview mode it should be turned back to Visual/Source mode or next vpe test waits forever while controller is initialized Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/TestNPEinPreviewJbide10178.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/TestNPEinPreviewJbide10178.java 2011-11-21 22:21:34 UTC (rev 36513) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/TestNPEinPreviewJbide10178.java 2011-11-21 22:49:23 UTC (rev 36514) @@ -20,13 +20,17 @@ IFile ifile = (IFile) TestUtil.getComponentPath( TEST_PAGE_NAME, HtmlAllTests.IMPORT_PROJECT_NAME); JSPMultiPageEditor jspMultiPageEditor = openEditor(ifile); - jspMultiPageEditor.pageChange(jspMultiPageEditor.getPreviewIndex()); - TestUtil.waitForJobs(); - /* - * Check error log for exception. - */ - if (getException() != null) { - throw getException(); + try { + jspMultiPageEditor.pageChange(jspMultiPageEditor.getPreviewIndex()); + TestUtil.waitForJobs(); + /* + * Check error log for exception. + */ + if (getException() != null) { + throw getException(); + } + } finally { + jspMultiPageEditor.pageChange(jspMultiPageEditor.getVisualSourceIndex()); } } @@ -35,13 +39,18 @@ IFile ifile = (IFile) TestUtil.getComponentPath( TEST_PAGE_NAME2, HtmlAllTests.IMPORT_PROJECT_NAME); JSPMultiPageEditor jspMultiPageEditor = openEditor(ifile); - jspMultiPageEditor.pageChange(jspMultiPageEditor.getPreviewIndex()); - TestUtil.waitForJobs(); - /* - * Check error log for exception. - */ - if (getException() != null) { - throw getException(); + try { + jspMultiPageEditor.pageChange(jspMultiPageEditor.getPreviewIndex()); + TestUtil.waitForJobs(); + /* + * Check error log for exception. + */ + if (getException() != null) { + throw getException(); + } + } finally { + jspMultiPageEditor.pageChange(jspMultiPageEditor.getVisualSourceIndex()); } } + }