12:18 p.m.
Author: akazakov
Date: 2010-09-17 13:18:05 -0400 (Fri, 17 Sep 2010)
New Revision: 25001
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/test.jsp
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/resources/
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java
Log:
JBIDE-7091
https://jira.jboss.org/browse/JBIDE-7091 fixed CDI core tests
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/test.jsp
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/test.jsp
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/test.jsp 2010-09-17
17:18:05 UTC (rev 25001)
@@ -0,0 +1,15 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title>JSF Test Page</title>
+ </head>
+ <body>
+ <f:view>
+ <h1>
+ <h:outputText value="#{sheep.name}"
+ rendered="#{(game.value == 'foo' and game.value == 'foo')
? game.value == 'foo' : false}"/>
+ </h1>
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/test.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2010-09-17 17:10:36 UTC
(rev 25000)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2010-09-17 17:18:05 UTC
(rev 25001)
@@ -1,5 +1,4 @@
bin.includes = META-INF/,\
- resources/,\
.
jars.compile.order = .
source.. = src/
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2010-09-17
17:10:36 UTC (rev 25000)
+++
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2010-09-17
17:18:05 UTC (rev 25001)
@@ -10,20 +10,11 @@
******************************************************************************/
package org.jboss.tools.cdi.ui.test;
-import java.io.File;
-
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.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;
/**
* @author Alexey Kazakov
@@ -33,33 +24,20 @@
private IProject project;
private ContentAssistantTestCase caTest = new ContentAssistantTestCase();
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[] {"game.value",
"game.initialize"};
- private final static String UI_TEST_PLUGIN_ID =
"org.jboss.tools.cdi.ui.test";
public CATest() {
super();
try {
project = TCKTest.importPreparedProject("/tests/lookup");
- Bundle ui = Platform.getBundle(UI_TEST_PLUGIN_ID);
- String projectPath = project.getLocation().toString();
- String resourcePath = FileLocator.resolve(ui.getEntry(RESOURCE_NAME)).getFile();
-
- File from = new File(resourcePath);
- File to = new File(projectPath, PAGE_NAME);
-
- FileUtil.copyFile(from, to);
caTest.setProject(project);
- 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);
}