JBoss Tools SVN: r40321 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-04-19 03:43:08 -0400 (Thu, 19 Apr 2012)
New Revision: 40321
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
Log:
Fix content assist check to have proper values when run via Maven.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-04-19 00:47:31 UTC (rev 40320)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-04-19 07:43:08 UTC (rev 40321)
@@ -274,22 +274,6 @@
expectedProposals.add("msgs");
expectedProposals.add("user : User");
expectedProposals.add("\"#{user.name}\"");
- expectedProposals.add("applicationScope");
- expectedProposals.add("cc");
- expectedProposals.add("component");
- expectedProposals.add("cookie");
- expectedProposals.add("facesContext");
- expectedProposals.add("flash");
- expectedProposals.add("header");
- expectedProposals.add("headerValues");
- expectedProposals.add("initParam");
- expectedProposals.add("param");
- expectedProposals.add("paramValues");
- expectedProposals.add("requestScope");
- expectedProposals.add("resource");
- expectedProposals.add("sessionScope");
- expectedProposals.add("view");
- expectedProposals.add("viewScope");
// Check content assist for #{ prefix
ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot,
JSF2_TEST_PAGE,
13 years, 11 months
JBoss Tools SVN: r40320 - in trunk/common/tests/org.jboss.tools.common.el.core.test: src/org/jboss/tools/common/el/core/test/resolver and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-18 20:47:31 -0400 (Wed, 18 Apr 2012)
New Revision: 40320
Added:
trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC1.java
trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC2.java
trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC3.java
trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC4.java
Modified:
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java
Log:
JBIDE-11474
https://issues.jboss.org/browse/JBIDE-11474
Test is added.
Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC1.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC1.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC1.java 2012-04-19 00:47:31 UTC (rev 40320)
@@ -0,0 +1,12 @@
+package test;
+
+/**
+ * Test checks that info for method foo() returned by TypeInfoCollector is created for TestC1.foo()
+ * rather than for overriden methods from super classes.
+ */
+public class TestC1 extends TestC2 {
+
+ public String foo() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC2.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC2.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC2.java 2012-04-19 00:47:31 UTC (rev 40320)
@@ -0,0 +1,12 @@
+package test;
+
+/**
+ * Test checks that info for method foo() returned by TypeInfoCollector is created for TestC2.foo()
+ * rather than for overriden methods from super classes.
+ */
+public class TestC2 extends TestC3 {
+
+ public String foo() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC3.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC3.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC3.java 2012-04-19 00:47:31 UTC (rev 40320)
@@ -0,0 +1,8 @@
+package test;
+
+public class TestC3 extends TestC4 {
+
+ public String foo() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC4.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC4.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC4.java 2012-04-19 00:47:31 UTC (rev 40320)
@@ -0,0 +1,8 @@
+package test;
+
+public class TestC4 {
+
+ public String foo() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC4.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java 2012-04-19 00:23:47 UTC (rev 40319)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java 2012-04-19 00:47:31 UTC (rev 40320)
@@ -20,6 +20,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector;
@@ -80,6 +81,20 @@
assertNotNull(info.getMemberType());
}
+ public void testOverridenMethod() throws CoreException {
+ IJavaProject jp = JavaCore.create(project2);
+ for (int i = 1; i < 5; i++) {
+ String className = "test.TestC" + i;
+ IType bean = jp.findType(className);
+ TypeInfoCollector.TypeInfo typeInfo = new TypeInfoCollector.TypeInfo(bean, null, false);
+ TypeInfoCollector collector = typeInfo.getTypeCollector(false, false);
+ MemberInfo info = getMethod(collector, "foo");
+ assertNotNull(info);
+ IMethod m = (IMethod)info.getJavaElement();
+ assertEquals(bean.getFullyQualifiedName(), m.getDeclaringType().getFullyQualifiedName());
+ }
+ }
+
private MemberInfo getMethod(TypeInfoCollector collector, String name) {
collector.collectInfo();
List<MemberInfo> mts = collector.getMethods();
13 years, 11 months
JBoss Tools SVN: r40319 - in trunk/common/tests/org.jboss.tools.common.el.core.test: src/org/jboss/tools/common/el/core/test/resolver and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-18 20:23:47 -0400 (Wed, 18 Apr 2012)
New Revision: 40319
Added:
trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestA.java
trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestB.java
Modified:
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java
Log:
JBIDE-11473
https://issues.jboss.org/browse/JBIDE-11473.
Test is added.
Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestA.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestA.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestA.java 2012-04-19 00:23:47 UTC (rev 40319)
@@ -0,0 +1,8 @@
+package test;
+
+public class TestA extends TestB {
+
+ public TestB foo() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestA.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestB.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestB.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestB.java 2012-04-19 00:23:47 UTC (rev 40319)
@@ -0,0 +1,5 @@
+package test;
+
+public class TestB extends TestA {
+
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestB.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java 2012-04-19 00:14:26 UTC (rev 40318)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java 2012-04-19 00:23:47 UTC (rev 40319)
@@ -70,6 +70,16 @@
assertNotNull(info.getMemberType());
}
+ public void testCircularDependency() throws CoreException {
+ IJavaProject jp = JavaCore.create(project2);
+ IType bean = jp.findType("test.TestA");
+ TypeInfoCollector.TypeInfo typeInfo = new TypeInfoCollector.TypeInfo(bean, null, false);
+ TypeInfoCollector collector = typeInfo.getTypeCollector(false, false);
+ MemberInfo info = getMethod(collector, "foo");
+ assertNotNull(info);
+ assertNotNull(info.getMemberType());
+ }
+
private MemberInfo getMethod(TypeInfoCollector collector, String name) {
collector.collectInfo();
List<MemberInfo> mts = collector.getMethods();
13 years, 11 months
JBoss Tools SVN: r40318 - in trunk/common/plugins/org.jboss.tools.common.ui: src/org/jboss/tools/common/ui/commands and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-18 20:14:26 -0400 (Wed, 18 Apr 2012)
New Revision: 40318
Removed:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/commands/sidebyside/
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-11546 compile failed in org.jboss.tools.common.ui when run against Juno TP. Removed Windows->New Editor (Side by Side)
Modified: trunk/common/plugins/org.jboss.tools.common.ui/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/plugin.xml 2012-04-18 23:54:11 UTC (rev 40317)
+++ trunk/common/plugins/org.jboss.tools.common.ui/plugin.xml 2012-04-19 00:14:26 UTC (rev 40318)
@@ -2,51 +2,6 @@
<?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.ui.commands">
- <command
- description="%command.newEditor.sidebyside.description"
- name="%command.newEditor.sidebyside.name"
- categoryId="org.eclipse.ui.category.window"
- id="org.jboss.tools.sidebyside.newEditor">
- </command>
- </extension>
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- commandId="org.jboss.tools.sidebyside.newEditor"
- class="org.jboss.tools.common.ui.commands.sidebyside.SideBySideHandler">
- <enabledWhen>
- <with
- variable="activeEditor">
- <instanceof
- value="org.eclipse.ui.IEditorPart">
- </instanceof>
- </with>
- </enabledWhen>
- </handler>
- </extension>
- <extension
- point="org.eclipse.ui.bindings">
- <key
- commandId="org.jboss.tools.sidebyside.newEditor"
- contextId="org.eclipse.ui.contexts.window"
- sequence="M1+8"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
- </key>
- </extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="menu:window?after=newEditor">
- <command
- label="%command.newEditor.sidebyside.name"
- commandId="org.jboss.tools.sidebyside.newEditor"
- mnemonic="S"
- id="org.jboss.tools.sidebyside.menus.newEditor">
- </command>
- </menuContribution>
- </extension>
- <extension
point="org.eclipse.ui.perspectives">
<perspective
class="org.jboss.tools.common.ui.JBossPerspectiveFactory"
13 years, 11 months
JBoss Tools SVN: r40317 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-18 19:54:11 -0400 (Wed, 18 Apr 2012)
New Revision: 40317
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java
Log:
https://issues.jboss.org/browse/JBIDE-11546 compile failed in org.jboss.tools.common.ui when run against Juno TP
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java 2012-04-18 23:48:28 UTC (rev 40316)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java 2012-04-18 23:54:11 UTC (rev 40317)
@@ -12,9 +12,9 @@
import java.util.ArrayList;
import java.util.Hashtable;
+import java.util.List;
import org.eclipse.ui.IMemento;
-import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -204,6 +204,21 @@
public String getType() {
return getString(TYPE);
}
-
-
-}
+
+ /**
+ * Returns all children of this node.
+ * Required by IMemento since Eclipse 3.8
+ */
+ public IMemento[] getChildren() {
+ List<IMemento> result = new ArrayList<IMemento>();
+ NodeList nl = element.getChildNodes();
+ for (int i=0; i<nl.getLength(); i++) {
+ Node node = nl.item(i);
+ if (node instanceof Element) {
+ IMemento memento = getMemento(node);
+ result.add(memento);
+ }
+ }
+ return result.toArray(new IMemento[result.size()]);
+ }
+}
\ No newline at end of file
13 years, 11 months
JBoss Tools SVN: r40316 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-18 19:48:28 -0400 (Wed, 18 Apr 2012)
New Revision: 40316
Removed:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java
Log:
https://issues.jboss.org/browse/JBIDE-11546 compile failed in org.jboss.tools.common.ui when run against Juno TP
Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java 2012-04-18 23:43:48 UTC (rev 40315)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java 2012-04-18 23:48:28 UTC (rev 40316)
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.model.ui.forms;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.ui.IMemento;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
-
-/**
- * @author AU
- */
-public class Memento implements IMemento {
-
- private static final String MEMENTO = "M"; //$NON-NLS-1$
- private static final String DIVIDER = ":"; //$NON-NLS-1$
- private static final String LINE = "|"; //$NON-NLS-1$
-
- private static final String ARRAY = "A"; //$NON-NLS-1$
- private static final String FLOAT = "F"; //$NON-NLS-1$
- private static final String INTEGER = "I"; //$NON-NLS-1$
- private static final String STRING = "S"; //$NON-NLS-1$
-
- private String id;
- private HashMap map = new HashMap();
- final private String type;
- private static final String TEXT_DATA = "org.jboss.tools.common.model.ui.forms.Memento.textData.id"; //$NON-NLS-1$
-
-
- private Memento() {
- type = null;
- }
-
- public Memento(String type, String id) {
- ModelUIPlugin.getPluginLog().logInfo("new Memento("+id+")"); //$NON-NLS-1$ //$NON-NLS-2$
- this.id = id;
- this.type = type;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#createChild(java.lang.String)
- */
- public IMemento createChild(String type) {
- return createChild(type, type);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#createChild(java.lang.String, java.lang.String)
- */
- public IMemento createChild(String type, String id) {
- Memento newMemento = new Memento(type, id);
- ArrayList list = (ArrayList)map.get(type);
- if (list==null) {
- list = new ArrayList();
- map.put(type, list);
- }
- list.add(newMemento);
- return newMemento;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#getChild(java.lang.String)
- */
- public IMemento getChild(String type) {
- ArrayList list = (ArrayList)map.get(type);
- if (list!=null && list.size()>0)
- return (IMemento)list.get(0);
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#getChildren(java.lang.String)
- */
- public IMemento[] getChildren(String type) {
- ArrayList list = (ArrayList)map.get(type);
- if (list!=null)
- return (IMemento[])list.toArray(new IMemento[list.size()]);
- return new IMemento[0];
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#getFloat(java.lang.String)
- */
- public Float getFloat(String key) {
- return (Float)map.get(key);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#getID()
- */
- public String getID() {
- return id;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#getInteger(java.lang.String)
- */
- public Integer getInteger(String key) {
- return (Integer)map.get(key);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#getString(java.lang.String)
- */
- public String getString(String key) {
- return (String)map.get(key);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#getTextData()
- */
- public String getTextData() {
- return (String)map.get(TEXT_DATA);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#putFloat(java.lang.String, float)
- */
- public void putFloat(String key, float value) {
- map.put(key, new Float(value));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#putInteger(java.lang.String, int)
- */
- public void putInteger(String key, int value) {
- map.put(key, Integer.valueOf(value));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#putMemento(org.eclipse.ui.IMemento)
- */
- public void putMemento(IMemento memento) {
- if (memento!=null) map.put(memento.getID(), memento);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#putString(java.lang.String, java.lang.String)
- */
- public void putString(String key, String value) {
- map.put(key, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMemento#putTextData(java.lang.String)
- */
- public void putTextData(String data) {
- map.put(TEXT_DATA, data);
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return super.toString()+" id="+id; //$NON-NLS-1$
- }
-
- public String stringify() {
- StringBuffer sb = new StringBuffer();
- // head
- sb.append(MEMENTO);
- sb.append(DIVIDER);
- sb.append(id);
- sb.append(LINE);
- // body
- Set keys = map.keySet();
- Iterator i = keys.iterator();
- String key;
- Object value;
- while (i.hasNext()) {
- key = (String)i.next();
- value = map.get(key);
- if (value instanceof Integer) {
- sb.append(INTEGER);
- sb.append(DIVIDER);
- sb.append(key);
- sb.append(DIVIDER);
- sb.append(((Integer)value).intValue());
- } else if (value instanceof String) {
- sb.append(STRING);
- sb.append(DIVIDER);
- sb.append(key);
- sb.append(DIVIDER);
- sb.append((String)value);
- } else if (value instanceof ArrayList) {
- sb.append(ARRAY);
- sb.append(DIVIDER);
- sb.append(key);
- sb.append(DIVIDER);
- ArrayList list = (ArrayList)value;
- Iterator j = list.iterator();
- while (j.hasNext()) {
- Memento children = (Memento)j.next();
- sb.append(children.stringify());
- }
- } else if (value instanceof Float) {
- sb.append(FLOAT);
- sb.append(DIVIDER);
- sb.append(key);
- sb.append(DIVIDER);
- sb.append(((Float)value).doubleValue());
- }
- }
-
-
- return sb.toString();
- }
-
- public void load(IResource resource) {
- }
- public void store(IResource resource) {
- }
-
- public String[] getAttributeKeys() {
- return (String[]) map.keySet().toArray(new String[0]);
- }
-
- public Boolean getBoolean(String key) {
- return (Boolean)map.get(key);
- }
-
- public void putBoolean(String key, boolean value) {
- map.put(key, value);
- }
-
- public String getType() {
- return type;
- }
-
- /**
- * Returns all children of this node.
- * Required by IMemento since Eclipse 3.8
- */
- public IMemento[] getChildren() {
- List<IMemento> result = new ArrayList<IMemento>();
- Set entries = map.entrySet();
- for (Object object : entries) {
- if(object instanceof ArrayList) {
- ArrayList list = (ArrayList)object;
- for (Object memento : list) {
- if(memento instanceof IMemento) {
- result.add((IMemento)memento);
- }
- }
- }
- }
- return result.toArray(new IMemento[result.size()]);
- }
-}
\ No newline at end of file
13 years, 11 months
JBoss Tools SVN: r40315 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-18 19:43:48 -0400 (Wed, 18 Apr 2012)
New Revision: 40315
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java
Log:
https://issues.jboss.org/browse/JBIDE-11546 compile failed in org.jboss.tools.common.ui when run against Juno TP
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java 2012-04-18 22:30:49 UTC (rev 40314)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java 2012-04-18 23:43:48 UTC (rev 40315)
@@ -13,11 +13,11 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import org.eclipse.core.resources.IResource;
import org.eclipse.ui.IMemento;
-
import org.jboss.tools.common.model.ui.ModelUIPlugin;
/**
@@ -239,4 +239,24 @@
public String getType() {
return type;
}
-}
+
+ /**
+ * Returns all children of this node.
+ * Required by IMemento since Eclipse 3.8
+ */
+ public IMemento[] getChildren() {
+ List<IMemento> result = new ArrayList<IMemento>();
+ Set entries = map.entrySet();
+ for (Object object : entries) {
+ if(object instanceof ArrayList) {
+ ArrayList list = (ArrayList)object;
+ for (Object memento : list) {
+ if(memento instanceof IMemento) {
+ result.add((IMemento)memento);
+ }
+ }
+ }
+ }
+ return result.toArray(new IMemento[result.size()]);
+ }
+}
\ No newline at end of file
13 years, 11 months
JBoss Tools SVN: r40314 - trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-18 18:30:49 -0400 (Wed, 18 Apr 2012)
New Revision: 40314
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/build.properties
Log:
fixing build properties
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/build.properties
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/build.properties 2012-04-18 22:23:28 UTC (rev 40313)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/build.properties 2012-04-18 22:30:49 UTC (rev 40314)
@@ -1,4 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ resources/
13 years, 11 months
JBoss Tools SVN: r40313 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-18 18:23:28 -0400 (Wed, 18 Apr 2012)
New Revision: 40313
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/build.properties
Log:
fixing build properties
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/build.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/build.properties 2012-04-18 21:16:37 UTC (rev 40312)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/build.properties 2012-04-18 22:23:28 UTC (rev 40313)
@@ -1,4 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ resources/,\
13 years, 11 months
JBoss Tools SVN: r40312 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: rest/completion and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-18 17:16:37 -0400 (Wed, 18 Apr 2012)
New Revision: 40312
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java
Log:
fixing ws tests
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-18 20:53:04 UTC (rev 40311)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-18 21:16:37 UTC (rev 40312)
@@ -38,6 +38,9 @@
@Require(perspective="Java EE",
server=(a)Server(type=ServerType.JbossAS,
version = "7.1", operator = ">="))
+//@Require(perspective="Java EE",
+// server=(a)Server(type=ServerType.EAP,
+// version = "5.1", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ WSAllBotTests.class })
public class WSTestBase extends SWTTestExt {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-04-18 20:53:04 UTC (rev 40311)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-04-18 21:16:37 UTC (rev 40312)
@@ -16,8 +16,7 @@
import org.jboss.tools.ui.bot.ext.helper.ContentAssistHelper;
import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase;
-import org.junit.After;
-import org.junit.Before;
+import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest;
import org.junit.Test;
/**
@@ -27,31 +26,31 @@
*/
public class RESTfulCompletionTest extends RESTfulTestBase{
+ private final String GET_METHOD_PATH = "/{userId}";
private final String CORRECT_PATH_PARAM = "userId";
-
private final String INCORRECT_PATH_PARAM = "someId";
-
private final String PATH_PARAM_NAVIGATION = "@PathParam(";
-
private final List<String> EXP_NON_EMPTY_COMPLETION_RESULT = Arrays.asList("userId - JAX-RS Mapping");
-
private final List<String> EXP_EMPTY_COMPLETION_RESULT = Arrays.asList("No Default Proposals");
- @Before
- public void setup() {
-
+ @Override
+ protected String getWsProjectName() {
+ return "restEmpty";
}
- @After
+ @Override
public void cleanup() {
- projectExplorer.deleteAllProjects();
+
}
@Test
public void testWithEmptyPrefix() {
- setWsProjectName("restCompletion1");
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, "");
packageExplorer.openFile(getWsProjectName(), "src",
getWsPackage(), getWsName() + ".java").toTextEditor();
@@ -64,8 +63,11 @@
@Test
public void testWithValidPrefixAtTheEnd() {
- setWsProjectName("restCompletion2");
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM);
packageExplorer.openFile(getWsProjectName(), "src",
getWsPackage(), getWsName() + ".java").toTextEditor();
@@ -79,8 +81,11 @@
@Test
public void testWithValidPrefixInTheBeginning() {
- setWsProjectName("restCompletion2");
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM);
packageExplorer.openFile(getWsProjectName(), "src",
getWsPackage(), getWsName() + ".java").toTextEditor();
@@ -93,8 +98,11 @@
@Test
public void testWithInvalidPrefixAtTheEnd() {
- setWsProjectName("restCompletion3");
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, INCORRECT_PATH_PARAM);
packageExplorer.openFile(getWsProjectName(), "src",
getWsPackage(), getWsName() + ".java").toTextEditor();
@@ -108,8 +116,11 @@
@Test
public void testWithInvalidPrefixInTheBeginning() {
- setWsProjectName("restCompletion3");
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, INCORRECT_PATH_PARAM);
packageExplorer.openFile(getWsProjectName(), "src",
getWsPackage(), getWsName() + ".java").toTextEditor();
@@ -122,8 +133,11 @@
@Test
public void testWithAllInvalidParamSelection() {
- setWsProjectName("restCompletion3");
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, INCORRECT_PATH_PARAM);
packageExplorer.openFile(getWsProjectName(), "src",
getWsPackage(), getWsName() + ".java").toTextEditor();
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-04-18 20:53:04 UTC (rev 40311)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-04-18 21:16:37 UTC (rev 40312)
@@ -16,8 +16,6 @@
import org.jboss.tools.ws.ui.bot.test.rest.RESTFulAnnotations;
import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase;
import org.jboss.tools.ws.ui.bot.test.ti.wizard.RESTFullExplorerWizard;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -31,25 +29,20 @@
private RESTFullExplorerWizard restfulWizard = null;
private String restEmptyProjectName = "restEmpty";
- private String restBasicProjectName = "restBasic";
- private String restAdvancedProjectName = "restAdvanced";
- @Before
- public void setup() {
-
+ @Override
+ protected String getWsProjectName() {
+ return restEmptyProjectName;
}
- @After
+ @Override
public void cleanup() {
- projectExplorer.deleteAllProjects();
+
}
@Test
public void testAddingSimpleRESTMethods() {
- setWsProjectName(restEmptyProjectName);
- prepareRestProject();
-
packageExplorer.openFile(getWsProjectName(), "src",
getWsPackage(), getWsName() + ".java").toTextEditor();
resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
@@ -75,9 +68,6 @@
@Test
public void testAddingAdvancedRESTMethods() {
- setWsProjectName(restBasicProjectName);
- prepareRestProject();
-
packageExplorer.openFile(getWsProjectName(), "src",
getWsPackage(), getWsName() + ".java").toTextEditor();
resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
@@ -121,8 +111,11 @@
@Test
public void testEditingSimpleRESTMethods() {
- setWsProjectName(restBasicProjectName);
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(BASIC_WS_RESOURCE),
+ false, getWsPackage(), getWsName());
restfulWizard = new RESTFullExplorerWizard(getWsProjectName());
SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices();
@@ -146,14 +139,16 @@
fail("There should not be DELETE RESTful services");
}
}
-
}
@Test
public void testEditingAdvancedRESTMethods() {
- setWsProjectName(restAdvancedProjectName);
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(ADVANCED_WS_RESOURCE),
+ false, getWsPackage(), getWsName());
restfulWizard = new RESTFullExplorerWizard(getWsProjectName());
SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices();
@@ -188,8 +183,11 @@
@Test
public void testDeletingRESTMethods() {
- setWsProjectName(restBasicProjectName);
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(BASIC_WS_RESOURCE),
+ false, getWsPackage(), getWsName());
restfulWizard = new RESTFullExplorerWizard(getWsProjectName());
SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices();
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-04-18 20:53:04 UTC (rev 40311)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-04-18 21:16:37 UTC (rev 40312)
@@ -13,8 +13,6 @@
import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase;
import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -28,21 +26,24 @@
private final String CORRECT_PATH_PARAM = "id";
private final String BAD_PATH_PARAM = "customerId";
- @Before
- public void setup() {
-
+ @Override
+ protected String getWsProjectName() {
+ return "restEmpty";
}
- @After
+ @Override
public void cleanup() {
- projectExplorer.deleteAllProjects();
+
}
@Test
public void testCorrectValueValidation() {
- setWsProjectName("restValidation1");
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM);
assertTrue(restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 0);
}
@@ -50,8 +51,11 @@
@Test
public void testBadValueValidation() {
- setWsProjectName("restValidation2");
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, BAD_PATH_PARAM);
assertTrue("" + restfulHelper.getRESTValidationErrors(getWsProjectName()).length,
restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 1);
@@ -60,8 +64,11 @@
@Test
public void testCorrectToBadValueValidation() {
- setWsProjectName("restValidation1");
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM);
packageExplorer.openFile(getWsProjectName(), "src",
getWsPackage(), getWsName() + ".java").toTextEditor();
@@ -75,11 +82,15 @@
@Test
public void testBadToCorrectValueValidation() {
- setWsProjectName("restValidation2");
- prepareRestProject();
packageExplorer.openFile(getWsProjectName(), "src",
getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, BAD_PATH_PARAM);
+
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM);
@@ -93,8 +104,11 @@
restfulHelper.disableRESTValidation();
- setWsProjectName("restValidation2");
- prepareRestProject();
+ packageExplorer.openFile(getWsProjectName(), "src",
+ getWsPackage(), getWsName() + ".java").toTextEditor();
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE),
+ false, getWsPackage(), getWsName(), GET_METHOD_PATH, BAD_PATH_PARAM);
assertTrue("" + restfulHelper.getRESTValidationErrors(getWsProjectName()).length,
restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 0);
13 years, 11 months