[jbosstools-commits] JBoss Tools SVN: r44121 - in trunk: jsf/tests/org.jboss.tools.jsf.base.test/projects and 16 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Sep 28 14:48:16 EDT 2012
Author: vrubezhny
Date: 2012-09-28 14:48:15 -0400 (Fri, 28 Sep 2012)
New Revision: 44121
Added:
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.project
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/.jsdtscope
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.component
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken2
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.java
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.original
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.broken
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.java
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.original
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.broken
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.java
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.original
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/TestBeanForVarAttributes.java
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/resources.properties
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/TestWebContent/
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/TestWebContent/inputname.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/META-INF/
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/lib/
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/lib/jsf-api-2.jar
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/lib/richfaces-ui-3.3.3.Final.jar
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/web.xml
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/greeting.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/inputname.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/test.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/varAttributes.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/wtpvalidation.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELFunctionsTest.java
Modified:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ELReferencesQueryParticipantTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ModelFormat_2_0_0_Test.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/ELVariableRefactoringTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MethodRefactoringTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/BuilderValidationTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/VarAttributesTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WTPValidationTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLDetectorAndValidatorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CADefaultELStartingCharTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELInsideTagBodyInJspFileTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfAddInfoInELMessagesTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsFilteringTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfPredictiveTagNameProposalsTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfResourceBundlePropertyApplyTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CASuggestsNotOnlyELProposalsJBIDE2437Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JavaClassContentAssistProviderTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1704Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1717Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide6259Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspLongResourceBundlePropertyNamesTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JspElFunctionsTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/hover/ELTooltipTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestPalette.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELRefactoringTest.java
Log:
JBIDE-8924
Code completion for EL functions doesn't work for complex ELs.
JUnit Test is added
*.jsf.test/*jsf.ui.test tests setup is optimized
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -16,6 +16,7 @@
import junit.framework.TestCase;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.ContentAssistant;
@@ -43,6 +44,12 @@
public void openEditor(String fileName) {
this.fileName = fileName;
+
+ IFile testfile = project.getFile(fileName);
+// System.out.println(testfile.toString() + ": testfile.exists(): " + testfile.exists() + ", testfile.isAccessible(): " + testfile.isAccessible());
+ assertTrue("Test file doesn't exist: " + project.getName() + "/" + fileName,
+ (testfile.exists() && testfile.isAccessible()));
+
editorPart = WorkbenchUtils.openEditor(project.getName()+"/"+ fileName); //$NON-NLS-1$
obtainTextEditor(editorPart);
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.classpath (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.classpath 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 6.x Runtime">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.jsf;jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.project (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.project 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jsf2pr</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/.jsdtscope
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/.jsdtscope (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/.jsdtscope 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.component 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="jsf2pr">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/" source-path="/TestWebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+ <property name="context-root" value="jsf2pr"/>
+ <property name="java-output-path" value="/jsf2pr/WebContent/WEB-INF/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,7 @@
+<root>
+ <facet id="jst.jsf">
+ <node name="libprov">
+ <attribute name="provider-id" value="jsf-no-op-library-provider"/>
+ </node>
+ </facet>
+</root>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 6.x Runtime"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="java"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="jst.jsf"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="jst.jsf" version="2.0"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,9 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.jboss.tools.common.validation.ValidatorManager;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.jboss.tools.common.validation.ValidatorManager;
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.400.v201204260100
+eclipse.preferences.version=1
+override=false
+suspend=false
+vals/org.eclipse.jst.jsf.facelet.ui.FaceletHTMLValidator/global=FF01
+vf.version=3
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,15 @@
+package demo;
+
+import javax.faces.bean.ManagedBean;
+
+ at ManagedBean(name="authenticator")
+public class Authenticator {
+
+ public Test getTestBroken() {
+ return null;
+ }
+
+ public boolean authenticate() {
+ return true;
+ }
+}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken2
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken2 (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.broken2 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,15 @@
+package demo;
+
+import javax.faces.bean.ManagedBean;
+
+ at ManagedBean(name="authenticatorBroken")
+public class Authenticator {
+
+ public Test getTest() {
+ return null;
+ }
+
+ public boolean authenticate() {
+ return true;
+ }
+}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,15 @@
+package demo;
+
+import javax.faces.bean.ManagedBean;
+
+ at ManagedBean(name="authenticator")
+public class Authenticator {
+
+ public Test getTest() {
+ return null;
+ }
+
+ public boolean authenticate() {
+ return true;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.original
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.original (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Authenticator.original 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,15 @@
+package demo;
+
+import javax.faces.bean.ManagedBean;
+
+ at ManagedBean(name="authenticator")
+public class Authenticator {
+
+ public Test getTest() {
+ return null;
+ }
+
+ public boolean authenticate() {
+ return true;
+ }
+}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.broken
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.broken (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.broken 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,11 @@
+package demo;
+
+public class Test {
+ public Test2 getStringBroken() {
+ return null;
+ }
+
+ public String foo() {
+ return null;
+ }
+}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,11 @@
+package demo;
+
+public class Test {
+ public Test2 getString() {
+ return null;
+ }
+
+ public String foo() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.original
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.original (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test.original 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,11 @@
+package demo;
+
+public class Test {
+ public Test2 getString() {
+ return null;
+ }
+
+ public String foo() {
+ return null;
+ }
+}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.broken
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.broken (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.broken 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,12 @@
+package demo;
+
+public class Test2 {
+
+ public String getNewStringBroken() {
+ return null;
+ }
+
+ public String foo() {
+ return null;
+ }
+}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,12 @@
+package demo;
+
+public class Test2 {
+
+ public String getNewString() {
+ return null;
+ }
+
+ public String foo() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.original
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.original (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/Test2.original 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,12 @@
+package demo;
+
+public class Test2 {
+
+ public String getNewString() {
+ return null;
+ }
+
+ public String foo() {
+ return null;
+ }
+}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/TestBeanForVarAttributes.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/TestBeanForVarAttributes.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/TestBeanForVarAttributes.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,52 @@
+package demo;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.model.DataModel;
+
+ at ManagedBean
+public class TestBeanForVarAttributes {
+
+ public Test getTest() {
+ return null;
+ }
+
+ public List<Value> getList() {
+ return null;
+ }
+
+ public Set<Value> getSet() {
+ return null;
+ }
+
+ public Map<String, Value> getMap() {
+ return null;
+ }
+
+ public Iterable<Value> getIterable() {
+ return null;
+ }
+
+ public Value[] getArray() {
+ return null;
+ }
+
+ public DataModel<Value> getListDM() {
+ return null;
+ }
+
+ public static class Value {
+ public String getName() {
+ return null;
+ }
+ }
+
+ public static class Test {
+ public List<Value> getItems() {
+ return null;
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/TestBeanForVarAttributes.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/resources.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/resources.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/resources.properties 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,2 @@
+prompt=Your Name\:
+greeting=Hello
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/resources.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/TestWebContent/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/TestWebContent/inputname.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/TestWebContent/inputname.xhtml 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <h:outputText value="#{msgs.broken}" />
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/TestWebContent/inputname.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/META-INF/MANIFEST.MF 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/faces-config.xml 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
+
+ <navigation-rule>
+ <from-view-id>/pages/inputname.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>greeting</from-outcome>
+ <to-view-id>/pages/greeting.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <application>
+ <resource-bundle>
+ <base-name>resources</base-name>
+ <var>msgs</var>
+ </resource-bundle>
+ </application>
+</faces-config>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/lib/jsf-api-2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/lib/jsf-api-2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/lib/richfaces-ui-3.3.3.Final.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/lib/richfaces-ui-3.3.3.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/web.xml 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ <display-name>jsf2pr</display-name>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/greeting.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/greeting.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/greeting.xhtml 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <ui:composition template="/templates/common.xhtml">
+ #{rich:findComponent().}
+ <ui:define name="pageTitle">Greeting to User</ui:define>
+ <ui:define name="pageHeader">Greeting Page</ui:define>
+ <ui:define name="body">
+ #{msgs.greeting} #{user.name}!
+ </ui:define>
+ </ui:composition>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/greeting.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/inputname.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/inputname.xhtml 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <h:outputText value="#{msgs.broken}" />
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/inputname.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/test.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/test.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/test.xhtml 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <h:outputText value="#{authenticator.test.string.newString}" />
+ <h:outputText value="#{authenticator.authenticate()}" />
+ <h:outputText value="#{authenticator.test.foo()}" />
+ <h:outputText value="#{authenticator.test.string.foo()}" />
+
+ <h:outputText value="#{authenticator.broken}" />
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/test.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/varAttributes.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/varAttributes.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/varAttributes.xhtml 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+
+ <h:dataTable value="#{testBeanForVarAttributes.test}" var="testItem">
+ <h:dataTable value="#{testItem.items}" var="test">
+ <h:outputText value="#{test.name}"/>
+ <h:outputText value="#{test.broken}"/>
+ </h:dataTable>
+ <h:outputText value="#{testItem.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.map}" var="mapItem">
+ <h:outputText value="#{mapItem.value.name}"/>
+ <h:outputText value="#{mapItem.key.bytes}"/>
+ <h:outputText value="#{mapItem.broken}"/>
+ <h:outputText value="#{mapItem.value.broken}"/>
+ <h:outputText value="#{mapItem.key.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.array}" var="arrayItem">
+ <h:outputText value="#{arrayItem.name}"/>
+ <h:outputText value="#{arrayItem.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.iterable}" var="iterableItem">
+ <h:outputText value="#{iterableItem.name}"/>
+ <h:outputText value="#{iterableItem.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.list}" var="listItem">
+ <h:outputText value="#{listItem.name}"/>
+ <h:outputText value="#{listItem.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.listDM}" var="dmItem">
+ <h:outputText value="#{dmItem.name}"/>
+ <h:outputText value="#{dmItem.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.set}" var="setItem">
+ <h:outputText value="#{setItem.name}"/>
+ <h:outputText value="#{setItem.broken}"/>
+ </h:dataTable>
+
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/varAttributes.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/wtpvalidation.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/wtpvalidation.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/wtpvalidation.xhtml 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <h:commandButton id="register" action="#{authenticator.authenticate}" value="Register"/>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/wtpvalidation.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ELReferencesQueryParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ELReferencesQueryParticipantTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ELReferencesQueryParticipantTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.test;
import java.util.ArrayList;
@@ -5,13 +15,10 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.common.base.test.kb.QueryParticipantTestUtils;
import org.jboss.tools.common.base.test.kb.QueryParticipantTestUtils.MatchStructure;
import org.jboss.tools.jst.web.kb.refactoring.ELReferencesQueryParticipant;
-import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
public class ELReferencesQueryParticipantTest extends TestCase{
@@ -24,8 +31,6 @@
protected void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(projectName);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle(2000);
}
public void testELReferencesQueryParticipantForType() throws CoreException{
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.test;
import java.util.List;
@@ -6,27 +16,20 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.project.list.IWebPromptingProvider;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
public class JSFBeansTest extends TestCase {
- TestProjectProvider provider = null;
IProject project = null;
- boolean makeCopy = true;
public JSFBeansTest() {}
public void setUp() throws CoreException {
- project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("JSFKickStartOldFormat");
- if(project==null) {
- provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSFKickStartOldFormat", false);
- project = provider.getProject();
- }
+ project = ProjectImportTestSetup.loadProject("JSFKickStartOldFormat");
}
public void testBeanWithSuper() {
@@ -48,11 +51,11 @@
assertTrue("Method setX3 is not found. It is not a setter because it has 2 parameters", result.contains("setX3"));
}
- protected void tearDown() throws CoreException{
- if(provider!=null) {
- provider.dispose();
- provider = null;
- }
- }
+// protected void tearDown() throws CoreException{
+// if(provider!=null) {
+// provider.dispose();
+// provider = null;
+// }
+// }
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,12 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jsf.test;
@@ -16,11 +16,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.internal.core.JavaModelManager;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.AbstractXMLFileImpl;
@@ -28,28 +24,19 @@
import org.jboss.tools.common.model.loaders.EntityRecognizerContext;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.test.util.TestDescription;
-import org.jboss.tools.test.util.TestDescriptionFactory;
-import org.jboss.tools.test.util.TestProjectProvider;
import org.jboss.tools.jsf.model.pv.JSFProjectsRoot;
import org.jboss.tools.jsf.model.pv.JSFProjectsTree;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.test.util.TestDescription;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.TestDescriptionFactory;
public class JSFModelTest extends TestCase {
- TestProjectProvider provider = null;
IProject project = null;
- boolean makeCopy = true;
public JSFModelTest() {}
public void setUp() throws Exception {
- project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("JSFKickStartOldFormat");
- if(project==null) {
- provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSFKickStartOldFormat", false);
- project = provider.getProject();
- }
-
+ project = ProjectImportTestSetup.loadProject("JSFKickStartOldFormat");
}
public void testModelExists() {
@@ -168,11 +155,11 @@
}
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- provider=null;
- }
- }
+// protected void tearDown() throws Exception {
+// if(provider != null) {
+// provider.dispose();
+// provider=null;
+// }
+// }
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2012 Exadel, Inc. and Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -43,6 +43,7 @@
ValidationExceptionTest.initLogger();
TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$
+
suite.addTestSuite(JSFTemplateTest.class);
suite.addTestSuite(JSFFacetOnExistingProjectTest.class);
@@ -54,18 +55,21 @@
new String[]{"JSF2Beans", "JSF2Web"});
suite.addTest(testSetup);
- TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$
- old.addTestSuite(JSFModelTest.class);
- old.addTestSuite(ModelFormat_2_0_0_Test.class);
- old.addTestSuite(JSFBeansTest.class);
- suite.addTestSuite(WebContentTest.class);
- suite.addTestSuite(XHTMLValidatorTest.class);
- suite.addTestSuite(XHTMLDetectorAndValidatorTest.class);
suite.addTestSuite(XMLCatalogTest.class);
suite.addTestSuite(JSFPaletteTest.class);
- suite.addTest(new ProjectImportTestSetup(old,
+
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ JSFModelTest.class,
+ ModelFormat_2_0_0_Test.class,
+ JSFBeansTest.class,
+ ELValidatorTest.class,
+ ELVariableRefactoringTest.class,
+ MethodRefactoringTest.class,
+ MessagePropertyRefactoringTest.class
+ ),
"org.jboss.tools.jsf.test", "projects/JSFKickStartOldFormat", //$NON-NLS-1$ //$NON-NLS-2$
"JSFKickStartOldFormat")); //$NON-NLS-1$
+
suite.addTest(new ProjectImportTestSetup(new TestSuite(
JSFPromptingProviderTest.class),
"org.jboss.tools.jsf.test", //$NON-NLS-1$
@@ -76,42 +80,34 @@
"org.jboss.tools.jsf.test", //$NON-NLS-1$
JsfJbide7975Test.TEST_PROJECT_PATH,
JsfJbide7975Test.TEST_PROJECT_NAME));
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
- ELVariableRefactoringTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
- new String[] { "projects/JSFKickStartOldFormat" }, //$NON-NLS-1$
- new String[] { "JSFKickStartOldFormat" })); //$NON-NLS-1$
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
- MethodRefactoringTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
- new String[] { "projects/JSFKickStartOldFormat" }, //$NON-NLS-1$
- new String[] { "JSFKickStartOldFormat" })); //$NON-NLS-1$
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
- MessagePropertyRefactoringTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
- new String[] { "projects/JSFKickStartOldFormat" }, //$NON-NLS-1$
- new String[] { "JSFKickStartOldFormat" })); //$NON-NLS-1$
+
suite.addTest(new ValidationProjectTestSetup(new TestSuite(
JSF2ComponentsValidatorTest.class,
JSF2ComponentsInClassFolderTest.class,
FacesConfigValidatorTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
new String[] { "projects/JSF2ComponentsValidator" }, //$NON-NLS-1$
new String[] { "JSF2ComponentsValidator" })); //$NON-NLS-1$
+
suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ ELReferencesQueryParticipantTest.class,
JSF2RefactoringTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
new String[] { "projects/JSF2ComponentsValidator" }, //$NON-NLS-1$
new String[] { "JSF2ComponentsValidator" })); //$NON-NLS-1$
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
- ELReferencesQueryParticipantTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
- new String[] { "projects/JSF2ComponentsValidator" }, //$NON-NLS-1$
- new String[] { "JSF2ComponentsValidator" })); //$NON-NLS-1$
+
// suite.addTest(new ProjectImportTestSetup(new TestSuite(
// I18nValidatorTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
// new String[] { "projects/i18nTestProject" }, //$NON-NLS-1$
// new String[] { "i18nTestProject" })); //$NON-NLS-1$
- suite.addTest(new ValidationProjectTestSetup(new TestSuite(ELValidatorTest.class),"org.jboss.tools.jsf.test","projects/JSFKickStartOldFormat","JSFKickStartOldFormat"));
- suite.addTest(new ValidationProjectTestSetup(new TestSuite(BuilderValidationTest.class),"org.jboss.tools.jsf.test","projects/jsf2pr","jsf2pr"));
- suite.addTest(new ValidationProjectTestSetup(new TestSuite(VarAttributesTest.class),"org.jboss.tools.jsf.test","projects/jsf2pr","jsf2pr"));
- suite.addTest(new ValidationProjectTestSetup(new TestSuite(WTPValidationTest.class),"org.jboss.tools.jsf.test","projects/jsf2pr","jsf2pr"));
+ suite.addTest(new ValidationProjectTestSetup(new TestSuite(
+ WebContentTest.class,
+ XHTMLValidatorTest.class,
+ XHTMLDetectorAndValidatorTest.class,
+ BuilderValidationTest.class,
+ VarAttributesTest.class,
+ WTPValidationTest.class
+ ),"org.jboss.tools.jsf.base.test","projects/jsf2pr","jsf2pr"));
+
suite.addTestSuite(ValidationExceptionTest.class); // This test should be added last!
return new DisableJavaIndexingSetup(suite);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ModelFormat_2_0_0_Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ModelFormat_2_0_0_Test.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ModelFormat_2_0_0_Test.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,12 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jsf.test;
@@ -16,32 +16,22 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.test.util.TestProjectProvider;
import org.jboss.tools.jsf.model.pv.JSFProjectsRoot;
import org.jboss.tools.jsf.model.pv.JSFProjectsTree;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
public class ModelFormat_2_0_0_Test extends TestCase {
- TestProjectProvider provider = null;
IProject project = null;
- boolean makeCopy = true;
public ModelFormat_2_0_0_Test() {}
public void setUp() throws Exception {
- project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("JSFKickStartOldFormat");
- if(project == null) {
- provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSFKickStartOldFormat", false);
- project = provider.getProject();
- }
+ project = ProjectImportTestSetup.loadProject("JSFKickStartOldFormat");
}
public void testModelExists() {
@@ -92,11 +82,11 @@
}
}
- protected void tearDown() throws Exception {
- if(provider!=null) {
- provider.dispose();
- provider=null;
- }
- }
+// protected void tearDown() throws Exception {
+// if(provider!=null) {
+// provider.dispose();
+// provider=null;
+// }
+// }
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/ELVariableRefactoringTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/ELVariableRefactoringTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/ELVariableRefactoringTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.test.refactoring;
import java.util.ArrayList;
@@ -4,9 +14,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.common.base.test.AbstractRefactorTest;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jsf.el.refactoring.RenameELVariableProcessor;
@@ -25,7 +33,6 @@
protected void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(projectName);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public void testELVariableRename() throws CoreException {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.test.refactoring;
import java.util.ArrayList;
@@ -6,13 +16,13 @@
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.ltk.internal.core.refactoring.resource.MoveResourcesProcessor;
import org.eclipse.ltk.internal.core.refactoring.resource.RenameResourceProcessor;
import org.jboss.tools.common.base.test.AbstractRefactorTest;
import org.jboss.tools.jsf.jsf2.refactoring.JSF2RenameParticipant;
import org.jboss.tools.jsf.jsf2.refactoring.JSf2MoveParticipant;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
public class JSF2RefactoringTest extends AbstractRefactorTest {
static String PROJECT_NAME = "JSF2ComponentsValidator";
@@ -24,7 +34,7 @@
@Override
protected void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
public void testRenameCompositeComponentFile() throws CoreException {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.test.refactoring;
import java.util.ArrayList;
@@ -4,9 +14,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.TextSelection;
import org.jboss.tools.common.base.test.AbstractRefactorTest;
import org.jboss.tools.common.el.core.resolver.ELSegment;
@@ -29,7 +37,6 @@
protected void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(projectName);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public void testMessagePropertyRename() throws CoreException {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MethodRefactoringTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MethodRefactoringTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MethodRefactoringTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.test.refactoring;
import java.lang.reflect.InvocationTargetException;
@@ -5,7 +15,6 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IJavaProject;
@@ -32,7 +41,6 @@
protected void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(projectName);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public void testMethodRename() throws CoreException, InvocationTargetException, InterruptedException {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/BuilderValidationTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/BuilderValidationTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/BuilderValidationTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -11,9 +11,9 @@
package org.jboss.tools.jsf.test.validation;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -28,7 +28,7 @@
*/
@Override
protected void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject("jsf2pr");
+ project = ProjectImportTestSetup.loadProject("jsf2pr");
}
/**
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.test.validation;
import java.text.MessageFormat;
@@ -9,7 +19,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -30,6 +39,7 @@
import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
import org.jboss.tools.jst.web.kb.internal.validation.ELValidator;
import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
public class ELValidatorTest extends AbstractResourceMarkerTest{
@@ -38,7 +48,8 @@
protected void setUp() throws Exception {
// JobUtils.waitForIdle();
- project = ResourcesPlugin.getWorkspace().getRoot().getProject("JSFKickStartOldFormat");
+ project = ProjectImportTestSetup.loadProject("JSFKickStartOldFormat");
+
// this.project.build(IncrementalProjectBuilder.CLEAN_BUILD,
// new NullProgressMonitor());
//
@@ -81,6 +92,7 @@
new Object[] {"user"},
14);
} finally {
+ copyContentsFile("WebContent/WEB-INF/faces-config.xml", "WebContent/WEB-INF/faces-config.original");
store.setValue(ELSeverityPreferences.RE_VALIDATE_UNRESOLVED_EL, ELSeverityPreferences.ENABLE);
store.setValue(ELSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, ELSeverityPreferences.IGNORE);
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2010 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2012 Exadel, Inc. and Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -10,20 +10,16 @@
******************************************************************************/
package org.jboss.tools.jsf.test.validation;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
-
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.validation.ValidationFramework;
import org.jboss.tools.jsf.model.JSFConstants;
import org.jboss.tools.jsf.web.validation.JSFValidationMessage;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
@@ -42,7 +38,7 @@
@Override
protected void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
public void testNavigation() throws Exception {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2010 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2012 Exadel, Inc. and Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -13,12 +13,12 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.taglib.IAttribute;
import org.jboss.tools.jst.web.kb.taglib.IComponent;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
*
@@ -35,7 +35,7 @@
@Override
protected void setUp() throws Exception {
- project = project = ResourcesPlugin.getWorkspace().getRoot().getProject(JSF2ComponentsValidatorTest.PROJECT_NAME);
+ project = ProjectImportTestSetup.loadProject(JSF2ComponentsValidatorTest.PROJECT_NAME);
}
public void testJSF2ComponentsInClassFolder() throws Exception {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,12 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2007-2010 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jsf.test.validation;
@@ -20,13 +20,13 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.validation.ValidationFramework;
import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil;
import org.jboss.tools.jsf.web.validation.JSFValidationMessage;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
@@ -45,7 +45,7 @@
@Override
protected void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
//junit test add to check JBIDE-7016 by Maksim Areshkau
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/VarAttributesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/VarAttributesTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/VarAttributesTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -16,8 +16,8 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
@@ -32,7 +32,8 @@
@Override
protected void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject("jsf2pr");
+ project = ProjectImportTestSetup.loadProject("jsf2pr");
+
xhtml = project.getFile("WebContent/varAttributes.xhtml");
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WTPValidationTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WTPValidationTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WTPValidationTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -14,7 +14,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
@@ -27,7 +27,8 @@
@Override
protected void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject("jsf2pr");
+ project = ProjectImportTestSetup.loadProject("jsf2pr");
+
xhtml = project.getFile("WebContent/wtpvalidation.xhtml");
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -14,12 +14,10 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
@@ -37,24 +35,11 @@
*/
@Override
protected void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
- if(!project.exists()) {
- project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH);
- }
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
+
TestUtil._waitForValidation(project);
}
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
- boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- project.delete(true, true, null);
- JobUtils.waitForIdle();
- ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- }
-
public void testWebContentValidation() throws CoreException {
IFile file = project.getFile("WebContent/inputname.xhtml");
AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, "broken"), 6);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLDetectorAndValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLDetectorAndValidatorTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLDetectorAndValidatorTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -18,7 +18,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -32,7 +31,7 @@
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.web.validation.XHTMLValidator;
-import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
import org.osgi.framework.Bundle;
@@ -69,10 +68,8 @@
*/
@Override
protected void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
- if(!project.exists()) {
- project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH);
- }
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
+
TestUtil._waitForValidation(project);
}
@@ -147,8 +144,8 @@
try {
Bundle b = Platform.getBundle(PLUGIN_ID);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
- String projectPath = p.getLocation().toOSString();
+// IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
+ String projectPath = project.getLocation().toOSString();
String resourcePath = FileLocator.resolve(b.getEntry(SOURCE_FOLDER)).getFile();
File from = new File(resourcePath + sourceFile);
@@ -157,8 +154,8 @@
if (!FileUtil.copyFile(from, to)) {
return null;
}
- p.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- TestUtil._waitForValidation(p);
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ TestUtil._waitForValidation(project);
} catch (IOException e) {
fail(e.getLocalizedMessage());
} catch (CoreException e) {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009-2011 Red Hat, Inc.
+ * Copyright (c) 2009-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -20,7 +20,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.validation.ValidationResult;
@@ -29,7 +28,7 @@
import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.jsf.web.validation.JSFValidationMessage;
import org.jboss.tools.jsf.web.validation.XHTMLValidator;
-import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
@@ -75,10 +74,8 @@
*/
@Override
protected void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
- if(!project.exists()) {
- project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH);
- }
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
+
TestUtil._waitForValidation(project);
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CADefaultELStartingCharTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CADefaultELStartingCharTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CADefaultELStartingCharTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -15,8 +15,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
@@ -43,7 +41,6 @@
public void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public static Test suite() {
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELFunctionsTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELFunctionsTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELFunctionsTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.jsp.ca.test;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+/**
+ * Test for https://jira.jboss.org/jira/browse/JBIDE-8924
+ *
+ * @author Victor V. Rubezhny
+ *
+ */
+public class CAELFunctionsTest extends ContentAssistantTestCase {
+ private static final String PROJECT_NAME = "jsf2pr";
+ private static final String PAGE_NAME = "/WebContent/greeting.xhtml";
+ private static final String EL_TO_FIND = "#{rich:findComponent().";
+ private static final String[] PROPOSALS = { // Compare first 5 proposals
+ "rich:findcomponent().attributes",
+ "rich:findComponent().broadcast()",
+ "rich:findComponent().childCount",
+ "rich:findComponent().children",
+ "rich:findComponent().clearInitialState()"
+ };
+
+ public void setUp() throws Exception {
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
+ }
+
+ /**
+ * Test for https://jira.jboss.org/jira/browse/JBIDE-8924
+ */
+ public void testELFunctions() {
+ assertNotNull("Test project \"" + PROJECT_NAME + "\" is not loaded", project);
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ } catch (CoreException e) {
+ fail(e.getMessage());
+ e.printStackTrace();
+ }
+ checkProposals(PAGE_NAME, EL_TO_FIND, EL_TO_FIND.length(), PROPOSALS, false);
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELFunctionsTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELInsideTagBodyInJspFileTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELInsideTagBodyInJspFileTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELInsideTagBodyInJspFileTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -15,8 +15,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
@@ -41,7 +39,6 @@
public void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public static Test suite() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -19,8 +19,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
@@ -55,7 +53,6 @@
public void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public static Test suite() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -11,27 +11,18 @@
package org.jboss.tools.jsf.jsp.ca.test;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
public class CAInEventAttributesTest extends ContentAssistantTestCase{
- TestProjectProvider provider = null;
- boolean makeCopy = true;
private static final String PROJECT_NAME = "testJSFProject"; //$NON-NLS-1$
private static final String JSP_PAGE_NAME = "/WebContent/pages/inputUserName.jsp"; //$NON-NLS-1$
private static final String XHTML_PAGE_NAME = "/WebContent/pages/inputname.xhtml"; //$NON-NLS-1$
private static final String HTML_PAGE_NAME = "/WebContent/pages/inputname.html"; //$NON-NLS-1$
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME, makeCopy); //$NON-NLS-1$
- project = provider.getProject();
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
public void testCAInOnclickInJSP(){
String[] proposals = {
"user", //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfAddInfoInELMessagesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfAddInfoInELMessagesTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfAddInfoInELMessagesTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -17,8 +17,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal;
@@ -43,7 +41,6 @@
public void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public static Test suite() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsFilteringTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsFilteringTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsFilteringTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -15,8 +15,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
@@ -44,7 +42,6 @@
public void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public static Test suite() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -15,8 +15,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
@@ -40,7 +38,6 @@
public void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public static Test suite() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfPredictiveTagNameProposalsTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfPredictiveTagNameProposalsTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfPredictiveTagNameProposalsTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -17,7 +17,7 @@
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
* The JUnit test case for issue JBIDE-12177
@@ -33,11 +33,8 @@
private static final String INSERTION = "<define";
private static final String PROPOSAL_TO_APPLY = "ui:define";
- private TestProjectProvider provider = null;
-
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME,false); //$NON-NLS-1$
- project = provider.getProject();
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
public void testJsfPredictiveTagNameProposals() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfResourceBundlePropertyApplyTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfResourceBundlePropertyApplyTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfResourceBundlePropertyApplyTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -20,7 +20,7 @@
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
* The JUnit test case for issue JBIDE-10320
@@ -37,12 +37,9 @@
private static final String PROPOSAL_TO_APPLY_STRING = "msgs['prompt']}";
private static final String COMPARE_STRING[] = {"#{msgs['prompt']}\"", "#{msgs['prompt']}"};
private static final String END_OF_SEQUENCE[] = {"\"", "]"};
-
- private TestProjectProvider provider = null;
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME,false); //$NON-NLS-1$
- project = provider.getProject();
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
public static Test suite() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.jsp.ca.test;
import java.util.ArrayList;
@@ -11,7 +21,7 @@
import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
* JBIDE-4341 JstJspAllTests/testJsfJspJbide1813Test failing with missing applicationScope in completions
*
@@ -23,8 +33,6 @@
*
*/
public class CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test extends ContentAssistantTestCase {
- TestProjectProvider provider = null;
- boolean makeCopy = false;
private static final String PROJECT_NAME = "JsfJbide1704Test";
private static final String PAGE_NAME = "/WebContent/pages/greeting";
private static final String[] PAGE_EXTS = {".jsp", ".xhtml"};
@@ -38,16 +46,9 @@
}
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
public void testProposalListIsNotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759() {
try {
JobUtils.waitForIdle();
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CASuggestsNotOnlyELProposalsJBIDE2437Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CASuggestsNotOnlyELProposalsJBIDE2437Test.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CASuggestsNotOnlyELProposalsJBIDE2437Test.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.jsp.ca.test;
import java.util.List;
@@ -9,17 +19,13 @@
import org.eclipse.jface.text.FindReplaceDocumentAdapter;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
public class CASuggestsNotOnlyELProposalsJBIDE2437Test extends ContentAssistantTestCase {
- TestProjectProvider provider = null;
-
- boolean makeCopy = false;
private static final String PROJECT_NAME = "JsfJbide1704Test";
private static final String PAGE_NAME = "/WebContent/pages/greeting1.xhtml";
@@ -28,19 +34,12 @@
}
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
- protected void tearDown() throws Exception {
- provider.dispose();
- }
-
public void testThereAreNotOnlyELProposalsJBIDE2437 () throws BadLocationException {
openEditor(PAGE_NAME);
JobUtils.waitForIdle();
-// ICompletionProposal[] result= null;
-// String errorMessage = null;
IRegion reg = new FindReplaceDocumentAdapter(document).find(0, "/templates/common.xhtml", true, true, false, false);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JavaClassContentAssistProviderTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JavaClassContentAssistProviderTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JavaClassContentAssistProviderTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.jsp.ca.test;
import java.util.ArrayList;
@@ -6,9 +16,9 @@
import java.util.Properties;
import java.util.Set;
+import junit.framework.TestCase;
+
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.fieldassist.IContentProposal;
import org.eclipse.jface.fieldassist.IContentProposalProvider;
import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
@@ -21,8 +31,6 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.test.util.ProjectImportTestSetup;
-import junit.framework.TestCase;
-
public class JavaClassContentAssistProviderTest extends TestCase {
static String jsfProjectName = "testJSFProject";
static IProject jsfProject;
@@ -37,7 +45,6 @@
private void loadProjects() throws Exception {
jsfProject = ProjectImportTestSetup.loadProject(jsfProjectName);
- jsfProject.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public void testJavaClassContentAssistProvider() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -18,7 +18,7 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
* Test cast testing http://jira.jboss.com/jira/browse/JBIDE-3845 issue.
@@ -31,9 +31,6 @@
private static final String JSP_PAGE_NAME = "/WebContent/pages/jsp_page.jsp"; //$NON-NLS-1$
private static final String XHTML_PAGE_NAME = "/WebContent/pages/xhtml_page.xhtml"; //$NON-NLS-1$
private static final String[] PROPOSALS = new String[] {"Message['org.jboss.tools.long.property.Name']"}; //$NON-NLS-1$
-
- private TestProjectProvider provider = null;
-
private static final String STRING_TO_FIND = "#{Message[";
@@ -42,16 +39,9 @@
}
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME,false); //$NON-NLS-1$
- project = provider.getProject();
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
public void testJbide3845OnJspPage(){
doTheResourceBundleCAForALongPropertyNameTest(JSP_PAGE_NAME, STRING_TO_FIND, PROPOSALS);
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1704Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1704Test.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1704Test.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.jsp.ca.test;
import java.util.List;
@@ -13,12 +23,9 @@
import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
public class JsfJspJbide1704Test extends ContentAssistantTestCase {
- TestProjectProvider provider = null;
-
- boolean makeCopy = false;
private static final String PROJECT_NAME = "JsfJbide1704Test";
private static final String PAGE_NAME = "/WebContent/pages/greeting";
@@ -27,16 +34,9 @@
}
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
public void testJspJbide1704 () {
assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
doTestJsfJspJbide1704(PAGE_NAME + ".jsp");
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1717Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1717Test.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide1717Test.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.jsp.ca.test;
import java.util.ArrayList;
@@ -11,12 +21,10 @@
import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
public class JsfJspJbide1717Test extends ContentAssistantTestCase {
- TestProjectProvider provider = null;
- boolean makeCopy = false;
private static final String PROJECT_NAME = "JsfJbide1704Test";
private static final String PAGE_NAME = "/WebContent/pages/greeting.jsp";
private static final String INSERT_BEFORE_STRING = "<h:outputText";
@@ -29,16 +37,9 @@
}
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
public void testJstJspJbide1717() {
openEditor(PAGE_NAME);
@@ -111,6 +112,4 @@
closeEditor();
}
-
-
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide6259Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide6259Test.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspJbide6259Test.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.jsp.ca.test;
import java.util.HashSet;
@@ -11,18 +21,14 @@
import org.eclipse.jface.text.FindReplaceDocumentAdapter;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
+import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.ca.preferences.ELContentAssistPreferences;
-import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
public class JsfJspJbide6259Test extends ContentAssistantTestCase {
- TestProjectProvider provider = null;
-
- boolean makeCopy = false;
private static final String PROJECT_NAME = "JsfJbide1704Test";
private static final String PAGE_NAME = "/WebContent/pages/greeting.jsp";
@@ -31,16 +37,9 @@
}
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
private static final String EXPRESSION_STRING = "#{person.";
private static final String[] TEST_PROPOSAL_EMPTY_SET_EMPTY = new String[0];
private static final String[] TEST_PROPOSAL_SET_GETTERS_AND_SETTERS_TRUE = {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspLongResourceBundlePropertyNamesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspLongResourceBundlePropertyNamesTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJspLongResourceBundlePropertyNamesTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -15,8 +15,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
@@ -43,7 +41,6 @@
public void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public static Test suite() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JspElFunctionsTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JspElFunctionsTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JspElFunctionsTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -19,7 +19,7 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
* Test for CA on JSP EL Functions
@@ -29,7 +29,6 @@
public class JspElFunctionsTest extends ContentAssistantTestCase {
private static final String PROJECT_NAME = "testJSFProject"; //$NON-NLS-1$
private static final String PAGE_NAME = "/WebContent/templates/outputWeekDays.xhtml"; //$NON-NLS-1$
- private TestProjectProvider provider = null;
private static String STRING_TO_FIND_TARGET = "target:";
private static String STRING_TO_FIND_CONVERT = "target:co";
private static String STRING_TO_FIND_LOOP = "target:lo";
@@ -40,17 +39,9 @@
}
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME,false); //$NON-NLS-1$
- project = provider.getProject();
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
-
public void testJspElFunctionsCATestFuncNamespace(){
final String[] proposals = new String[]{
"target" //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/hover/ELTooltipTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/hover/ELTooltipTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/hover/ELTooltipTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -15,8 +15,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.ITextHover;
import org.eclipse.jface.text.ITextHoverExtension2;
import org.eclipse.jface.text.ITextViewer;
@@ -56,7 +54,6 @@
public void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public static Test suite() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.base.test.validation.ValidationProjectTestSetup;
import org.jboss.tools.jsf.jsp.ca.test.CADefaultELStartingCharTest;
import org.jboss.tools.jsf.jsp.ca.test.CAELApplyMethodProposalTest;
+import org.jboss.tools.jsf.jsp.ca.test.CAELFunctionsTest;
import org.jboss.tools.jsf.jsp.ca.test.CAELInsideTagBodyInJspFileTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForCompositeComponentTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForELJavaAndJSTCompareTest;
@@ -70,127 +71,94 @@
suite.addTestSuite(CAForInputTagSrcAttributeSuggestsFilePathsJBIDE1807Test.class);
suite.addTestSuite(CAForIDTest.class);
suite.addTestSuite(CAForELinStyleTest.class);
- suite.addTestSuite(CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test.class);
- suite.addTestSuite(CASuggestsNotOnlyELProposalsJBIDE2437Test.class);
+
suite.addTestSuite(CAUnnecessaryElementsForDirAttributeInXHTMLPageJBIDE1813Test.class);
suite.addTestSuite(CAVarAttributeForDataTableTagJBIDE2016.class);
suite.addTestSuite(FacesConfigNewWizardTest.class);
suite.addTestSuite(FasesConfigEditorTest.class);
+
suite.addTestSuite(PropertiesNewWizardTest.class);
- suite.addTestSuite(JsfJspJbide6259Test.class);
- suite.addTestSuite(JsfJspJbide1704Test.class);
- suite.addTestSuite(JsfJspJbide1717Test.class);
- suite.addTestSuite(JsfJBide3845Test.class);
- suite.addTestSuite(CAInEventAttributesTest.class);
suite.addTest(
new ProjectImportTestSetup(JsfJspLongResourceBundlePropertyNamesTest.suite(),
"org.jboss.tools.jsf.ui.test",
new String[] { "projects/CAForCompositeComponentTest", }, //$NON-NLS-1$
new String[] { "CAForCompositeComponentTest" })); //$NON-NLS-1$
+
suite.addTest(
new ProjectImportTestSetup(WebContentAssistProviderTest.suite(),
"org.jboss.tools.jsf.ui.test",
new String[] { "projects/TestsWebArtefacts", }, //$NON-NLS-1$
new String[] { "TestsWebArtefacts" })); //$NON-NLS-1$
+
suite.addTest(new ProjectImportTestSetup(new TestSuite(
- ELReferencesRenameTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$
+ CAInEventAttributesTest.class,
+ ELReferencesRenameTest.class,
+ TestPalette.class,
+ CAJsfMessagesProposalsTest.class,
+ JavaClassContentAssistProviderTest.class,
+ JspElFunctionsTest.class),
+ "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$
new String[] { "projects/testJSFProject", }, //$NON-NLS-1$
new String[] { "testJSFProject" })); //$NON-NLS-1$
+
suite.addTest(new ProjectImportTestSetup(new TestSuite(
JSFNaturesInfoDialog_JBIDE5701.class),
"org.jboss.tools.jsf.ui.test", "projects/naturesCheckTest", //$NON-NLS-1$ //$NON-NLS-2$
"naturesCheckTest")); //$NON-NLS-1$
+
suite.addTest(new ProjectImportTestSetup(new TestSuite(
KbNaturesInfoDialog_JBIDE6125.class),
"org.jboss.tools.jsf.ui.test", "projects/naturesCheckKBTest", //$NON-NLS-1$ //$NON-NLS-2$
"naturesCheckKBTest")); //$NON-NLS-1$
+
suite.addTest(new ProjectImportTestSetup(new TestSuite(AddJSFCapabilitiesTest.class),
"org.jboss.tools.jsf.ui.test",
new String[]{"projects/test_add_jsf_capabilities"},
new String[]{"test_add_jsf_capabilities"}));
+
suite.addTest(new ValidationProjectTestSetup(new TestSuite(JSPProblemMarkerResolutionTest.class),
"org.jboss.tools.jsf.ui.test",
new String[]{"projects/test_jsf_project"},
new String[]{"test_jsf_project"}));
- suite.addTest(
- new ProjectImportTestSetup(new TestSuite(TestPalette.class),
- "org.jboss.tools.jsf.ui.test",
- new String[] { "projects/testJSFProject", }, //$NON-NLS-1$
- new String[] { "testJSFProject" })); //$NON-NLS-1$
- suite.addTest(
- new ProjectImportTestSetup(new TestSuite(CAJsfMessagesProposalsTest.class),
- "org.jboss.tools.jsf.ui.test",
- new String[] { "projects/testJSFProject", }, //$NON-NLS-1$
- new String[] { "testJSFProject" })); //$NON-NLS-1$
- suite.addTest(
- new ProjectImportTestSetup(new TestSuite(JavaClassContentAssistProviderTest.class),
- "org.jboss.tools.jsf.ui.test",
- new String[] { "projects/testJSFProject", }, //$NON-NLS-1$
- new String[] { "testJSFProject" })); //$NON-NLS-1$
+
suite.addTestSuite(JsfUiPreferencesPagesTest.class);
suite.addTestSuite(TaglibXMLUnformatedDTD_JBIDE5642.class);
suite.addTest(new ProjectImportTestSetup(new TestSuite(
- JspElFunctionsTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$
- new String[] { "projects/testJSFProject", }, //$NON-NLS-1$
- new String[] { "testJSFProject" })); //$NON-NLS-1$
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ JsfJspJbide1704Test.class,
+ JsfJspJbide1717Test.class,
+ CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test.class,
+ CASuggestsNotOnlyELProposalsJBIDE2437Test.class,
+ JsfJspJbide6259Test.class,
CADefaultELStartingCharTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$
new String[] { "projects/JsfJbide1704Test", }, //$NON-NLS-1$
new String[] { "JsfJbide1704Test" })); //$NON-NLS-1$
suite.addTest(new ProjectImportTestSetup(new TestSuite(
- CAJsfMessagesProposalsFilteringTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
- new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
- new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
- ELTooltipTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
- new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
- new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
- CAForELJavaAndJSTCompareTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
- new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
- new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
- CAELApplyMethodProposalTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
- new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
- new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ JsfJBide3845Test.class,
CAELInsideTagBodyInJspFileTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$
new String[] { "projects/Jbide3845Test", }, //$NON-NLS-1$
new String[] { "Jbide3845Test" })); //$NON-NLS-1$
-
+
suite.addTest(new ProjectImportTestSetup(new TestSuite(
- CAJsfAddInfoInELMessagesTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
- new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
- new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
- CAJsfResourceBundlePropertyApplyTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
- new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
- new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
- JSFAsYouTypeInJavaValidationTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
- new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
- new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
- JSFAsYouTypeValidationTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
- new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
- new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ CAJsfMessagesProposalsFilteringTest.class,
+ ELTooltipTest.class,
+ CAForELJavaAndJSTCompareTest.class,
+ CAELApplyMethodProposalTest.class,
+ CAJsfAddInfoInELMessagesTest.class,
+ CAJsfResourceBundlePropertyApplyTest.class,
+ JSFAsYouTypeInJavaValidationTest.class,
+ JSFAsYouTypeValidationTest.class,
CAJsfPredictiveTagNameProposalsTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ CAELFunctionsTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
+ "projects/jsf2pr", //$NON-NLS-1$
+ "jsf2pr")); //$NON-NLS-1$
+
return suite;
}
}
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestPalette.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestPalette.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestPalette.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Copyright (c) 2007-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -12,15 +12,13 @@
package org.jboss.tools.jsf.ui.test;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
import java.util.Properties;
-import java.util.Set;
+import junit.framework.TestCase;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.palette.PaletteContainer;
@@ -57,8 +55,6 @@
import org.jboss.tools.vpe.ui.palette.model.PaletteModel;
import org.jboss.tools.vpe.ui.palette.model.PaletteRoot;
-import junit.framework.TestCase;
-
public class TestPalette extends TestCase {
static String jsfProjectName = "testJSFProject";
static IProject jsfProject;
@@ -73,7 +69,6 @@
private void loadProjects() throws Exception {
jsfProject = ProjectImportTestSetup.loadProject(jsfProjectName);
- jsfProject.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public void testPalette() throws Exception {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELRefactoringTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELRefactoringTest.java 2012-09-28 18:39:23 UTC (rev 44120)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELRefactoringTest.java 2012-09-28 18:48:15 UTC (rev 44121)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.ui.test.refactoring;
import java.util.ArrayList;
@@ -3,12 +13,8 @@
import java.util.List;
+import junit.framework.TestCase;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMethod;
@@ -17,11 +23,8 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
import org.jboss.tools.common.EclipseUtil;
-import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
-import junit.framework.TestCase;
-
public class ELRefactoringTest extends TestCase {
static String jsfProjectName = "testJSFProject";
static IProject jsfProject;
@@ -40,7 +43,6 @@
private void loadProjects() throws Exception {
jsfProject = ProjectImportTestSetup.loadProject(jsfProjectName);
- jsfProject.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
protected TestChangeStructure findChange(List<TestChangeStructure> changeList, IFile file){
More information about the jbosstools-commits
mailing list