[jbosstools-commits] JBoss Tools SVN: r16265 - in workspace/yzhishko: org.jboss.tools.jsf.ui.auto.test/src/org/jboss/tools/jsf/ui/auto/test/cssdialog/jbide and 1 other directories.
Author: yzhishko
Date: 2009-06-29 15:06:55 -0400 (Mon, 29 Jun 2009)
New Revision: 16265
Modified:
workspace/yzhishko/org.jboss.tools.jsf.ui.auto.test/src/org/jboss/tools/jsf/ui/auto/test/JSFAutoTestCase.java
workspace/yzhishko/org.jboss.tools.jsf.ui.auto.test/src/org/jboss/tools/jsf/ui/auto/test/cssdialog/jbide/JBIDE3890Test.java
workspace/yzhishko/org.jboss.tools.vpe.ui.auto.test/src/org/jboss/tools/vpe/ui/auto/test/VPEAutoTestCase.java
Log:
Paths to resources were corrected
Modified:
workspace/yzhishko/org.jboss.tools.jsf.ui.auto.test/src/org/jboss/tools/jsf/ui/auto/test/JSFAutoTestCase.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.jsf.ui.auto.test/src/org/jboss/tools/jsf/ui/auto/test/JSFAutoTestCase.java 2009-06-29
16:50:29 UTC (rev 16264)
+++
workspace/yzhishko/org.jboss.tools.jsf.ui.auto.test/src/org/jboss/tools/jsf/ui/auto/test/JSFAutoTestCase.java 2009-06-29
19:06:55 UTC (rev 16265)
@@ -1,13 +1,15 @@
package org.jboss.tools.jsf.ui.auto.test;
+import java.io.IOException;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.vpe.ui.auto.test.VPEAutoTestCase;
public class JSFAutoTestCase extends VPEAutoTestCase{
@Override
- protected String getPathToResources() {
- return Platform.getBundle(Activator.PLUGIN_ID).getLocation()+"resources/";
+ protected String getPathToResources(String testPage) throws IOException{
+ return
FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/"+testPage
;
}
}
Modified:
workspace/yzhishko/org.jboss.tools.jsf.ui.auto.test/src/org/jboss/tools/jsf/ui/auto/test/cssdialog/jbide/JBIDE3890Test.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.jsf.ui.auto.test/src/org/jboss/tools/jsf/ui/auto/test/cssdialog/jbide/JBIDE3890Test.java 2009-06-29
16:50:29 UTC (rev 16264)
+++
workspace/yzhishko/org.jboss.tools.jsf.ui.auto.test/src/org/jboss/tools/jsf/ui/auto/test/cssdialog/jbide/JBIDE3890Test.java 2009-06-29
19:06:55 UTC (rev 16265)
@@ -28,7 +28,7 @@
editor.insertText("<body id=\"bodyId\">");
delay();
editor.save();
- delay();
+ longDelay();
SWTBotMultiPageEditor multiPageEditor =
bot.multiPageEditorByTitle("hello.jsp");
performContentTest("test.xml", multiPageEditor);
}
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.auto.test/src/org/jboss/tools/vpe/ui/auto/test/VPEAutoTestCase.java
===================================================================
---
workspace/yzhishko/org.jboss.tools.vpe.ui.auto.test/src/org/jboss/tools/vpe/ui/auto/test/VPEAutoTestCase.java 2009-06-29
16:50:29 UTC (rev 16264)
+++
workspace/yzhishko/org.jboss.tools.vpe.ui.auto.test/src/org/jboss/tools/vpe/ui/auto/test/VPEAutoTestCase.java 2009-06-29
19:06:55 UTC (rev 16265)
@@ -5,6 +5,7 @@
import java.io.InputStream;
import java.util.List;
import java.util.Properties;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
@@ -93,8 +94,8 @@
VpeController controller = TestUtil.getVpeController(multiPageEditor);
- String expectedVPEContentFilePath = getPathToResources()+expectedVPEContent;
- expectedVPEContentFilePath = expectedVPEContentFilePath.substring(16);
+ String expectedVPEContentFilePath = getPathToResources(expectedVPEContent);
+// expectedVPEContentFilePath = expectedVPEContentFilePath.substring(16);
File xmlTestFile = new File (expectedVPEContentFilePath);
@@ -162,8 +163,8 @@
return controller.getSourceBuilder().getSourceDocument();
}
- protected String getPathToResources() {
- return Platform.getBundle(Activator.PLUGIN_ID).getLocation()+"resources/";
+ protected String getPathToResources(String testPage) throws IOException {
+ return
FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/"+testPage;
}
@Override