Author: yzhishko
Date: 2009-10-16 12:14:07 -0400 (Fri, 16 Oct 2009)
New Revision: 18134
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java
Log:
SWTBot VPE Tests correction. Speed of tests execution was increased.
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-10-16
16:11:16 UTC (rev 18133)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-10-16
16:14:07 UTC (rev 18134)
@@ -143,10 +143,7 @@
} catch (WidgetNotFoundException e2) {
}
}
- try {
- waitForBlockingJobsAcomplished(60*1000L, BUILDING_WS);
- } catch (InterruptedException e) {
- }
+ waitForBlockingJobsAcomplished(60*1000L, BUILDING_WS);
setException(null);
}
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2009-10-16
16:11:16 UTC (rev 18133)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2009-10-16
16:14:07 UTC (rev 18134)
@@ -60,10 +60,7 @@
}
void checkVPE(String testPage) throws Throwable{
- try {
- waitForBlockingJobsAcomplished("Save", VISUAL_REFRESH, VISUAL_UPDATE);
- } catch (InterruptedException e) {
- }
+ waitForBlockingJobsAcomplished(VISUAL_UPDATE);
performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
@@ -77,10 +74,6 @@
bot.menu("Edit").menu("Delete").click();
editor.setText(editorText);
editor.save();
- try {
- waitForBlockingJobsAcomplished("Save");
- } catch (InterruptedException e) {
- }
super.tearDown();
}
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2009-10-16
16:11:16 UTC (rev 18133)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2009-10-16
16:14:07 UTC (rev 18134)
@@ -29,10 +29,7 @@
getEditor().setText(testText);
getEditor().save();
- try {
- waitForBlockingJobsAcomplished("Save", VISUAL_REFRESH, VISUAL_UPDATE);
- } catch (InterruptedException e) {
- }
+ waitForBlockingJobsAcomplished(VISUAL_UPDATE);
performContentTestByDocument("VerificationOfNameSpaces.xml",
bot.multiPageEditorByTitle(TEST_PAGE));
}
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java 2009-10-16
16:11:16 UTC (rev 18133)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java 2009-10-16
16:14:07 UTC (rev 18134)
@@ -89,10 +89,7 @@
//Test close Design Options
bot.button("OK").click();
- try {
- waitForBlockingJobsAcomplished(VISUAL_REFRESH,VISUAL_UPDATE);
- } catch (InterruptedException e) {
- }
+ // waitForBlockingJobsAcomplished(VISUAL_REFRESH);
//Check page content
@@ -149,10 +146,7 @@
.expandNode("WebContent").expandNode(TEST_FOLDER)
.getNode(TEST_PAGE_FOR_FOLDER+".jsp").doubleClick();
SWTBotEditor editor = bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp");
- try {
- waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
- } catch (InterruptedException e) {
- }
+ // waitForBlockingJobsAcomplished(VISUAL_REFRESH);
//Check page content
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2009-10-16
16:11:16 UTC (rev 18133)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2009-10-16
16:14:07 UTC (rev 18134)
@@ -54,10 +54,7 @@
void checkVPEForTestPage(String testPage) throws Throwable{
- try {
- waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
- } catch (InterruptedException e) {
- }
+ // waitForBlockingJobsAcomplished(VISUAL_REFRESH);
performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
@@ -101,10 +98,7 @@
tree.expandNode(JBT_TEST_PROJECT_NAME)
.expandNode("WebContent").expandNode("pages").getNode("hello.jsp").doubleClick();
SWTBotEditor editor = bot.editorByTitle("hello.jsp");
- try {
- waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
- } catch (InterruptedException e) {
- }
+ // waitForBlockingJobsAcomplished(VISUAL_REFRESH);
//Check page content
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2009-10-16
16:11:16 UTC (rev 18133)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2009-10-16
16:14:07 UTC (rev 18134)
@@ -46,10 +46,7 @@
}
private void checkVPE(String testPage) throws Throwable{
- try {
- waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
- } catch (InterruptedException e) {
- }
+// waitForBlockingJobsAcomplished(VISUAL_REFRESH);
performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
@@ -70,10 +67,6 @@
bot.menu("Edit").menu("Delete").click();
editor.setText(textEditor);
editor.save();
- try {
- waitForBlockingJobsAcomplished("Save");
- } catch (InterruptedException e) {
- }
super.tearDown();
}
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java 2009-10-16
16:11:16 UTC (rev 18133)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java 2009-10-16
16:14:07 UTC (rev 18134)
@@ -22,10 +22,7 @@
}
private void checkVPE(String testPage) throws Throwable{
- try {
- waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
- } catch (InterruptedException e) {
- }
+// waitForBlockingJobsAcomplished(VISUAL_REFRESH);
performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2009-10-16
16:11:16 UTC (rev 18133)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2009-10-16
16:14:07 UTC (rev 18134)
@@ -34,18 +34,11 @@
bot.menu("Edit").menu("Delete").click();
editor.setText(textEditor);
editor.save();
- try {
- waitForBlockingJobsAcomplished("Save");
- } catch (InterruptedException e) {
- }
super.tearDown();
}
private void checkVPE(String testPage) throws Throwable{
- try {
- waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
- } catch (InterruptedException e) {
- }
+// waitForBlockingJobsAcomplished(VISUAL_REFRESH);
performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
Show replies by date