Author: akazakov
Date: 2009-12-30 13:20:47 -0500 (Wed, 30 Dec 2009)
New Revision: 19623
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5383
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2009-12-30
18:13:39 UTC (rev 19622)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2009-12-30
18:20:47 UTC (rev 19623)
@@ -9,6 +9,7 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.osgi.framework.Bundle;
@@ -29,22 +30,24 @@
public IProject importPreparedProject(String packPath) throws Exception {
Bundle b = Platform.getBundle(PLUGIN_ID);
- String projectPath = FileLocator.resolve(b.getEntry(PROJECT_PATH)).getFile();
+
+ IProject project = ResourcesUtils.importProject(b, PROJECT_PATH);
+ String projectPath = project.getLocation().toOSString();
String resourcePath = FileLocator.resolve(b.getEntry(TCK_RESOURCES_PREFIX)).getFile();
File from = new File(resourcePath + packPath);
if(from.isDirectory()) {
File javaSourceTo = new File(projectPath + JAVA_SOURCE_SUFFIX + PACKAGE + packPath);
- FileUtil.copyDir(from, javaSourceTo, false, true, true, new JavaFileFilter());
+ FileUtil.copyDir(from, javaSourceTo, true, true, true, new JavaFileFilter());
File webContentTo = new File(projectPath + WEB_CONTENT_SUFFIX);
- FileUtil.copyDir(from, webContentTo, false, true, true, new PageFileFilter());
+ FileUtil.copyDir(from, webContentTo, true, true, true, new PageFileFilter());
File webInfTo = new File(projectPath + WEB_CONTENT_SUFFIX + WEB_INF_SUFFIX);
- FileUtil.copyDir(from, webInfTo, false, true, true, new XmlFileFilter());
+ FileUtil.copyDir(from, webInfTo, true, true, true, new XmlFileFilter());
}
-
- return ResourcesUtils.importProject(b, PROJECT_PATH);
+ JobUtils.waitForIdle();
+ return project;
}
class JavaFileFilter implements FileFilter {
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30
18:13:39 UTC (rev 19622)
+++
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30
18:20:47 UTC (rev 19623)
@@ -18,6 +18,7 @@
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.JobUtils;
import org.osgi.framework.Bundle;
/**
@@ -27,31 +28,33 @@
private IProject project;
private ContentAssistantTestCase caTest = new ContentAssistantTestCase();
- private static final String PAGE_NAME = "/resources/CATest/test.jsp";
- private String[] beanProposals = new String[] {"sheep"};
- private String[] propertyProposals = new String[] {"sheep"};
+ private static final String PAGE_NAME = "WebContent/test.jsp";
+ private static final String RESOURCE_NAME = "/resources/CATest/test.jsp";
+ private String[] beanProposals = new String[] {"example",
"example.com", "fish", "game", "haddock",
"salmon", "sheep", "tunaFarm", "whitefish",
"wolf"};
+ private String[] propertyProposals = new String[] {"value",
"initialize"};
private final static String UI_TEST_PLUGIN_ID =
"org.jboss.tools.cdi.ui.test";
public CATest() {
super();
try {
project = importPreparedProject("/lookup");
- Bundle core = Platform.getBundle(PLUGIN_ID);
Bundle ui = Platform.getBundle(UI_TEST_PLUGIN_ID);
- String projectPath = FileLocator.resolve(core.getEntry(PROJECT_PATH)).getFile();
- String resourcePath = FileLocator.resolve(ui.getEntry(PAGE_NAME)).getFile();
+ String projectPath = project.getLocation().toString();
+ String resourcePath = FileLocator.resolve(ui.getEntry(RESOURCE_NAME)).getFile();
File from = new File(resourcePath);
- File to = new File(projectPath, "/WebContent");
+ File to = new File(projectPath, PAGE_NAME);
FileUtil.copyFile(from, to);
+ caTest.setProject(project);
+ JobUtils.waitForIdle();
} catch (Exception e) {
e.printStackTrace();
}
}
public void testEL() {
- caTest.checkProposals(PAGE_NAME, "value=\"#{", 0, beanProposals,
false);
- caTest.checkProposals(PAGE_NAME, "rendered=\"#{(game.", 0,
propertyProposals, false);
+ caTest.checkProposals(PAGE_NAME, "value=\"#{", 9, beanProposals,
false);
+ caTest.checkProposals(PAGE_NAME, "rendered=\"#{(game.", 18,
propertyProposals, false);
}
}
\ No newline at end of file
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java 2009-12-30
18:13:39 UTC (rev 19622)
+++
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CDIUIAllTests.java 2009-12-30
18:20:47 UTC (rev 19623)
@@ -20,6 +20,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("CDI UI Tests");
+ suite.addTestSuite(CATest.class);
return suite;
}
}
\ No newline at end of file