JBoss Tools SVN: r40060 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-05 04:11:09 -0400 (Thu, 05 Apr 2012)
New Revision: 40060
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java
Log:
small refactoring
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java 2012-04-05 08:10:45 UTC (rev 40059)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java 2012-04-05 08:11:09 UTC (rev 40060)
@@ -46,14 +46,14 @@
AssignableBeansDialog assignDialog = new AssignableBeansDialog(bot.shell("Assignable Beans"));
assertTrue(assignDialog.getAllBeans().size() == 6);
- assertTrue(assignDialog.getAllBeans().contains("" +
- "@Decorator D1 - " + getPackageName() + " - /"
+ assertTrue(assignDialog.getAllBeans().contains("@Decorator D1 - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
assignDialog.hideDecorators();
assertTrue(assignDialog.getAllBeans().size() == 5);
- assertFalse(assignDialog.getAllBeans().contains("" +
- "@Decorator D1 - " + getPackageName() + " - /"
+ assertFalse(assignDialog.getAllBeans().contains("@Decorator D1 - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
}
@@ -69,13 +69,13 @@
AssignableBeansDialog assignDialog = new AssignableBeansDialog(bot.shell("Assignable Beans"));
assertTrue(assignDialog.getAllBeans().size() == 6);
- assertTrue(assignDialog.getAllBeans().contains("" +
- "@Interceptor I1 - " + getPackageName() + " - /"
+ assertTrue(assignDialog.getAllBeans().contains("@Interceptor I1 - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
assignDialog.hideInterceptors();
assertTrue(assignDialog.getAllBeans().size() == 5);
- assertFalse(assignDialog.getAllBeans().contains("" +
- "@Interceptor I1 - " + getPackageName() + " - /"
+ assertFalse(assignDialog.getAllBeans().contains("@Interceptor I1 - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
}
@@ -91,13 +91,13 @@
AssignableBeansDialog assignDialog = new AssignableBeansDialog(bot.shell("Assignable Beans"));
assertTrue(assignDialog.getAllBeans().size() == 6);
- assertTrue(assignDialog.getAllBeans().contains("" +
- "@Alternative BasicManager - " + getPackageName() + " - /"
+ assertTrue(assignDialog.getAllBeans().contains("@Alternative BasicManager - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
assignDialog.hideUnselectedAlternatives();
assertTrue(assignDialog.getAllBeans().size() == 5);
- assertFalse(assignDialog.getAllBeans().contains("" +
- "@Alternative BasicManager - " + getPackageName() + " - /"
+ assertFalse(assignDialog.getAllBeans().contains("@Alternative BasicManager - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
}
@@ -113,13 +113,13 @@
AssignableBeansDialog assignDialog = new AssignableBeansDialog(bot.shell("Assignable Beans"));
assertTrue(assignDialog.getAllBeans().size() == 6);
- assertTrue(assignDialog.getAllBeans().contains("" +
- "@Produces BasicManager.getManager() - " + getPackageName() + " - /"
+ assertTrue(assignDialog.getAllBeans().contains("@Produces BasicManager.getManager() - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
assignDialog.hideUnavailableProducers();
assertTrue(assignDialog.getAllBeans().size() == 5);
- assertFalse(assignDialog.getAllBeans().contains("" +
- "@Produces BasicManager.getManager() - " + getPackageName() + " - /"
+ assertFalse(assignDialog.getAllBeans().contains("@Produces BasicManager.getManager() - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
}
@@ -135,13 +135,13 @@
AssignableBeansDialog assignDialog = new AssignableBeansDialog(bot.shell("Assignable Beans"));
assertTrue(assignDialog.getAllBeans().size() == 6);
- assertTrue(assignDialog.getAllBeans().contains("" +
- "AbstractManager - " + getPackageName() + " - /"
+ assertTrue(assignDialog.getAllBeans().contains("AbstractManager - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
assignDialog.hideSpecializedBeans();
assertTrue(assignDialog.getAllBeans().size() == 5);
- assertFalse(assignDialog.getAllBeans().contains("" +
- "AbstractManager - " + getPackageName() + " - /"
+ assertFalse(assignDialog.getAllBeans().contains("AbstractManager - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
}
@@ -159,25 +159,25 @@
bot.shell("Assignable Beans"));
assertTrue(assignDialog.getAllBeans().size() == 3);
- assertTrue(assignDialog.getAllBeans().contains("" +
- "@Alternative Manager1 - " + getPackageName() + " - /"
+ assertTrue(assignDialog.getAllBeans().contains("@Alternative Manager1 - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
- assertTrue(assignDialog.getAllBeans().contains("" +
- "Manager2 - " + getPackageName() + " - /"
+ assertTrue(assignDialog.getAllBeans().contains("Manager2 - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
- assertTrue(assignDialog.getAllBeans().contains("" +
- "Manager3 - " + getPackageName() + " - /"
+ assertTrue(assignDialog.getAllBeans().contains("Manager3 - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
assignDialog.hideAmbiguousBeans();
assertTrue(assignDialog.getAllBeans().size() == 1);
- assertTrue(assignDialog.getAllBeans().contains("" +
- "@Alternative Manager1 - " + getPackageName() + " - /"
+ assertTrue(assignDialog.getAllBeans().contains("@Alternative Manager1 - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
- assertFalse(assignDialog.getAllBeans().contains("" +
- "Manager2 - " + getPackageName() + " - /"
+ assertFalse(assignDialog.getAllBeans().contains("Manager2 - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
- assertFalse(assignDialog.getAllBeans().contains("" +
- "Manager3 - " + getPackageName() + " - /"
+ assertFalse(assignDialog.getAllBeans().contains("Manager3 - "
+ + getPackageName() + " - /"
+ getProjectName() + "/src"));
}
13 years, 8 months
JBoss Tools SVN: r40059 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-05 04:10:45 -0400 (Thu, 05 Apr 2012)
New Revision: 40059
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/AssignableBeansDialog.java
Log:
Feature 'typing into filter textbox' added
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/AssignableBeansDialog.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/AssignableBeansDialog.java 2012-04-05 08:09:09 UTC (rev 40058)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/AssignableBeansDialog.java 2012-04-05 08:10:45 UTC (rev 40059)
@@ -52,6 +52,12 @@
return allBeans;
}
+ public AssignableBeansDialog typeInFilter(String text) {
+ bot.text().setText(""); // clear filter textbox
+ bot.text().typeText(text);
+ return this;
+ }
+
public AssignableBeansDialog hideUnavailableBeans() {
getTreeItem(UNAVAILABLE_BEANS).uncheck();
return this;
13 years, 8 months
JBoss Tools SVN: r40058 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects: AssignableDialogFilterTest and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-05 04:09:09 -0400 (Thu, 05 Apr 2012)
New Revision: 40058
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.project
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/.jsdtscope
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.common.component
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/META-INF/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/WEB-INF/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/WEB-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/WEB-INF/lib/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/build/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Animal.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/AnimalDecorator.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/App.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Cat.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Dog.java
Log:
resource project for new cdi bot test added
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.classpath (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.classpath 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_29">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/AS-7.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.project (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.project 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>AssignableDialogFilterTest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.cdi.core.cdibuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
+ </natures>
+</projectDescription>
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/.jsdtscope
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/.jsdtscope (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/.jsdtscope 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.jdt.core.prefs 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,7 @@
+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.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.common.component 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="AssignableDialogFilterTest">
+ <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="AssignableDialogFilterTest"/>
+ <property name="java-output-path" value="/AssignableDialogFilterTest/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="AS-7.0"/>
+ <fixed facet="java"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/META-INF/MANIFEST.MF 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/WEB-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/WEB-INF/beans.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/WebContent/WEB-INF/beans.xml 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
+ <decorators>
+ <class>cdi.D1</class>
+ </decorators>
+</beans>
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Animal.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Animal.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Animal.java 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,5 @@
+package cdi;
+
+public interface Animal {
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/AnimalDecorator.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/AnimalDecorator.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/AnimalDecorator.java 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,20 @@
+package cdi;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.enterprise.inject.Any;
+import javax.inject.Inject;
+
+@Decorator
+public abstract class AnimalDecorator implements Animal {
+
+ @Inject
+ @Delegate
+ @Any
+ private Animal animal;
+
+ public AnimalDecorator() {
+ // TODO Auto-generated constructor stub
+ }
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/App.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/App.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/App.java 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,10 @@
+package cdi;
+
+import javax.inject.Inject;
+
+public class App {
+
+ @Inject
+ Animal animal;
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Cat.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Cat.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Cat.java 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,5 @@
+package cdi;
+
+public class Cat implements Animal {
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Dog.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Dog.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/AssignableDialogFilterTest/src/cdi/Dog.java 2012-04-05 08:09:09 UTC (rev 40058)
@@ -0,0 +1,5 @@
+package cdi;
+
+public class Dog implements Animal {
+
+}
13 years, 8 months
JBoss Tools SVN: r40057 - trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-05 03:58:10 -0400 (Thu, 05 Apr 2012)
New Revision: 40057
Modified:
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/util/TestProjectProvider.java
Log:
Not sure why a 'close' was destroying the unit test, but it was. Fixed.
Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/util/TestProjectProvider.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/util/TestProjectProvider.java 2012-04-05 07:24:45 UTC (rev 40056)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/util/TestProjectProvider.java 2012-04-05 07:58:10 UTC (rev 40057)
@@ -122,7 +122,6 @@
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
public void run(IProgressMonitor monitor) throws CoreException {
IPath loc = project.getLocation();
- project.close(new NullProgressMonitor());
project.delete(false, true, new NullProgressMonitor());
if(makeCopy) {
FileUtil.remove(loc.toFile());
13 years, 8 months
JBoss Tools SVN: r40056 - trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-05 03:24:45 -0400 (Thu, 05 Apr 2012)
New Revision: 40056
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/MBeanUtils.java
Log:
JBIDE-11484 - jmx support for java.lang.Boolean
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/MBeanUtils.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/MBeanUtils.java 2012-04-05 07:24:39 UTC (rev 40055)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/MBeanUtils.java 2012-04-05 07:24:45 UTC (rev 40056)
@@ -96,6 +96,8 @@
return new Character(valueStr.charAt(0));
if (type.equals("boolean")) //$NON-NLS-1$
return new Boolean(valueStr);
+ if (type.equals("java.lang.Boolean")) //$NON-NLS-1$
+ return new Boolean(valueStr);
if (MBeanUtils.class.getClassLoader().loadClass("java.lang.Number") //$NON-NLS-1$
.isAssignableFrom(
MBeanUtils.class.getClassLoader().loadClass(type)))
13 years, 8 months
JBoss Tools SVN: r40055 - trunk/jmx/plugins/org.jboss.tools.jmx.ui/schema.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-05 03:24:39 -0400 (Thu, 05 Apr 2012)
New Revision: 40055
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/schema/providerUI.exsd
Log:
JBIDE-11452 - damage control - A desperate attempt to make the extensions load by lowering the requirement to 0 wizard pages rather than minimum of 1.
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/schema/providerUI.exsd
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/schema/providerUI.exsd 2012-04-05 07:17:54 UTC (rev 40054)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/schema/providerUI.exsd 2012-04-05 07:24:39 UTC (rev 40055)
@@ -49,7 +49,7 @@
<element name="providerUI">
<complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
+ <sequence minOccurs="0" maxOccurs="unbounded">
<element ref="wizardPage"/>
</sequence>
<attribute name="id" type="string" use="required">
13 years, 8 months
JBoss Tools SVN: r40054 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-05 03:17:54 -0400 (Thu, 05 Apr 2012)
New Revision: 40054
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java
Log:
cdi bot test implementation finished
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java 2012-04-05 07:17:33 UTC (rev 40053)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java 2012-04-05 07:17:54 UTC (rev 40054)
@@ -35,7 +35,7 @@
}
}
- @Test //example exists
+ @Test
public void testDecorator() {
setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
@@ -58,7 +58,7 @@
}
- @Test //example exists
+ @Test
public void testInterceptor() {
setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
@@ -80,7 +80,7 @@
}
- @Test //example exists
+ @Test
public void testUnselectedAlternative() {
setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
@@ -102,7 +102,7 @@
}
- @Test //example exists
+ @Test
public void testUnavailableProducer() {
setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
@@ -124,7 +124,7 @@
}
- @Test //example exists
+ @Test
public void testSpecializedBeans() {
setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
@@ -146,9 +146,40 @@
}
- @Test //example doesnt exist
+ @Test
public void testAmbiguousBeans() {
+ setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
+ getPackageName(), appClass).toTextEditor());
+
+ assertTrue(openOnUtil.openOnByOption("managerImpl", appClass,
+ CDIConstants.SHOW_ALL_ASSIGNABLE));
+
+ AssignableBeansDialog assignDialog = new AssignableBeansDialog(
+ bot.shell("Assignable Beans"));
+
+ assertTrue(assignDialog.getAllBeans().size() == 3);
+ assertTrue(assignDialog.getAllBeans().contains("" +
+ "@Alternative Manager1 - " + getPackageName() + " - /"
+ + getProjectName() + "/src"));
+ assertTrue(assignDialog.getAllBeans().contains("" +
+ "Manager2 - " + getPackageName() + " - /"
+ + getProjectName() + "/src"));
+ assertTrue(assignDialog.getAllBeans().contains("" +
+ "Manager3 - " + getPackageName() + " - /"
+ + getProjectName() + "/src"));
+ assignDialog.hideAmbiguousBeans();
+ assertTrue(assignDialog.getAllBeans().size() == 1);
+ assertTrue(assignDialog.getAllBeans().contains("" +
+ "@Alternative Manager1 - " + getPackageName() + " - /"
+ + getProjectName() + "/src"));
+ assertFalse(assignDialog.getAllBeans().contains("" +
+ "Manager2 - " + getPackageName() + " - /"
+ + getProjectName() + "/src"));
+ assertFalse(assignDialog.getAllBeans().contains("" +
+ "Manager3 - " + getPackageName() + " - /"
+ + getProjectName() + "/src"));
+
}
}
13 years, 8 months
JBoss Tools SVN: r40053 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-05 03:17:33 -0400 (Thu, 05 Apr 2012)
New Revision: 40053
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
Log:
debug profile added to cdi bot test's pom.xml
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2012-04-05 07:16:43 UTC (rev 40052)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2012-04-05 07:17:33 UTC (rev 40053)
@@ -11,10 +11,8 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <!-- debug option -->
- <!-- <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties> -->
-
- <systemProperties> -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties>
+ <additionalSystemProperties></additionalSystemProperties>
+ <systemProperties>${additionalSystemProperties} -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties>
</properties>
<build>
@@ -66,6 +64,12 @@
<properties>
<test.suite.class>org.jboss.tools.cdi.bot.test.CDISmokeBotTests</test.suite.class>
</properties>
- </profile>
+ </profile>
+ <profile>
+ <id>debug</id>
+ <properties>
+ <additionalSystemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</additionalSystemProperties>
+ </properties>
+ </profile>
</profiles>
</project>
13 years, 8 months
JBoss Tools SVN: r40052 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest: src/cdi and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-05 03:16:43 -0400 (Thu, 05 Apr 2012)
New Revision: 40052
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/src/cdi/Manager3.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/WebContent/WEB-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/src/cdi/Manager2.java
Log:
modifying resource project to simulate ambiguous beans
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/WebContent/WEB-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/WebContent/WEB-INF/beans.xml 2012-04-05 06:52:07 UTC (rev 40051)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/WebContent/WEB-INF/beans.xml 2012-04-05 07:16:43 UTC (rev 40052)
@@ -9,6 +9,5 @@
</interceptors>
<alternatives>
<class>cdi.Manager1</class>
- <class>cdi.Manager2</class>
</alternatives>
</beans>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/src/cdi/Manager2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/src/cdi/Manager2.java 2012-04-05 06:52:07 UTC (rev 40051)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/src/cdi/Manager2.java 2012-04-05 07:16:43 UTC (rev 40052)
@@ -1,8 +1,6 @@
package cdi;
-import javax.enterprise.inject.Alternative;
-@Alternative
public class Manager2 implements IManager {
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/src/cdi/Manager3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/src/cdi/Manager3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIAssignableDialogTest/src/cdi/Manager3.java 2012-04-05 07:16:43 UTC (rev 40052)
@@ -0,0 +1,5 @@
+package cdi;
+
+public class Manager3 implements IManager {
+
+}
13 years, 8 months
JBoss Tools SVN: r40051 - trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-05 02:52:07 -0400 (Thu, 05 Apr 2012)
New Revision: 40051
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/MBeanUtils.java
Log:
JBIDE-11484 - jmx support for java.lang.Boolean
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/MBeanUtils.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/MBeanUtils.java 2012-04-05 06:34:35 UTC (rev 40050)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/MBeanUtils.java 2012-04-05 06:52:07 UTC (rev 40051)
@@ -52,6 +52,8 @@
ret[i] = new Character(texti.charAt(0));
} else if (param.getType().equals("boolean")) {//$NON-NLS-1$
ret[i] = new Boolean(texti);
+ } else if (param.getType().equals("java.lang.Boolean")) {//$NON-NLS-1$
+ ret[i] = new Boolean(texti);
} else if (MBeanUtils.class
.getClassLoader()
.loadClass("java.lang.Number").isAssignableFrom(MBeanUtils.class.getClassLoader().loadClass(param.getType()))) {//$NON-NLS-1$
13 years, 8 months