5:33 p.m.
Author: yzhishko
Date: 2009-09-08 11:33:00 -0400 (Tue, 08 Sep 2009)
New Revision: 17475
Modified:
workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java
Log:
waitForJobs() method has been replaced by waitForBlockingJobsFinished(...). Problem with
long test running has been resolved. Tests were redesigned.
Modified:
workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -13,9 +13,12 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
public abstract class JBTSWTBotTestCase extends SWTBotTestCase implements
- ILogListener {
+ ILogListener{
- private Throwable exception;
+ protected static final String BUILDING_WS = "Building workspace";
+ protected static final String VISUAL_UPDATE = "Visual Editor View Update";
+ protected static final String VISUAL_REFRESH = "Visual Editor Refresh";
+ private volatile Throwable exception;
public static final String PATH_TO_SWT_BOT_PROPERTIES = "SWTBot.properties";
private static Properties SWT_BOT_PROPERTIES;
protected SWTJBTBot bot = new SWTJBTBot();
@@ -72,7 +75,7 @@
* @see Throwable
*/
- protected Throwable getException() {
+ protected synchronized Throwable getException() {
return exception;
}
@@ -83,7 +86,7 @@
* @see Throwable
*/
- protected void setException(Throwable e) {
+ protected synchronized void setException(Throwable e) {
this.exception = e;
}
@@ -199,19 +202,59 @@
// }
/**
- * Wait until job manager is currently idle
+ * Use delay() method instead
+ * @see #delay()
*/
-
- protected void waitForJobs(){
+ @Deprecated
+ protected final void waitForJobs(){
delay();
- while (!Job.getJobManager().isIdle()) {
- Job[] jobs = Job.getJobManager().find(null);
- for (Job job : jobs) {
- if ("Updating indexes".equals(job.getName())) {
- job.cancel();
- }
- }
- }
}
+ protected final void waitForBlockingJobsAcomplished(long timeOut, String... jobNames)
throws InterruptedException{
+ if (jobNames == null) {
+ delay();
+ } else {
+ boolean isProcessStarted = false;
+ long startTime = System.currentTimeMillis();
+ while (!isProcessStarted) {
+ Job[] jobs = Job.getJobManager().find(null);
+ for (Job job : jobs) {
+ for (String jobName : jobNames) {
+ if (jobName.equalsIgnoreCase(job.getName())) {
+ isProcessStarted = true;
+ }
+ }
+ }
+ long endTime = System.currentTimeMillis();
+ if (endTime-startTime>timeOut) {
+ throw new InterruptedException(stringArrayToString(jobNames) + "job(s) has
never appeared or already completed");
+ }
+ }
+ while (isProcessStarted) {
+ isProcessStarted = false;
+ Job[] jobs = Job.getJobManager().find(null);
+ for (Job job : jobs) {
+ for (String jobName : jobNames) {
+ if (jobName.equalsIgnoreCase(job.getName())) {
+ delay();
+ isProcessStarted = true;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ protected final void waitForBlockingJobsAcomplished(String... jobNames) throws
InterruptedException{
+ waitForBlockingJobsAcomplished(5*1000L, jobNames);
+ }
+
+ private String stringArrayToString (String... strings){
+ StringBuffer buffer = new StringBuffer("");
+ for (String string : strings) {
+ buffer.append(string+", ");
+ }
+ return buffer.toString();
+ }
+
}
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Input User Name Page
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -30,5 +36,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
\ No newline at end of file
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Input User Name Page
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -32,5 +38,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
\ No newline at end of file
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Input User Name Page
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -33,5 +39,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
\ No newline at end of file
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Input User Name Page
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -32,5 +38,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
\ No newline at end of file
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,4 +1,5 @@
<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
<SPAN CLASS="vpe-text">
...
</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic;
color: green; -moz-user-modify: read-only;"/>
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Hello!
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -24,5 +30,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
\ No newline at end of file
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV id="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Input User Name Page
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -33,5 +39,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
\ No newline at end of file
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Hello!
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -24,5 +30,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
\ No newline at end of file
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Input User Name Page
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -33,5 +39,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Input User Name Page
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -37,5 +43,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Input User Name Page
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -33,5 +39,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
\ No newline at end of file
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Input User Name Page
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -37,5 +43,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
\ No newline at end of file
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,12 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
+<BODY ID="__content__area__">
+<!--This comment is of JBIDE-3396 -->
+<DIV STYLE="-moz-user-modify: read-write;">
+<DIV STYLE="display: none; -moz-user-modify: read-only;">
+<H1 STYLE="-moz-user-modify: read-write;">
+Input User Name Page
+</H1>
+</DIV>
+<DIV>
<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
<TR>
<TD>
@@ -33,5 +39,5 @@
</TR>
</TABLE>
</DIV>
- </test>
-</tests>
\ No newline at end of file
+</DIV>
+</BODY>
\ No newline at end of file
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -97,7 +97,7 @@
bot.menu("File").menu("New").menu("Other...").click();
bot.shell("New").activate();
SWTBotTree tree = bot.tree();
- waitForJobs();
+ delay();
tree.expandNode("JBoss Tools
Web").expandNode("JSF").select("JSF Project");
bot.button("Next >").click();
bot.textWithLabel("Project Name*").setText(jsfProjectName);
@@ -105,7 +105,7 @@
bot.button("Next >").click();
try {
bot.comboBoxWithLabel("Runtime*").setSelection("jboss-eap
Runtime");
- waitForJobs();
+ delay();
bot.button("Finish").click();
try {
bot.button("Yes").click();
@@ -117,7 +117,7 @@
} catch (WidgetNotFoundException e) {
bot.button(0).click();
SWTBotTree innerTree = bot.tree();
- waitForJobs();
+ delay();
innerTree.expandNode("JBoss Enterprise Middleware").select("JBoss
Enterprise Application Platform 4.3 Runtime");
bot.button("Next >").click();
bot.textWithLabel("Home Directory").setText(JBOSS_EAP_HOME);
@@ -132,7 +132,10 @@
} catch (WidgetNotFoundException e2) {
}
}
- waitForJobs();
+ try {
+ waitForBlockingJobsAcomplished(60*1000L, BUILDING_WS);
+ } catch (InterruptedException e) {
+ }
setException(null);
}
@@ -147,7 +150,7 @@
* @see SWTBotMultiPageEditor
* @see Throwable
*/
-
+ @Deprecated
protected void performContentTestByIDs(String expectedVPEContentFile,
SWTBotMultiPageEditor editor) throws Throwable{
JSPMultiPageEditor multiPageEditor = editor.getJSPMultiPageEditor();
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -19,14 +19,12 @@
getEditor().navigateTo(22,22);
bot.menu("Source").menu("Add Block Comment").click();
- waitForJobs();
checkVPE("BlockCommentTestToggle.xml");
//Test remove block comment from Source menu
getEditor().navigateTo(22,22);
bot.menu("Source").menu("Remove Block Comment").click();
- waitForJobs();
checkVPE("CommentTestUntoggle.xml");
@@ -34,42 +32,36 @@
getEditor().navigateTo(22,22);
pressBlockCommentHotKeys();
- waitForJobs();
checkVPE("BlockCommentTestToggle.xml");
//Test remove block comment with CTRL+SHIFT+\ hot keys
getEditor().navigateTo(22,22);
pressUnBlockCommentHotKeys();
- waitForJobs();
checkVPE("CommentTestUntoggle.xml");
//Test add block comment lines from Source menu
getEditor().navigateTo(18,22);
bot.menu("Source").menu("Add Block Comment").click();
- waitForJobs();
checkVPE("BlockCommentTestLinesToggle.xml");
//Test remove block comment lines from Source menu
getEditor().navigateTo(18,22);
bot.menu("Source").menu("Remove Block Comment").click();
- waitForJobs();
checkVPE("CommentTestUntoggle.xml");
//Test add block comment lines with CTRL+SHIFT+/ hot keys
getEditor().navigateTo(18,22);
bot.menu("Source").menu("Add Block Comment").click();
- waitForJobs();
checkVPE("BlockCommentTestLinesToggle.xml");
//Test remove block comment lines with CTRL+SHIFT+/ hot keys
getEditor().navigateTo(18,22);
bot.menu("Source").menu("Remove Block Comment").click();
- waitForJobs();
checkVPE("CommentTestUntoggle.xml");
}
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -19,7 +19,6 @@
getEditor().navigateTo(22,22);
bot.menu("Source").menu("Toggle Comment").click();
- waitForJobs();
checkSelectionBar("#comment");
checkVPE("ToggleCommentTestToggle.xml");
@@ -27,7 +26,6 @@
getEditor().navigateTo(22,22);
bot.menu("Source").menu("Toggle Comment").click();
- waitForJobs();
checkSelectionBar("h:commandButton");
checkVPE("CommentTestUntoggle.xml");
@@ -35,7 +33,6 @@
getEditor().navigateTo(22,22);
pressToggleCommentHotKeys();
- waitForJobs();
checkSelectionBar("#comment");
checkVPE("ToggleCommentTestToggle.xml");
@@ -43,7 +40,6 @@
getEditor().navigateTo(22,22);
pressToggleCommentHotKeys();
- waitForJobs();
checkSelectionBar("h:commandButton");
checkVPE("CommentTestUntoggle.xml");
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -60,13 +60,11 @@
}
void checkVPE(String testPage) throws Throwable{
- editor.selectLine(9);
- if (!"<body
id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
- editor.insertText("<body id=\"bodyId\">");
+ try {
+ waitForBlockingJobsAcomplished("Save", VISUAL_REFRESH, VISUAL_UPDATE);
+ } catch (InterruptedException e) {
}
- editor.save();
- waitForJobs();
- performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
+ performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
@Override
@@ -79,7 +77,10 @@
bot.menu("Edit").menu("Delete").click();
editor.setText(editorText);
editor.save();
- waitForJobs();
+ try {
+ waitForBlockingJobsAcomplished("Save");
+ } catch (InterruptedException e) {
+ }
editor.close();
super.tearDown();
}
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -22,14 +22,17 @@
getEditor().setFocus();
bot.menu("Edit").menu("Select All").click();
- waitForJobs();
+ delay();
bot.menu("Edit").menu("Delete").click();
//Test insert test text
getEditor().setText(testText);
getEditor().save();
- waitForJobs();
+ try {
+ waitForBlockingJobsAcomplished("Save", VISUAL_REFRESH, VISUAL_UPDATE);
+ } catch (InterruptedException e) {
+ }
performContentTestByDocument("VerificationOfNameSpaces.xml",
bot.multiPageEditorByTitle(TEST_PAGE));
}
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,7 @@
package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
@@ -44,7 +45,7 @@
bot.shell("New File JSP").activate();
bot.textWithLabel("Name*").setText(TEST_PAGE_FOR_FOLDER);
bot.button("Finish").click();
- waitForJobs();
+ delay();
SWTBotEclipseEditor editorForTestPage =
bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp").toTextEditor();
editorForTestPage.setText(getEditorText());
editorForTestPage.save();
@@ -88,7 +89,10 @@
//Test close Design Options
bot.button("OK").click();
- waitForJobs();
+ try {
+ waitForBlockingJobsAcomplished(VISUAL_REFRESH,VISUAL_UPDATE);
+ } catch (InterruptedException e) {
+ }
//Check page content
@@ -131,7 +135,7 @@
bot.menu("Edit").menu("Delete").click();
bot.shell("Confirm Delete").activate();
bot.button("OK").click();
- waitForJobs();
+ delay();
super.tearDown();
}
@@ -144,24 +148,20 @@
tree.expandNode(JBT_TEST_PROJECT_NAME)
.expandNode("WebContent").expandNode(TEST_FOLDER)
.getNode(TEST_PAGE_FOR_FOLDER+".jsp").doubleClick();
- SWTBotEclipseEditor editor =
bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp").toTextEditor();
- String editorText = editor.getText();
- editor.selectLine(9);
- if (!"<body
id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
- editor.insertText("<body id=\"bodyId\">");
+ SWTBotEditor editor = bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp");
+ try {
+ waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
+ } catch (InterruptedException e) {
}
- editor.save();
- waitForJobs();
//Check page content
try {
- performContentTestByIDs(testPageFolder,
bot.multiPageEditorByTitle(TEST_PAGE_FOR_FOLDER+".jsp"));
+ performContentTestByDocument(testPageFolder,
bot.multiPageEditorByTitle(TEST_PAGE_FOR_FOLDER+".jsp"));
} catch (Throwable e) {
throw e;
}finally{
- editor.setText(editorText);
- editor.saveAndClose();
+ editor.close();
openPage();
}
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -1,6 +1,7 @@
package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
@@ -13,7 +14,6 @@
static final String SUBSTITUTED_EL = "Substituted EL expressions";
private SWTBotEclipseEditor editor;
private String editorText;
- private String textHelloPage;
SWTBotEclipseEditor getEditor() {
@@ -54,13 +54,11 @@
void checkVPEForTestPage(String testPage) throws Throwable{
- editor.selectLine(9);
- if (!"<body
id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
- editor.insertText("<body id=\"bodyId\">");
+ try {
+ waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
+ } catch (InterruptedException e) {
}
- editor.save();
- waitForJobs();
- performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
+ performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
@Override
@@ -70,8 +68,6 @@
@Override
protected void tearDown() throws Exception {
- editor.setText(editorText);
- editor.save();
bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
bot.shell(PAGE_DESIGN).activate();
bot.tabItem(SUBSTITUTED_EL).activate();
@@ -104,24 +100,20 @@
SWTBotTree tree = innerBot.tree();
tree.expandNode(JBT_TEST_PROJECT_NAME)
.expandNode("WebContent").expandNode("pages").getNode("hello.jsp").doubleClick();
- SWTBotEclipseEditor editor = bot.editorByTitle("hello.jsp").toTextEditor();
- textHelloPage = editor.getText();
- editor.selectLine(10);
- if (!"<body
id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
- editor.insertText("<body id=\"bodyId\">");
+ SWTBotEditor editor = bot.editorByTitle("hello.jsp");
+ try {
+ waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
+ } catch (InterruptedException e) {
}
- editor.save();
- waitForJobs();
//Check page content
try {
- performContentTestByIDs(testHelloPage,
bot.multiPageEditorByTitle("hello.jsp"));
+ performContentTestByDocument(testHelloPage,
bot.multiPageEditorByTitle("hello.jsp"));
} catch (Throwable e) {
throw e;
}finally{
- editor.setText(textHelloPage);
- editor.saveAndClose();
+ editor.close();
openPage();
}
}
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -29,7 +29,6 @@
selectSelection();
selectPrompt();
- waitForJobs();
checkIsHide();
//Test Hide selection after reopen
@@ -41,7 +40,6 @@
//Test Show Selection Bar
selectSelection();
- waitForJobs();
checkIsShow();
//Test Show Selection Bar after reopen
@@ -64,7 +62,6 @@
//Test Show Selection Bar from dialog
selectSelection();
- waitForJobs();
checkIsShow();
//Test Show Selection Bar after reopen
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -56,13 +56,11 @@
}
private void checkVPE(String testPage) throws Throwable{
- editor.selectLine(9);
- if (!"<body
id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
- editor.insertText("<body id=\"bodyId\">");
+ try {
+ waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
+ } catch (InterruptedException e) {
}
- editor.save();
- waitForJobs();
- performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
+ performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
private void selectBorder(){
@@ -92,7 +90,10 @@
bot.menu("Edit").menu("Delete").click();
editor.setText(textEditor);
editor.save();
- waitForJobs();
+ try {
+ waitForBlockingJobsAcomplished("Save");
+ } catch (InterruptedException e) {
+ }
editor.close();
super.tearDown();
}
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -30,7 +30,7 @@
bot.shell("New File JSP").activate();
bot.textWithLabel("Name*").setText("testPage");
bot.button("Finish").click();
- waitForJobs();
+ delay();
bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus();
//Check if the tab changed
@@ -74,7 +74,7 @@
bot.button("OK").click();
}catch (WidgetNotFoundException e) {
}
- waitForJobs();
+ delay();
super.tearDown();
}
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -38,7 +38,10 @@
}
private void checkVPE(String testPage) throws Throwable{
- waitForJobs();
+ try {
+ waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
+ } catch (InterruptedException e) {
+ }
performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -60,19 +60,20 @@
bot.menu("Edit").menu("Delete").click();
editor.setText(textEditor);
editor.save();
- waitForJobs();
+ try {
+ waitForBlockingJobsAcomplished("Save");
+ } catch (InterruptedException e) {
+ }
editor.close();
super.tearDown();
}
private void checkVPE(String testPage) throws Throwable{
- editor.selectLine(9);
- if (!"<body
id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
- editor.insertText("<body id=\"bodyId\">");
+ try {
+ waitForBlockingJobsAcomplished(VISUAL_REFRESH, VISUAL_UPDATE);
+ } catch (InterruptedException e) {
}
- editor.save();
- waitForJobs();
- performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
+ performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
}
private void selectELExpressions(){
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -26,7 +26,7 @@
//Test cancel TLD
SWTBotTree tree = bot.tree();
- waitForJobs();
+ delay();
tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("x-1_0-rt.tld
[x_rt]").select();
bot.button("Cancel").click();
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2009-09-08
15:09:41 UTC (rev 17474)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2009-09-08
15:33:00 UTC (rev 17475)
@@ -66,7 +66,7 @@
bot.button("Browse...").click();
bot.shell("Edit TLD").activate();
SWTBotTree tree = bot.tree();
- waitForJobs();
+ delay();
tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("c.tld
[c]").select();
bot.button("OK").click();