Author: akazakov
Date: 2009-12-30 14:15:58 -0500 (Wed, 30 Dec 2009)
New Revision: 19624
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
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:20:47 UTC (rev 19623)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2009-12-30
19:15:58 UTC (rev 19624)
@@ -6,7 +6,9 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.test.util.JobUtils;
@@ -45,7 +47,8 @@
File webInfTo = new File(projectPath + WEB_CONTENT_SUFFIX + WEB_INF_SUFFIX);
FileUtil.copyDir(from, webInfTo, true, true, true, new XmlFileFilter());
- }
+ }
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
JobUtils.waitForIdle();
return project;
}
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:20:47 UTC (rev 19623)
+++
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/test/CATest.java 2009-12-30
19:15:58 UTC (rev 19624)
@@ -13,7 +13,9 @@
import java.io.File;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.common.util.FileUtil;
@@ -31,7 +33,7 @@
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 String[] propertyProposals = new String[] {"game.value",
"game.initialize"};
private final static String UI_TEST_PLUGIN_ID =
"org.jboss.tools.cdi.ui.test";
public CATest() {
@@ -47,13 +49,15 @@
FileUtil.copyFile(from, to);
caTest.setProject(project);
- JobUtils.waitForIdle();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ JobUtils.waitForIdle(2000);
} catch (Exception e) {
e.printStackTrace();
}
}
public void testEL() {
+ JobUtils.waitForIdle(2000);
caTest.checkProposals(PAGE_NAME, "value=\"#{", 9, beanProposals,
false);
caTest.checkProposals(PAGE_NAME, "rendered=\"#{(game.", 18,
propertyProposals, false);
}