JBoss Tools SVN: r32960 - in workspace/snjeza/org.jboss.tools.remote.debug.updatesite: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-07-17 11:15:38 -0400 (Sun, 17 Jul 2011)
New Revision: 32960
Added:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107170221.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107170221.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107170221.jar
Removed:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107141613.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107141613.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107141613.jar
Modified:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/artifacts.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/content.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml
Log:
JBIDE-8548 Support auto discovery of remote processes for debugging
Modified: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/artifacts.jar
===================================================================
(Binary files differ)
Modified: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/content.jar
===================================================================
(Binary files differ)
Deleted: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107141613.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107170221.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107170221.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107141613.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107170221.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107170221.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107141613.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107170221.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107170221.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml 2011-07-16 00:54:01 UTC (rev 32959)
+++ workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml 2011-07-17 15:15:38 UTC (rev 32960)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.remote.debug.feature_1.0.0.201107141613.jar" id="org.jboss.tools.remote.debug.feature" version="1.0.0.201107141613">
+ <feature url="features/org.jboss.tools.remote.debug.feature_1.0.0.201107170221.jar" id="org.jboss.tools.remote.debug.feature" version="1.0.0.201107170221">
<category name="org.jboss.tools.remote.debug"/>
</feature>
<category-def name="org.jboss.tools.remote.debug" label="JBoss Tools Launching Support"/>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32959 - in trunk/jsf/tests/org.jboss.tools.jsf.test: projects/JSF2Beans and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-15 20:54:01 -0400 (Fri, 15 Jul 2011)
New Revision: 32959
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean1.class
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean2.class
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath 2011-07-16 00:54:01 UTC (rev 32959)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/jsf-api-2.0.3.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project 2011-07-16 00:54:01 UTC (rev 32959)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JSF2Beans</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs 2011-07-16 00:54:01 UTC (rev 32959)
@@ -0,0 +1,12 @@
+#Fri Jul 15 10:03:53 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean1.class
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean1.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean2.class
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean2.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml 2011-07-16 00:54:01 UTC (rev 32959)
@@ -0,0 +1,10 @@
+<!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"
+ >
+
+<f:loadBundle basename="demo.resources2" var="mmm"/>
+<h:outputText value="#{}"/>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java 2011-07-16 00:54:01 UTC (rev 32959)
@@ -0,0 +1,11 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean1")
+public class Bean1 {
+ public String getName() {
+ return "#{}";
+ }
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java 2011-07-16 00:54:01 UTC (rev 32959)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean2")
+public class Bean2 {
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java 2011-07-16 00:54:01 UTC (rev 32959)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean2")
+public class Bean3 {
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2011-07-16 00:54:01 UTC (rev 32959)
@@ -0,0 +1,11 @@
+<!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"
+ >
+
+<f:loadBundle basename="demo.resources2" var="mmm"/>
+<h:outputText value="#{myb}"/>
+<h:outputText value="#{mybean1}"/>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java 2011-07-16 00:54:01 UTC (rev 32959)
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.test;
+
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.jsf.jsf2.bean.model.IJSF2ManagedBean;
+import org.jboss.tools.jsf.jsf2.bean.model.IJSF2Project;
+import org.jboss.tools.jsf.jsf2.bean.model.JSF2ProjectFactory;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+public class JSF2ModelTest extends TestCase {
+ TestProjectProvider provider = null;
+ IProject project = null;
+
+ public JSF2ModelTest() {}
+
+ public void setUp() throws Exception {
+ project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("JSF2Beans");
+ if(project==null) {
+ provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSF2Beans", false);
+ project = provider.getProject();
+ }
+
+ }
+
+ public void testModel() {
+ IJSF2Project jsf2 = JSF2ProjectFactory.getJSF2Project(project, true);
+ assertNotNull(jsf2);
+ Set<IJSF2ManagedBean> beans = jsf2.getManagedBeans("mybean1");
+ assertEquals(1, beans.size());
+ beans = jsf2.getManagedBeans("mybean2");
+ assertEquals(2, beans.size());
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ provider=null;
+ }
+ }
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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 2011-07-15 22:28:01 UTC (rev 32958)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-07-16 00:54:01 UTC (rev 32959)
@@ -40,6 +40,7 @@
TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$
suite.addTestSuite(JSFTemplateTest.class);
suite.addTestSuite(JSFFacetOnExistingProjectTest.class);
+ suite.addTestSuite(JSF2ModelTest.class);
TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$
old.addTestSuite(JSFModelTest.class);
old.addTestSuite(ModelFormat_2_0_0_Test.class);
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32958 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test: src/org/jboss/tools/jsf/jsp/ca/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-15 18:28:01 -0400 (Fri, 15 Jul 2011)
New Revision: 32958
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-07-15 22:26:56 UTC (rev 32957)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-07-15 22:28:01 UTC (rev 32958)
@@ -29,6 +29,7 @@
org.jboss.tools.jst.web,
org.jboss.tools.jst.web.kb,
org.jboss.tools.jsf,
+ org.jboss.tools.jsf.test,
org.eclipse.jst.standard.schemas,
org.jboss.tools.vpe.ui.palette,
org.eclipse.gef,
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2011-07-15 22:28:01 UTC (rev 32958)
@@ -0,0 +1,34 @@
+package org.jboss.tools.jsf.jsp.ca.test;
+
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+public class CAForJSF2BeansTest extends ContentAssistantTestCase{
+ TestProjectProvider provider = null;
+ boolean makeCopy = true;
+ private static final String PROJECT_NAME = "JSF2Beans";
+ private static final String PAGE_NAME = "/src/test/beans/inputname.xhtml";
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, PROJECT_NAME, makeCopy);
+ project = provider.getProject();
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ /**
+ * JBIDE-5941
+ */
+ public void testCAForJSF2Beans(){
+ String[] proposals = {
+ "mybean1", "mybean2"
+ };
+
+ checkProposals(PAGE_NAME, "#{myb}", 5, proposals, false);
+
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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 2011-07-15 22:26:56 UTC (rev 32957)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-07-15 22:28:01 UTC (rev 32958)
@@ -18,6 +18,7 @@
import org.jboss.tools.jsf.jsp.ca.test.CAForELinStyleTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForIDTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForInputTagSrcAttributeSuggestsFilePathsJBIDE1807Test;
+import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForUnclosedELTest;
import org.jboss.tools.jsf.jsp.ca.test.CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test;
import org.jboss.tools.jsf.jsp.ca.test.CASuggestsNotOnlyELProposalsJBIDE2437Test;
@@ -41,6 +42,7 @@
suite.addTestSuite(NewJSFProjectTest.class);
suite.addTestSuite(CAForUnclosedELTest.class);
suite.addTestSuite(CAForCompositeComponentTest.class);
+ suite.addTestSuite(CAForJSF2BeansTest.class);
// suite.addTestSuite(MissingKBBuilderTest.class);
suite.addTestSuite(CAForInputTagSrcAttributeSuggestsFilePathsJBIDE1807Test.class);
suite.addTestSuite(CAForIDTest.class);
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32957 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-07-15 18:26:56 -0400 (Fri, 15 Jul 2011)
New Revision: 32957
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9307
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2011-07-15 22:11:17 UTC (rev 32956)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2011-07-15 22:26:56 UTC (rev 32957)
@@ -219,13 +219,13 @@
}
sb.append("]");
- fail("Marker matches the '" + pattern + "' pattern wasn't found for line - " + lineNumber + ", start - " + startPosition + ", end - " + endPosition + ". Found markers for given patern: " + sb.toString()); //$NON-NLS-1$ //$NON-NLS-2$
+ fail("Marker matches the '" + pattern + "' pattern wasn't found for line - " + lineNumber + ", start - " + startPosition + ", end - " + endPosition + ". Found markers for given patern: " + sb.toString()); //$NON-NLS-1$ //$NON-NLS-2$
}
public static void assertMarkerIsNotCreated(IResource resource, String type, String pattern) throws CoreException {
IMarker[] markers = findMarkers(resource, type, pattern);
- assertFalse("Marker matches the '" + pattern + "' pattern was found", markers.length>0); //$NON-NLS-1$ //$NON-NLS-2$
+ assertFalse("Marker matches the '" + pattern + "' pattern was found", markers.length>0); //$NON-NLS-1$ //$NON-NLS-2$
}
public static void assertMarkerIsNotCreated(IResource resource, String type, String pattern, int expectedLine) throws CoreException {
@@ -235,13 +235,13 @@
public static void assertMarkerIsNotCreated(IResource resource, String type, String errorMessage, boolean pattern, int expectedLine) throws CoreException {
List<Integer> lines = findMarkerLines(resource, type, errorMessage, pattern);
- assertFalse("Marker matches the '" + pattern + "' pattern was found", lines.contains(expectedLine)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertFalse("Marker matches the '" + errorMessage + "' pattern was found", lines.contains(expectedLine)); //$NON-NLS-1$ //$NON-NLS-2$
}
public static void assertMarkerIsCreated(IResource resource, String type, String pattern) throws CoreException {
IMarker[] markers = findMarkers(resource, type, pattern);
- assertTrue("Marker matches the '" + pattern + "' pattern wasn't found", //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Marker matches the '" + pattern + "' pattern wasn't found", //$NON-NLS-1$ //$NON-NLS-2$
markers.length>0);
}
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32956 - in trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test: src/org/jboss/tools/jsf/text/ext/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-15 18:11:17 -0400 (Fri, 15 Jul 2011)
New Revision: 32956
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-9307
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF 2011-07-15 20:49:59 UTC (rev 32955)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF 2011-07-15 22:11:17 UTC (rev 32956)
@@ -23,7 +23,8 @@
org.jboss.tools.jsf.text.ext.facelets,
org.jboss.tools.jsf.text.ext.richfaces,
org.jboss.tools.jsf.ui,
- org.eclipse.jst.standard.schemas
+ org.eclipse.jst.standard.schemas,
+ org.jboss.tools.jst.text.ext.test;bundle-version="3.3.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.jsf.text.ext.test
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java 2011-07-15 20:49:59 UTC (rev 32955)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java 2011-07-15 22:11:17 UTC (rev 32956)
@@ -10,29 +10,19 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.test;
+import java.util.ArrayList;
+
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.FindReplaceDocumentAdapter;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlink;
+import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector;
+import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil;
+import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestHyperlink;
+import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestRegion;
import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.WorkbenchUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
/**
*
@@ -41,8 +31,8 @@
*/
public class JSF2CCAttrsOpenOnTest extends TestCase {
private static final String PROJECT_NAME = "JSF2CompositeOpenOn";
- private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/resources/demo/input.xhtml";
- private static final String PAGE2_NAME = PROJECT_NAME+"/WebContent/resources/demo/input2.xhtml";
+ private static final String PAGE_NAME = "/WebContent/resources/demo/input.xhtml";
+ private static final String PAGE2_NAME = "/WebContent/resources/demo/input2.xhtml";
public IProject project = null;
@@ -56,152 +46,44 @@
protected void tearDown() {
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
}
-
- public JSF2CCAttrsOpenOnTest() {
- super("JSF2 OpenOn on CC Attributes test");
- }
-
- static String COMPOSITE_URI = "http://java.sun.com/jsf/composite";
- static String COMPOSITE_INTERFACE_NODE = ":interface";
- static String COMPOSITE_ATTRIBUTE_NODE = ":attribute";
- static String COMPOSITE_NAME_ATTRIBUTE = "name";
+ public void testCCAttrsHyperlink1() throws Exception{
- public void testCCInterface() throws PartInitException, BadLocationException {
- final String editorName = "input.xhtml";
- final String elToTest = "cc.attrs";
- IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IDocument document = viewer.getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- elToTest, true, true, false, false);
+ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
+ regionList.add(new TestRegion(658, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+ regionList.add(new TestRegion(667, 4, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
- assertNotNull("CC Interface reference: "+elToTest+" not found",reg);
-
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
-
- assertNotNull("Hyperlinks for CC Interface :"+elToTest+" are not found",links);
-
- assertTrue("Hyperlinks for CC Interface: "+elToTest+" are not found",links.length!=0);
-
- for(IHyperlink link : links){
- assertNotNull(link.toString());
-
- link.open();
- JobUtils.waitForIdle(2000);
-
- IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editorName.equals(resultEditor.getTitle())){
+ regionList.add(new TestRegion(706, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+ regionList.add(new TestRegion(715, 4, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
- assertTrue("Opened editor is not JSPMultiPageEditor: "+resultEditor.getClass().getName(), (resultEditor instanceof JSPMultiPageEditor));
+ regionList.add(new TestRegion(759, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+ regionList.add(new TestRegion(768, 5, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
- JSPMultiPageEditor multyPageEditor = (JSPMultiPageEditor) resultEditor;
- viewer = multyPageEditor.getSourceEditor().getTextViewer();
- assertNotNull("An error occured while trying to access the editor's viewer!", viewer);
- document = viewer.getDocument();
- assertNotNull("An error occured while trying to access the viewer's document!", document);
- Point sel = viewer.getSelectedRange();
- assertNotNull("An error occured while trying to access the viewer's selection!", viewer);
-
- StructuredModelWrapper smw = new StructuredModelWrapper();
- smw.init(document);
- try {
- Document xmlDocument = smw.getDocument();
- assertNotNull("An error occured while trying to access the structured document!", xmlDocument);
-
- Node node = Utils.findNodeForOffset(xmlDocument, sel.x);
- assertNotNull("The document selection is not a CC Interface!", node);
-
- assertTrue("The document selection is not a CC Interface!", COMPOSITE_URI.equals(node.getNamespaceURI()));
- assertTrue("The document selection is not a CC Interface!", node.getNodeName().endsWith(COMPOSITE_INTERFACE_NODE));
- return;
- } finally {
- smw.dispose();
- }
- }
- }
+ regionList.add(new TestRegion(786, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+ regionList.add(new TestRegion(795, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+
+ HyperlinkTestUtil.checkRegions(project, PAGE_NAME, regionList, new ELHyperlinkDetector());
+
}
- /**
- * This test runs with default root element <html> and default namespace prefix 'composite'.
- */
- public void testCCInterfaceAttrs1() throws PartInitException, BadLocationException {
- testCCInterfaceAttrs(PAGE_NAME, "input.xhtml");
- }
+ public void testCCAttrsHyperlink2() throws Exception{
- /**
- * In input2.xhtml root element is not html and namespace prefix is 'cc' instead of default 'composite'.
- */
- public void testCCInterfaceAttrs2() throws PartInitException, BadLocationException {
- testCCInterfaceAttrs(PAGE2_NAME, "input2.xhtml");
- }
+ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
+ regionList.add(new TestRegion(610, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+ regionList.add(new TestRegion(619, 4, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+
+ regionList.add(new TestRegion(658, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+ regionList.add(new TestRegion(667, 4, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
- void testCCInterfaceAttrs(String pageName, String editorName) throws PartInitException, BadLocationException {
- final String elToTest = "cc.attrs.action";
- final String atributeAction = "action";
- IEditorPart editor = WorkbenchUtils.openEditor(pageName);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IDocument document = viewer.getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- elToTest, true, true, false, false);
- assertNotNull("CC Interface reference: "+elToTest+" not found",reg);
+ regionList.add(new TestRegion(711, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+ regionList.add(new TestRegion(720, 5, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
- reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(),
- atributeAction, true, true, false, false);
- assertNotNull("CC Interface reference: "+elToTest+" not found",reg);
+ regionList.add(new TestRegion(738, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+ regionList.add(new TestRegion(747, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open a Custom Component Attribute definition")}));
+ HyperlinkTestUtil.checkRegions(project, PAGE2_NAME, regionList, new ELHyperlinkDetector());
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
-
- assertNotNull("Hyperlinks for CC Interface :"+elToTest+" are not found",links);
-
- assertTrue("Hyperlinks for CC Interface: "+elToTest+" are not found",links.length!=0);
-
- for(IHyperlink link : links){
- assertNotNull(link.toString());
-
- link.open();
- JobUtils.waitForIdle(2000);
-
- IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editorName.equals(resultEditor.getTitle())){
-
- assertTrue("Opened editor is not JSPMultiPageEditor: "+resultEditor.getClass().getName(), (resultEditor instanceof JSPMultiPageEditor));
-
- JSPMultiPageEditor multyPageEditor = (JSPMultiPageEditor) resultEditor;
- viewer = multyPageEditor.getSourceEditor().getTextViewer();
- assertNotNull("An error occured while trying to access the editor's viewer!", viewer);
- document = viewer.getDocument();
- assertNotNull("An error occured while trying to access the viewer's document!", document);
- Point sel = viewer.getSelectedRange();
- assertNotNull("An error occured while trying to access the viewer's selection!", viewer);
-
- StructuredModelWrapper smw = new StructuredModelWrapper();
- smw.init(document);
- try {
- Document xmlDocument = smw.getDocument();
- assertNotNull("An error occured while trying to access the structured document!", xmlDocument);
-
- Node node = Utils.findNodeForOffset(xmlDocument, sel.x);
- assertNotNull("The document selection is not a CC Interface!", node);
-
- assertTrue("The document selection is not a CC Interface!", COMPOSITE_URI.equals(node.getNamespaceURI()));
- assertTrue("The document selection is not a CC Interface!", node.getNodeName().endsWith(COMPOSITE_ATTRIBUTE_NODE));
- assertTrue("The document selection points to wrong CC Interface Attribute!", atributeAction.equals(((Element)node).getAttribute(COMPOSITE_NAME_ATTRIBUTE)));
- return;
- } finally {
- smw.dispose();
- }
- }
- }
}
+
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java 2011-07-15 20:49:59 UTC (rev 32955)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java 2011-07-15 22:11:17 UTC (rev 32956)
@@ -10,23 +10,19 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.test;
+import java.util.ArrayList;
+
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.FindReplaceDocumentAdapter;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlink;
+import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector;
+import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil;
+import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestHyperlink;
+import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestRegion;
import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.WorkbenchUtils;
/**
*
@@ -35,7 +31,7 @@
*/
public class JSF2MessagesOpenOnTest extends TestCase {
private static final String PROJECT_NAME = "JSF2CompositeOpenOn";
- private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/pages/inputname.xhtml";
+ private static final String PAGE_NAME = "/WebContent/pages/inputname.xhtml";
public IProject project = null;
@@ -53,101 +49,25 @@
public JSF2MessagesOpenOnTest() {
super("JSF2 OpenOn on messages test");
}
+
+ public void testJSF2MessagesHyperlink() throws Exception{
- public void testRegisteredBundle() throws PartInitException, BadLocationException {
- doTextBundlePropertyOpenOn("resources.properties", "registeredMsgs.prompt", "registeredMsgs");
- }
- public void testRegisteredBundleProperty() throws PartInitException, BadLocationException {
- doTextBundlePropertyOpenOn("resources.properties", "registeredMsgs.prompt", "prompt");
- }
- public void testRegisteredLongNamedBundleProperty() throws PartInitException, BadLocationException {
- doTextBundlePropertyOpenOn("resources.properties", "registeredMsgs['demo.long.named.property']", "demo.long.named.property");
- }
- public void testPageLoadedBundle() throws PartInitException, BadLocationException {
- doTextBundlePropertyOpenOn("resources.properties", "pageMsgs.prompt", "pageMsgs");
- }
- public void testPageLoadedBundleProperty() throws PartInitException, BadLocationException {
- doTextBundlePropertyOpenOn("resources.properties", "pageMsgs.prompt", "prompt");
- }
- public void testPageLoadedLongNamedBundleProperty() throws PartInitException, BadLocationException {
- doTextBundlePropertyOpenOn("resources.properties", "pageMsgs['demo.long.named.property']", "demo.long.named.property");
- }
+ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
+ regionList.add(new TestRegion(881, 13, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'resources'", "resources.properties")}));
+ regionList.add(new TestRegion(896, 5, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'prompt' of bundle 'resources'", "resources.properties")}));
+
+ regionList.add(new TestRegion(1004, 13, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'resources'", "resources.properties")}));
+ regionList.add(new TestRegion(1019, 25, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'demo.long.named.property' of bundle 'resources'", "resources.properties")}));
- private void doTextBundlePropertyOpenOn(String editorName, String propertyQualifiedName, String property) throws PartInitException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IDocument document = viewer.getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- propertyQualifiedName, true, true, false, false);
- assertNotNull("Property:"+propertyQualifiedName+" not found",reg);
+ regionList.add(new TestRegion(1078, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'resources'", "resources.properties")}));
+ regionList.add(new TestRegion(1087, 5, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'prompt' of bundle 'resources'", "resources.properties")}));
+
+ regionList.add(new TestRegion(1125, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'resources'", "resources.properties")}));
+ regionList.add(new TestRegion(1134, 25, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'demo.long.named.property' of bundle 'resources'", "resources.properties")}));
- reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(),
- property, true, true, false, false);
- assertNotNull("Property:"+property+" not found",reg);
+ HyperlinkTestUtil.checkRegions(project, PAGE_NAME, regionList, new ELHyperlinkDetector());
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
-
- assertNotNull("Hyperlinks for property:"+propertyQualifiedName+" are not found",links);
-
- assertTrue("Hyperlinks for property:"+propertyQualifiedName+" are not found",links.length!=0);
-
- boolean found = false;
- for(IHyperlink link : links){
- assertNotNull(link.toString());
-
- link.open();
- JobUtils.waitForIdle(2000);
-
- IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editorName.equals(resultEditor.getTitle())){
- found = true;
- return;
- }
- }
- assertTrue("OpenOn have not opened "+editorName+" editor",found);
}
-
-
- public void testRegisteredBundlePropertyOpenOn() throws PartInitException, BadLocationException {
- final String editorName = "resources.properties";
- final String propertyName = "registeredMsgs.prompt";
- IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IDocument document = viewer.getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- propertyName, true, true, false, false);
-
- assertNotNull("Property:"+propertyName+" not found",reg);
-
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
-
- assertNotNull("Hyperlinks for property:"+propertyName+" are not found",links);
-
- assertTrue("Hyperlinks for property:"+propertyName+" are not found",links.length!=0);
-
- boolean found = false;
- for(IHyperlink link : links){
- assertNotNull(link.toString());
-
- link.open();
- JobUtils.waitForIdle(2000);
-
- IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editorName.equals(resultEditor.getTitle())){
- found = true;
- return;
- }
- }
- assertTrue("OpenOn have not opened "+editorName+" editor",found);
- }
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2011-07-15 20:49:59 UTC (rev 32955)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2011-07-15 22:11:17 UTC (rev 32956)
@@ -29,18 +29,18 @@
"org.jboss.tools.jsf.text.ext.test",
new String[]{"projects/JSF2CompositeOpenOn"},
new String[]{"JSF2CompositeOpenOn"}));
-// suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2MessagesOpenOnTest.class),
-// "org.jboss.tools.jsf.text.ext.test",
-// new String[]{"projects/JSF2CompositeOpenOn"},
-// new String[]{"JSF2CompositeOpenOn"}));
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2MessagesOpenOnTest.class),
+ "org.jboss.tools.jsf.text.ext.test",
+ new String[]{"projects/JSF2CompositeOpenOn"},
+ new String[]{"JSF2CompositeOpenOn"}));
suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2CSSStylesheetOpenOnTest.class),
"org.jboss.tools.jsf.text.ext.test",
new String[]{"projects/JSF2CompositeOpenOn"},
new String[]{"JSF2CompositeOpenOn"}));
-// suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2CCAttrsOpenOnTest.class),
-// "org.jboss.tools.jsf.text.ext.test",
-// new String[]{"projects/JSF2CompositeOpenOn"},
-// new String[]{"JSF2CompositeOpenOn"}));
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2CCAttrsOpenOnTest.class),
+ "org.jboss.tools.jsf.text.ext.test",
+ new String[]{"projects/JSF2CompositeOpenOn"},
+ new String[]{"JSF2CompositeOpenOn"}));
return suite;
}
}
\ No newline at end of file
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32955 - branches/jbosstools-3.2.x/maven/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-15 16:49:59 -0400 (Fri, 15 Jul 2011)
New Revision: 32955
Added:
branches/jbosstools-3.2.x/maven/site/.gitignore
Log:
.gitignore file
Added: branches/jbosstools-3.2.x/maven/site/.gitignore
===================================================================
--- branches/jbosstools-3.2.x/maven/site/.gitignore (rev 0)
+++ branches/jbosstools-3.2.x/maven/site/.gitignore 2011-07-15 20:49:59 UTC (rev 32955)
@@ -0,0 +1 @@
+target
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32954 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-15 16:49:50 -0400 (Fri, 15 Jul 2011)
New Revision: 32954
Modified:
trunk/build/target-platform/jbds.target
Log:
newer version of m2e 1.0
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-07-15 20:07:53 UTC (rev 32953)
+++ trunk/build/target-platform/jbds.target 2011-07-15 20:49:50 UTC (rev 32954)
@@ -17,7 +17,7 @@
<!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
@@ -177,4 +177,4 @@
</location>
</locations>
-</target>
\ No newline at end of file
+</target>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32953 - in branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test: projects/JSF2Beans and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-15 16:07:53 -0400 (Fri, 15 Jul 2011)
New Revision: 32953
Added:
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean1.class
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean2.class
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java
Modified:
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath 2011-07-15 20:07:53 UTC (rev 32953)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/jsf-api-2.0.3.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project 2011-07-15 20:07:53 UTC (rev 32953)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JSF2Beans</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs 2011-07-15 20:07:53 UTC (rev 32953)
@@ -0,0 +1,12 @@
+#Fri Jul 15 10:03:53 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean1.class
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean1.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean2.class
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean2.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml 2011-07-15 20:07:53 UTC (rev 32953)
@@ -0,0 +1,10 @@
+<!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"
+ >
+
+<f:loadBundle basename="demo.resources2" var="mmm"/>
+<h:outputText value="#{}"/>
+</html>
\ No newline at end of file
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java 2011-07-15 20:07:53 UTC (rev 32953)
@@ -0,0 +1,11 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean1")
+public class Bean1 {
+ public String getName() {
+ return "#{}";
+ }
+
+}
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java 2011-07-15 20:07:53 UTC (rev 32953)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean2")
+public class Bean2 {
+
+}
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java 2011-07-15 20:07:53 UTC (rev 32953)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean2")
+public class Bean3 {
+
+}
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2011-07-15 20:07:53 UTC (rev 32953)
@@ -0,0 +1,10 @@
+<!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"
+ >
+
+<f:loadBundle basename="demo.resources2" var="mmm"/>
+<h:outputText value="#{}"/>
+</html>
\ No newline at end of file
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java 2011-07-15 20:07:53 UTC (rev 32953)
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.test;
+
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.jsf.jsf2.bean.model.IJSF2ManagedBean;
+import org.jboss.tools.jsf.jsf2.bean.model.IJSF2Project;
+import org.jboss.tools.jsf.jsf2.bean.model.JSF2ProjectFactory;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+public class JSF2ModelTest extends TestCase {
+ TestProjectProvider provider = null;
+ IProject project = null;
+
+ public JSF2ModelTest() {}
+
+ public void setUp() throws Exception {
+ project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("JSF2Beans");
+ if(project==null) {
+ provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSF2Beans", false);
+ project = provider.getProject();
+ }
+
+ }
+
+ public void testModel() {
+ IJSF2Project jsf2 = JSF2ProjectFactory.getJSF2Project(project, true);
+ assertNotNull(jsf2);
+ Set<IJSF2ManagedBean> beans = jsf2.getManagedBeans("mybean1");
+ assertEquals(1, beans.size());
+ beans = jsf2.getManagedBeans("mybean2");
+ System.out.println("---------->" + beans.size());
+ assertEquals(2, beans.size());
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ provider=null;
+ }
+ }
+
+}
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-07-15 19:51:02 UTC (rev 32952)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-07-15 20:07:53 UTC (rev 32953)
@@ -45,6 +45,7 @@
TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$
suite.addTestSuite(JSFTemplateTest.class);
suite.addTestSuite(JSFFacetOnExistingProjectTest.class);
+ suite.addTestSuite(JSF2ModelTest.class);
suite.addTestSuite(WebFragmentFacetOnExistingProjectTest.class);
TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$
old.addTestSuite(JSFModelTest.class);
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32952 - in trunk: jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-15 15:51:02 -0400 (Fri, 15 Jul 2011)
New Revision: 32952
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java
Log:
https://issues.jboss.org/browse/JBIDE-9307
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java 2011-07-15 19:49:41 UTC (rev 32951)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java 2011-07-15 19:51:02 UTC (rev 32952)
@@ -60,5 +60,6 @@
public static String Id;
public static String BrowseForBeanId;
public static String BeanId;
+ public static String OpenJsf2CCAttribute;
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties 2011-07-15 19:49:41 UTC (rev 32951)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties 2011-07-15 19:51:02 UTC (rev 32952)
@@ -47,3 +47,4 @@
Id=ID
BrowseForBeanId=Browse for Bean ID ''{0}''
BeanId=Bean ID
+OpenJsf2CCAttribute=Open a Custom Component Attribute definition
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-15 19:49:41 UTC (rev 32951)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-15 19:51:02 UTC (rev 32952)
@@ -23,6 +23,7 @@
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
import org.jboss.tools.common.el.core.ELReference;
@@ -30,11 +31,14 @@
import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegment;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.project.IPromptingProvider;
import org.jboss.tools.common.model.project.PromptingProviderFactory;
+import org.jboss.tools.common.model.util.PositionHolder;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.text.ext.JSTExtensionsPlugin;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
@@ -50,10 +54,12 @@
private ELReference reference;
private ELSegment segment;
+ private XModelObject xObject;
- public ELHyperlink(IDocument document, ELReference reference, ELSegment segment){
+ public ELHyperlink(IDocument document, ELReference reference, ELSegment segment, XModelObject xObject){
this.reference = reference;
this.segment = segment;
+ this.xObject = xObject;
setDocument(document);
}
@@ -74,14 +80,15 @@
protected void doHyperlink(IRegion region) {
if(segment instanceof JavaMemberELSegment){
try {
- IEditorPart part = JavaUI.openInEditor(((JavaMemberELSegment) segment).getJavaElement());
- if(part == null)
+ if(JavaUI.openInEditor(((JavaMemberELSegment) segment).getJavaElement()) == null){
openFileFailed();
+ }
} catch (PartInitException e) {
JSTExtensionsPlugin.getDefault().logError(e);
} catch (JavaModelException e) {
JSTExtensionsPlugin.getDefault().logError(e);
}
+ return;
}else if(segment instanceof MessagePropertyELSegment){
IFile file = ((MessagePropertyELSegment)segment).getMessageBundleResource();
if(file == null)
@@ -97,6 +104,7 @@
String locale = getPageLocale(region);
Properties p = new Properties();
+
if (bundleBasename != null) {
p.put(WebPromptingProvider.BUNDLE, bundleBasename);
}
@@ -122,9 +130,26 @@
if ( error != null && error.length() > 0) {
openFileFailed();
}
- } else {
+ return;
+ }else if(xObject != null){
+ IRegion attrRegion = null;
+ PositionHolder h = PositionHolder.getPosition(xObject, null);
+ h.update();
+ if (h.getStart() == -1 || h.getEnd() == -1) {
openFileFailed();
+ return;
+ }
+ attrRegion = new Region(h.getStart(), h.getEnd() - h.getStart());
+ IFile file = (IFile)xObject.getAdapter(IFile.class);
+ if (file != null) {
+ if (openFileInEditor(file) != null) {
+ StructuredSelectionHelper.setSelectionAndRevealInActiveEditor(attrRegion);
+ return;
+ }
+ }
}
+
+ openFileFailed();
}
private String getPageLocale(IRegion region) {
@@ -209,7 +234,10 @@
return MessageFormat.format(Messages.Open, baseName);
return MessageFormat.format(Messages.OpenBundleProperty, propertyName, baseName);
+ }else if(xObject != null){
+ return Messages.OpenJsf2CCAttribute;
}
+
return ""; //$NON-NLS-1$
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java 2011-07-15 19:49:41 UTC (rev 32951)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java 2011-07-15 19:51:02 UTC (rev 32952)
@@ -13,6 +13,7 @@
import java.util.List;
import org.eclipse.core.resources.IFile;
+import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
@@ -28,6 +29,10 @@
import org.jboss.tools.common.el.core.resolver.ELResolution;
import org.jboss.tools.common.el.core.resolver.ELResolver;
import org.jboss.tools.common.el.core.resolver.ELSegment;
+import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
+import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegment;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.kb.PageContextFactory;
public class ELHyperlinkDetector extends AbstractHyperlinkDetector{
@@ -53,8 +58,27 @@
if(resolution != null){
ELSegment segment = resolution.findSegmentByOffset(region.getOffset()-reference.getStartPosition());
- if(segment != null && segment.isResolved())
- return new IHyperlink[]{new ELHyperlink(textViewer.getDocument(), reference, segment)};
+ if(segment != null && segment.isResolved()){
+ if(segment instanceof JavaMemberELSegment || segment instanceof MessagePropertyELSegment){
+ return new IHyperlink[]{new ELHyperlink(textViewer.getDocument(), reference, segment, null)};
+ }else{
+ StringBuffer sbBuffer = new StringBuffer();
+ for (ELSegment s : resolution.getSegments()) {
+ sbBuffer.append(s.getToken().getText());
+ if (s == segment) {
+ break;
+ }
+ sbBuffer.append('.'); // Use default separator for ELs here
+ }
+
+ String text = sbBuffer.toString();
+ XModelObject xObject = findJSF2CCAttributeXModelObject(text, file);
+ if (xObject != null) {
+ return new IHyperlink[]{new ELHyperlink(textViewer.getDocument(), reference, segment, xObject)};
+ }
+ }
+
+ }
}
}
@@ -94,4 +118,30 @@
}
return null;
}
+
+ static String[] vs = {"cc.attrs", "compositeComponent.attrs"}; //$NON-NLS-1$ //$NON-NLS-2$
+
+ public static XModelObject findJSF2CCAttributeXModelObject(String varName, IFile file) {
+ XModelObject xModelObject = EclipseResourceUtil.createObjectForResource(file);
+ if(xModelObject == null) return null;
+ if(!"FileJSF2Component".equals(xModelObject.getModelEntity().getName())) return null;
+
+ IJavaProject javaProject = EclipseResourceUtil.getJavaProject(file.getProject());
+ XModelObject is = xModelObject.getChildByPath("Interface");
+ if(is != null && javaProject != null) {
+ for (int i = 0; i < vs.length; i++) {
+ if (vs[i].equals(varName)) return is;
+ }
+ XModelObject[] cs = is.getChildren("JSF2ComponentAttribute");
+
+ for (int i = 0; i < cs.length; i++) {
+ String name = cs[i].getAttributeValue("name");
+ String[] names = {vs[0] + "." + name, vs[1] + "." + name};
+ for (String n: names) {
+ if (n.equals(varName)) return cs[i];
+ }
+ }
+ }
+ return null;
+ }
}
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32951 - trunk/jsf/plugins/org.jboss.tools.jsf/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-15 15:49:41 -0400 (Fri, 15 Jul 2011)
New Revision: 32951
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2011-07-15 19:26:20 UTC (rev 32950)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2011-07-15 19:49:41 UTC (rev 32951)
@@ -9,6 +9,7 @@
org.jboss.tools.jsf.el.refactoring,
org.jboss.tools.jsf.facelet.model,
org.jboss.tools.jsf.jsf2.bean.build,
+ org.jboss.tools.jsf.jsf2.bean.model,
org.jboss.tools.jsf.jsf2.model,
org.jboss.tools.jsf.jsf2.refactoring,
org.jboss.tools.jsf.jsf2.refactoring.action.rename,
14 years, 9 months
- 1
- 0