JBoss Tools SVN: r37462 - in trunk/maven: plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf and 23 other directories.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2011-12-20 11:27:10 -0500 (Tue, 20 Dec 2011)
New Revision: 37462
Added:
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/FacesConfigQuickPeek.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/src/main/webapp/WEB-INF/faces-config.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/src/main/webapp/WEB-INF/web.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/src/main/webapp/WEB-INF/web.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/jsf/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/jsf/utils/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/jsf/utils/FacesConfigQuickPeekTest.java
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java
Log:
JBIDE-10468 : Enable JSF depending on the presence of a faces-config.xml or the reference to FacesServlet in web.xml
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF 2011-12-20 15:03:14 UTC (rev 37461)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF 2011-12-20 16:27:10 UTC (rev 37462)
@@ -18,4 +18,5 @@
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Export-Package: org.jboss.tools.maven.jsf,
- org.jboss.tools.maven.jsf.configurators
+ org.jboss.tools.maven.jsf.configurators,
+ org.jboss.tools.maven.jsf.utils
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-12-20 15:03:14 UTC (rev 37461)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-12-20 16:27:10 UTC (rev 37462)
@@ -11,12 +11,14 @@
package org.jboss.tools.maven.jsf.configurators;
import java.io.File;
+import java.io.InputStream;
import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
@@ -32,7 +34,18 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jst.j2ee.internal.web.util.WebArtifactEditUtilities;
+import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
+import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
+import org.eclipse.jst.j2ee.webapplication.Servlet;
+import org.eclipse.jst.j2ee.webapplication.ServletType;
+import org.eclipse.jst.j2ee.webapplication.WebApp;
+import org.eclipse.jst.j2ee.webapplication.WebType;
+import org.eclipse.jst.jsf.core.JSFVersion;
import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties;
+import org.eclipse.jst.jsf.core.internal.project.facet.JSFUtilFactory;
+import org.eclipse.jst.jsf.core.internal.project.facet.JSFUtils;
+import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigUtils;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.m2e.core.project.MavenProjectChangedEvent;
import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
@@ -51,6 +64,7 @@
import org.jboss.tools.maven.jsf.MavenJSFActivator;
import org.jboss.tools.maven.jsf.MavenJSFConstants;
import org.jboss.tools.maven.jsf.Messages;
+import org.jboss.tools.maven.jsf.utils.FacesConfigQuickPeek;
import org.jboss.tools.maven.ui.Activator;
/**
@@ -67,7 +81,8 @@
private static final String WAR_SOURCE_FOLDER = "/src/main/webapp";
protected static final IProjectFacet dynamicWebFacet;
- protected static final IProjectFacetVersion dynamicWebVersion;
+ protected static IProjectFacetVersion dynamicWebVersion;
+ protected static final IProjectFacetVersion WEB_FACET_3_0;
public static final IProjectFacet JSF_FACET;
public static final IProjectFacetVersion JSF_FACET_VERSION_2_0;
@@ -78,10 +93,11 @@
public static final String JSF_VERSION_2_0 = "2.0";
public static final String JSF_VERSION_1_2 = "1.2";
public static final String JSF_VERSION_1_1 = "1.1";
-
+ private static final String FACES_SERVLET = "javax.faces.webapp.FacesServlet";
static {
dynamicWebFacet = ProjectFacetsManager.getProjectFacet("jst.web"); //$NON-NLS-1$
dynamicWebVersion = dynamicWebFacet.getVersion("2.5"); //$NON-NLS-1$
+ WEB_FACET_3_0 = dynamicWebFacet.getVersion("3.0"); //$NON-NLS-1$
JSF_FACET = ProjectFacetsManager.getProjectFacet("jst.jsf"); //$NON-NLS-1$
JSF_FACET_VERSION_2_0 = JSF_FACET.getVersion(JSF_VERSION_2_0);
JSF_FACET_VERSION_1_2 = JSF_FACET.getVersion(JSF_VERSION_1_2); //$NON-NLS-1$
@@ -117,7 +133,7 @@
return;
}
- String jsfVersion = getJSFVersion(mavenProject, project);
+ String jsfVersion = getJSFVersion(mavenProject, fproj);
if (fproj != null && jsfVersion != null) {
installWarFacets(fproj, jsfVersion, mavenProject, monitor);
}
@@ -329,10 +345,15 @@
}
- private String getJSFVersion(MavenProject mavenProject, IProject project) {
+ private String getJSFVersion(MavenProject mavenProject, IFacetedProject fproj) {
String version = null;
- version = Activator.getDefault().getDependencyVersion(mavenProject, JSF_API_GROUP_ID, JSF_API_ARTIFACT_ID);
+ IProject project = fproj.getProject();
+ version = getVersionFromFacesconfig(project);
+
if (version == null) {
+ version = Activator.getDefault().getDependencyVersion(mavenProject, JSF_API_GROUP_ID, JSF_API_ARTIFACT_ID);
+ }
+ if (version == null) {
//Check if there's a JSF 2 dependency
version = Activator.getDefault().getDependencyVersion(mavenProject, JSF_API2_GROUP_ID, JSF_API_ARTIFACT_ID);
}
@@ -343,9 +364,87 @@
if (version == null) {
version = inferJsfVersionFromDependencies(mavenProject, JSF_API2_GROUP_ID, JSF_API_ARTIFACT_ID, JSF_VERSION_2_0);
}
+
+ if (version == null && hasFacesServletInWebXml(project)) {
+ //No dependency on JSF, no faces-config, but uses faces-servlet
+ //so we try to best guess the version depending on the installed web facet
+ IProjectFacetVersion webVersion = fproj.getInstalledVersion(dynamicWebFacet);
+ if (webVersion.compareTo(WEB_FACET_3_0) < 0) {
+ version = JSF_VERSION_1_2;
+ } else {
+ version = JSF_VERSION_2_0;
+ }
+ }
+
return version;
}
+ private boolean hasFacesServletInWebXml(IProject project) {
+ //We look for javax.faces.webapp.FacesServlet in web.xml
+ WebArtifactEdit edit = null;
+ try {
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if (component != null) {
+ edit = WebArtifactEdit.getWebArtifactEditForRead(component);
+ if (edit !=null) {
+ WebApp webapp = edit.getWebApp();
+ if (webapp != null && webapp.getServlets() != null) {
+ for (Object o : webapp.getServlets()) {
+ if (o instanceof Servlet) {
+ WebType webType = ((Servlet) o).getWebType();
+ if (webType != null
+ && webType.isServletType()
+ && FACES_SERVLET.equals(((ServletType)webType).getClassName())){
+ return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ } finally {
+ if (edit != null)
+ edit.dispose();
+ }
+ return false;
+ }
+
+ private String getVersionFromFacesconfig(IProject project) {
+
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if (component == null) {
+ return null;
+ }
+ IFile facesConfig = null;
+ //TODO get custom faces-config.xml path from web.xml
+ IPath facesConfigPath = new Path("WEB-INF/faces-config.xml");
+ IContainer[] underlyingFolders = component.getRootFolder().getUnderlyingFolders();
+ for (IContainer underlyingFolder : underlyingFolders) {
+ IPath p = underlyingFolder.getProjectRelativePath().append(facesConfigPath);
+ IFile f = project.getFile(p);
+ if (f.exists()) {
+ facesConfig = f;
+ break;
+ }
+ }
+
+ String version = null;
+ if (facesConfig != null) {
+ InputStream in = null;
+ try {
+ in = facesConfig.getContents();
+ FacesConfigQuickPeek peek = new FacesConfigQuickPeek(in);
+ version = peek.getVersion();
+ } catch (CoreException e) {
+ // ignore
+ Activator.log(e);
+ } finally {
+ IOUtil.close(in);
+ }
+ }
+ return version;
+ }
+
/**
* Determines the JSF version by searching for the methods of javax.faces.application.Application
* in the project's classpath.
Added: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/FacesConfigQuickPeek.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/FacesConfigQuickPeek.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/FacesConfigQuickPeek.java 2011-12-20 16:27:10 UTC (rev 37462)
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * 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.maven.jsf.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
+import org.eclipse.jst.jee.util.internal.XMLRootHandler;
+import org.xml.sax.InputSource;
+
+@SuppressWarnings("restriction")
+public class FacesConfigQuickPeek {
+
+ private String FACES_CONFIG_PUBLIC_ID_1_0 = "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN";
+ private String FACES_CONFIG_SYSTEM_ID_1_0 = "http://java.sun.com/dtd/web-facesconfig_1_0.dtd";
+ private String FACES_CONFIG_PUBLIC_ID_1_1 = "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN";
+ private String FACES_CONFIG_SYSTEM_ID_1_1 = "http://java.sun.com/dtd/web-facesconfig_1_1.dtd";
+ private String FACES_CONFIG_SCHEMA_ID_1_2 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd";
+ private String FACES_CONFIG_SCHEMA_ID_2_0 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd";
+ private String FACES_CONFIG_ID_1_0 = "1.0";
+ private String FACES_CONFIG_ID_1_1 = "1.1";
+ private String FACES_CONFIG_ID_1_2 = "1.2";
+ private String FACES_CONFIG_ID_2_0 = "2.0";
+
+ private XMLRootHandler handler;
+
+ private String storedVersion = null;
+
+ private boolean versionSet = false;
+
+ public FacesConfigQuickPeek(InputStream in) {
+ if (in != null) {
+ try {
+ InputSource inputSource = new InputSource(in);
+ handler = new XMLRootHandler();
+ handler.parseContents(inputSource);
+ } catch (Exception ex) {
+ // ignore
+ } finally {
+ try {
+ in.reset();
+ } catch (IOException ex) {
+ // ignore
+ }
+ }
+ }
+ }
+
+ public String getVersion() {
+ if (!versionSet) {
+ if (handler != null && "faces-config".equals(handler.getRootName())) {
+ String version = null;
+ if (handler.getRootAttributes() != null) {
+ version = handler.getRootAttributes().getValue("version");
+ }
+ if (version == null || version.trim().length() == 0) {
+ version = getVersionFromDtdSchema();
+ }
+ storedVersion = version;
+ versionSet = true;
+ }
+
+ }
+ return storedVersion;
+ }
+
+ private String getVersionFromDtdSchema() {
+ //Algorithm copied from org.eclipse.jst.jee.util.internal.JavaEEQuickPeek
+ if (handler == null) {
+ return null;
+ }
+ String publicID = handler.getDtdPublicID();
+ String systemID = handler.getDtdSystemID();
+ String schemaName = null;
+ if (publicID == null || systemID == null) {
+ if (handler.getRootAttributes() != null) {
+ schemaName = JavaEEQuickPeek.normalizeSchemaLocation(handler.getRootAttributes().getValue("xsi:schemaLocation")); //$NON-NLS-1$
+ }
+ if (schemaName == null) {
+ return null;
+ }
+ }
+ String version = null;
+ if (publicID != null && systemID != null) {
+ if (publicID.equals(FACES_CONFIG_PUBLIC_ID_1_0) && (systemID.equals(FACES_CONFIG_SYSTEM_ID_1_0))) {
+ version = FACES_CONFIG_ID_1_0;
+ } else if (publicID.equals(FACES_CONFIG_PUBLIC_ID_1_1) && systemID.equals(FACES_CONFIG_SYSTEM_ID_1_1)) {
+ version = FACES_CONFIG_ID_1_1;
+ }
+ } else if (schemaName != null) {
+ if (schemaName.equals(FACES_CONFIG_SCHEMA_ID_1_2)) {
+ version = FACES_CONFIG_ID_1_2;
+ } else if (schemaName.equals(FACES_CONFIG_SCHEMA_ID_2_0)) {
+ version = FACES_CONFIG_ID_2_0;
+ }
+ }
+ return version;
+ }
+}
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/pom.xml 2011-12-20 16:27:10 UTC (rev 37462)
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>foo.bar</groupId>
+ <artifactId>jsf-facesconfig</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-facesconfig/src/main/webapp/WEB-INF/faces-config.xml 2011-12-20 16:27:10 UTC (rev 37462)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
+
+</faces-config>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/pom.xml 2011-12-20 16:27:10 UTC (rev 37462)
@@ -0,0 +1,7 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>foo.bar</groupId>
+ <artifactId>jsf-webxml</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-12/src/main/webapp/WEB-INF/web.xml 2011-12-20 16:27:10 UTC (rev 37462)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+ <display-name>foo</display-name>
+
+ <!-- Faces Servlet -->
+ <servlet>
+ <servlet-name>faces</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ </servlet>
+
+ <!-- Faces Servlet Mappings -->
+ <servlet-mapping>
+ <servlet-name>faces</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/pom.xml 2011-12-20 16:27:10 UTC (rev 37462)
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>foo.bar</groupId>
+ <artifactId>jsf-webxml-20</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-10468/jsf-webxml-20/src/main/webapp/WEB-INF/web.xml 2011-12-20 16:27:10 UTC (rev 37462)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
+ <display-name>foo</display-name>
+
+ <!-- Faces Servlet -->
+ <servlet>
+ <servlet-name>faces</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ </servlet>
+
+ <!-- Faces Servlet Mappings -->
+ <servlet-mapping>
+ <servlet-name>faces</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2011-12-20 15:03:14 UTC (rev 37461)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2011-12-20 16:27:10 UTC (rev 37462)
@@ -63,8 +63,31 @@
File originalWebXml = new File(projectLocation, webxmlRelPath);
assertEquals("web.xml content changed ", toString(originalWebXml), toString(webXml));
}
+
+
+ @Test
+ public void testJBIDE10468_facesServletInWebXml() throws Exception {
+ String projectLocation = "projects/jsf/JBIDE-10468/jsf-webxml-20";
+ IProject jsfProject = importProject(projectLocation+"/pom.xml");
+ waitForJobsToComplete(new NullProgressMonitor());
+ assertIsJSFProject(jsfProject, JSFProjectConfigurator.JSF_FACET_VERSION_2_0);
+
+ projectLocation = "projects/jsf/JBIDE-10468/jsf-webxml-12";
+ jsfProject = importProject(projectLocation+"/pom.xml");
+ waitForJobsToComplete(new NullProgressMonitor());
+ assertIsJSFProject(jsfProject, JSFProjectConfigurator.JSF_FACET_VERSION_1_2);
+ }
@Test
+ public void testJBIDE10468_detectFacesConfig() throws Exception {
+ String projectLocation = "projects/jsf/JBIDE-10468/jsf-facesconfig";
+ IProject jsfProject = importProject(projectLocation+"/pom.xml");
+ waitForJobsToComplete(new NullProgressMonitor());
+ assertIsJSFProject(jsfProject, JSFProjectConfigurator.JSF_FACET_VERSION_2_0);
+ }
+
+
+ @Test
public void testJBIDE9455_errorMarkers() throws Exception {
String projectLocation = "projects/jsf/jsf-error";
IProject jsfProject = importProject(projectLocation+"/pom.xml");
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/jsf/utils/FacesConfigQuickPeekTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/jsf/utils/FacesConfigQuickPeekTest.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/jsf/utils/FacesConfigQuickPeekTest.java 2011-12-20 16:27:10 UTC (rev 37462)
@@ -0,0 +1,45 @@
+package org.jboss.tools.maven.jsf.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+import junit.framework.TestCase;
+
+public class FacesConfigQuickPeekTest extends TestCase {
+
+ public void testGetVersion() {
+ assertVersion("2.0", getInputStream("<faces-config version=\"2.0\"></faces-config>"));
+ assertVersion("1.2", getInputStream("<faces-config version=\"1.2\"></faces-config>"));
+ assertVersion(null, getInputStream("<faces-config version=\"\"></faces-config>"));
+ assertVersion(null, getInputStream("<faces-config></faces-config>"));
+ assertVersion(null, getInputStream("<faces-config version=\"2.0\""));
+ assertVersion(null, getInputStream(""));
+ assertVersion(null, getInputStream("<dummy version=\"3.0\">"));
+ }
+
+ public void testGetVersionFromDTD() {
+ assertVersion("1.0", getInputStream("<!DOCTYPE faces-config PUBLIC \"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN\" \"http://java.sun.com/dtd/web-facesconfig_1_0.dtd\"><faces-config></faces-config>"));
+ assertVersion("1.1", getInputStream("<!DOCTYPE faces-config PUBLIC \"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN\" \"http://java.sun.com/dtd/web-facesconfig_1_1.dtd\"><faces-config></faces-config>"));
+ assertVersion("1.2", getInputStream("<faces-config xmlns=\"http://java.sun.com/xml/ns/javaee\""
+ + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
+ + " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd\" >"));
+ assertVersion("2.0", getInputStream("<faces-config xmlns=\"http://java.sun.com/xml/ns/javaee\""
+ + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
+ + " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\" >"));
+ }
+
+ private InputStream getInputStream(String s) {
+ try {
+ return (s == null)? null :new ByteArrayInputStream(s.getBytes("UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ private void assertVersion(String expectedVersion, InputStream in) {
+ FacesConfigQuickPeek qp = new FacesConfigQuickPeek(in);
+ assertEquals(expectedVersion, qp.getVersion());
+ }
+}
14 years
JBoss Tools SVN: r37461 - in trunk/vpe/plugins: org.jboss.tools.vpe.browsersim.browser/META-INF and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2011-12-20 10:03:14 -0500 (Tue, 20 Dec 2011)
New Revision: 37461
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-10521 :
BrowserSim: No provider name for some plugins
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF 2011-12-20 12:44:37 UTC (rev 37460)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF 2011-12-20 15:03:14 UTC (rev 37461)
@@ -7,3 +7,4 @@
Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
org.jboss.tools.vpe.browsersim.browser;bundle-version="1.0.0"
Export-Package: org.jboss.tools.vpe.browsersim.ui
+Bundle-Vendor: JBoss by Red Hat
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF 2011-12-20 12:44:37 UTC (rev 37460)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF 2011-12-20 15:03:14 UTC (rev 37461)
@@ -1,9 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: WebKit
+Bundle-Name: WebKit support for BrowserSim
Bundle-SymbolicName: org.jboss.tools.vpe.browsersim.browser;singleton:=true
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-ExtensibleAPI: true
Export-Package: org.jboss.tools.vpe.browsersim.browser
Require-Bundle: org.eclipse.swt;bundle-version="3.7.0"
+Bundle-Vendor: JBoss by Red Hat
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF 2011-12-20 12:44:37 UTC (rev 37460)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF 2011-12-20 15:03:14 UTC (rev 37461)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: BrowserSim Eclipse Plug-in
+Bundle-Name: Eclipse integrations of BrowserSim
Bundle-SymbolicName: org.jboss.tools.vpe.browsersim.eclipse;singleton:=true
Bundle-Version: 3.3.0.qualifier
Bundle-Activator: org.jboss.tools.vpe.browsersim.eclipse.Activator
@@ -14,3 +14,4 @@
org.eclipse.ui.browser
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: JBoss by Red Hat
14 years
JBoss Tools SVN: r37460 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: template and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2011-12-20 07:44:37 -0500 (Tue, 20 Dec 2011)
New Revision: 37460
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeStyleCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-5861 - CSS comments were removed.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-12-20 11:57:57 UTC (rev 37459)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-12-20 12:44:37 UTC (rev 37460)
@@ -320,7 +320,7 @@
}
return false;
}
-
+
/**
* Creates new visual node representing {@code sourceNode} and its descendants.
*
@@ -1148,18 +1148,21 @@
String styleForParse = styleText.toString();
/*
* https://issues.jboss.org/browse/JBIDE-5861
- * Add nested @import constructions
+ * Remove CSS comments first:
*/
+ styleForParse = VpeStyleUtil.removeAllCssComments(styleForParse);
List<String> imports = VpeStyleUtil.findCssImportConstruction(styleForParse, pageContext);
if (imports.size() > 0) {
for (String key : imports) {
+ /*
+ * Add nested @import constructions
+ */
addLinkNodeToHead(key, "css_nested_import_construction", false); //$NON-NLS-1$
}
/*
* Replace @import constructions
*/
- Matcher m = VpeStyleUtil.CSS_IMPORT_PATTERN.matcher(styleForParse);
- styleForParse = m.replaceAll(Constants.EMPTY);
+ styleForParse = VpeStyleUtil.removeAllCssImportConstructions(styleForParse);
}
styleForParse = VpeStyleUtil.addFullPathIntoURLValue(styleForParse, href_val);
inlineStyle.appendChild(getVisualDocument().createTextNode(styleForParse));
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeStyleCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeStyleCreator.java 2011-12-20 11:57:57 UTC (rev 37459)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeStyleCreator.java 2011-12-20 12:44:37 UTC (rev 37460)
@@ -41,19 +41,22 @@
text = textNode.getNodeValue();
/*
* https://issues.jboss.org/browse/JBIDE-5861
- * Add inline <style> element for each found css @import
+ * Remove CSS comments first:
*/
+ text = VpeStyleUtil.removeAllCssComments(text);
+ List<String> imports = VpeStyleUtil.findCssImportConstruction(text, pageContext);
VpeVisualDomBuilder vvdb = pageContext.getVisualBuilder();
- List<String> imports = VpeStyleUtil.findCssImportConstruction(text, pageContext);
if (imports.size() > 0) {
for (String key : imports) {
+ /*
+ * Add inline <style> element for each found css @import.
+ */
vvdb.addLinkNodeToHead(key, "css_import_construction", false); //$NON-NLS-1$
}
/*
- * Replace @import constructions
+ * Replace @import constructions that've been added.
*/
- Matcher m = VpeStyleUtil.CSS_IMPORT_PATTERN.matcher(text);
- text = m.replaceAll(Constants.EMPTY);
+ text = VpeStyleUtil.removeAllCssImportConstructions(text);
}
text = VpeStyleUtil.addFullPathIntoURLValue(text, pageContext);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2011-12-20 11:57:57 UTC (rev 37459)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2011-12-20 12:44:37 UTC (rev 37460)
@@ -82,9 +82,14 @@
* For the long string regexp could be updated:
* (.*) should be replaced with ([^;]*)
*/
+ public static final String LINE_SEPARATOR = System.getProperty("line.separator"); //$NON-NLS-1$
public static final Pattern CSS_URL_PATTERN = Pattern.compile("(?<=\\burl\\b)(?:[\\p{Space}]*\\()[\\p{Space}]*([^;]*)[\\p{Space}]*(?:\\)[\\p{Space}]*)(?=(?>[^\\)]*;|[^\\)]*))"); //$NON-NLS-1$
public static final Pattern CSS_IMPORT_PATTERN = Pattern.compile("@import[\\p{Space}]+(?:\\burl\\b[\\p{Space}]*\\()*[\\p{Space}]*([^;]*)[\\p{Space}]*(?:\\)[\\p{Space}]*(?=(?>[^\\)]*;|[^\\)]*)))*"); //$NON-NLS-1$
public static final Pattern CSS_URI_PATTERN = Pattern.compile("(?:\\\"{1}(.*)\\\"{1})|(?:\\'{1}(.*)\\'{1})"); //$NON-NLS-1$
+ /*
+ * Pattern "|(//.*)" could be added at the end to remove single line comments.
+ */
+ public static final Pattern CSS_COMMENT_PATTERN = Pattern.compile("(/\\*([^*]|["+LINE_SEPARATOR+"]|(\\*+([^*/]|["+LINE_SEPARATOR+"])))*\\*+/)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
public static String ATTR_URL = "url"; //$NON-NLS-1$
public static String OPEN_BRACKET = "("; //$NON-NLS-1$
@@ -934,4 +939,12 @@
}
return uri;
}
-}
+
+ public static String removeAllCssImportConstructions(String cssText) {
+ return CSS_IMPORT_PATTERN.matcher(cssText).replaceAll(Constants.EMPTY);
+ }
+
+ public static String removeAllCssComments(String cssText) {
+ return CSS_COMMENT_PATTERN.matcher(cssText).replaceAll(Constants.EMPTY);
+ }
+}
\ No newline at end of file
14 years
JBoss Tools SVN: r37459 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-12-20 06:57:57 -0500 (Tue, 20 Dec 2011)
New Revision: 37459
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java
Log:
Fixes for JBT 3.3.0.M5
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java 2011-12-20 10:37:08 UTC (rev 37458)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java 2011-12-20 11:57:57 UTC (rev 37459)
@@ -132,7 +132,7 @@
facesConfigEditorExt.save();
bot.sleep(Timing.time1S());
if (getCheckForExistingManagedBeanClass()){
- assertFacesConfigXmlHasErrors(botExt);
+ assertFacesConfigXmlHasValidationProblems(botExt);
}
editorBot.textWithLabel(IDELabel.FacesConfigEditor.MANAGED_BEAN_CLASS_LABEL)
.setText(managedBeanClass);
@@ -283,12 +283,17 @@
* Asserts if faces-config.xml has errors
* @param botExt
*/
- protected static void assertFacesConfigXmlHasErrors (SWTBotExt botExt){
+ protected static void assertFacesConfigXmlHasValidationProblems (SWTBotExt botExt){
- SWTBotTreeItem[] errors = ProblemsView.getFilteredErrorsTreeItems(botExt, null, null, AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME, null);
- boolean areThereErrors = ((errors != null) && (errors.length > 0));
- assertTrue("There are missing errors in Problems view for " + AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME + " file.",
- areThereErrors);
+ SWTBotTreeItem[] problems = ProblemsView.getFilteredErrorsTreeItems(botExt, null, null, AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME, null);
+ boolean areThereProblems = ((problems != null) && (problems.length > 0));
+ if (!areThereProblems){
+ problems = ProblemsView.getFilteredWarningsTreeItems(botExt, "references to non-existent class", null,
+ AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME, null);
+ areThereProblems = ((problems != null) && (problems.length > 0));
+ }
+ assertTrue("There are missing problems in Problems view for " + AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME + " file.",
+ areThereProblems);
}
/**
* Check editing of particular tree node within Face Config Editor Tree
@@ -330,7 +335,7 @@
facesConfigEditorExt.save();
bot.sleep(Timing.time1S());
if (checkForValdiationErrors){
- assertFacesConfigXmlHasErrors(botExt);
+ assertFacesConfigXmlHasValidationProblems(botExt);
}
final String selectedNode = tree.selection().get(0,0);
assertTrue ("Selected node has to have label '" + typeTextValue +"'\n" +
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 2011-12-20 10:37:08 UTC (rev 37458)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-20 11:57:57 UTC (rev 37459)
@@ -320,9 +320,9 @@
0,
0);
editor.insertText("\n");
- String textToInsert = "<h:outputText value=\"#{msg[";
+ String textToInsert = "<h:outputText value=\"#{msg";
final SWTBotShell[] shellsBefore = bot.shells();
- editor.typeText(textToInsert);
+ editor.typeText(textToInsert + "[");
bot.sleep(Timing.time2S());
// Check Content Assist invoked by typing
ContentAssistBot contentAssist = editor.contentAssist();
@@ -342,12 +342,12 @@
contentAssist.checkContentAssist(useCodeAssist, true);
final String textToInsertAtEnd = "/>";
editor.insertText(editor.cursorPosition().line,
- editor.cursorPosition().column + 3,
+ editor.cursorPosition().column + 2,
textToInsertAtEnd);
editor.save();
bot.sleep(Timing.time1S());
Assertions.assertSourceEditorContains(editor.getText(),
- textToInsert + "'" + useCodeAssist + "']}" + textToInsertAtEnd,
+ textToInsert + useCodeAssist + "}" + textToInsertAtEnd,
FACELETS_TEST_PAGE);
}
/**
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java 2011-12-20 10:37:08 UTC (rev 37458)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java 2011-12-20 11:57:57 UTC (rev 37459)
@@ -15,6 +15,7 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper;
import org.jboss.tools.ui.bot.ext.parts.SWTBotTableExt;
@@ -92,7 +93,8 @@
final SWTBotEclipseEditor jspTextEditor = botExt.editorByTitle(TEST_PAGE)
.toTextEditor();
jspTextEditor.save();
- botExt.toolbarButtonWithTooltip(IDELabel.Button.REFRESH).click();
+ botExt.toolbarButtonWithTooltip(SWTJBTExt.isRunningOnMacOs() ?
+ IDELabel.ToolbarButton.REFRESH_MAC_OS: IDELabel.ToolbarButton.REFRESH).click();
botExt.sleep(Timing.time1S());
String editorText = jspTextEditor.getText();
String testText = "<h:outputText value=\"" + outputTextValue + "\">";
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java 2011-12-20 10:37:08 UTC (rev 37458)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java 2011-12-20 11:57:57 UTC (rev 37459)
@@ -42,9 +42,9 @@
@Override
protected void verifyTag() {
assertVisualEditorContains(getVisualEditor(),
- "DIV",
+ "TEXTAREA",
new String[]{"class"},
- new String[]{"mceIframeContainer"},
+ new String[]{"jbds_rf_editor_content_textarea_internal_css_class"},
getTestPageFileName());
// check tag selection
getVisualEditor().selectDomNode(getVisualEditor().getDomNodeByTagName("DIV",4), 0);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java 2011-12-20 10:37:08 UTC (rev 37458)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java 2011-12-20 11:57:57 UTC (rev 37459)
@@ -57,16 +57,16 @@
@Override
protected void verifyTag() {
assertVisualEditorContainsNodeWithValue(getVisualEditor(),
- "Copy all",
+ "⇒ Copy all",
getTestPageFileName());
assertVisualEditorContainsNodeWithValue(getVisualEditor(),
- "Copy",
+ "→ Copy",
getTestPageFileName());
assertVisualEditorContainsNodeWithValue(getVisualEditor(),
- "Remove All",
+ "⇐ Remove All",
getTestPageFileName());
assertVisualEditorContainsNodeWithValue(getVisualEditor(),
- "Remove",
+ "← Remove",
getTestPageFileName());
assertVisualEditorContains(getVisualEditor(),
"TABLE",
14 years
JBoss Tools SVN: r37458 - 1 and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2011-12-20 05:37:08 -0500 (Tue, 20 Dec 2011)
New Revision: 37458
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSImportConstruction.html.xml
Log:
https://issues.jboss.org/browse/JBIDE-10534 - height property was removed.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSImportConstruction.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSImportConstruction.html.xml 2011-12-20 10:27:02 UTC (rev 37457)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSImportConstruction.html.xml 2011-12-20 10:37:08 UTC (rev 37458)
@@ -31,7 +31,6 @@
cursor: auto;
direction: ltr;
display: table-cell;
- empty-cells: -moz-show-background;
float: none;
font-family: serif;
font-size: 16px;
@@ -40,7 +39,6 @@
font-style: normal;
font-variant: normal;
font-weight: 400;
- height: 20px;
left: auto;
table-layout: auto;
text-align: start;
@@ -49,7 +47,6 @@
text-shadow: none;
text-transform: none;
top: auto;
- unicode-bidi: embed;
vertical-align: middle;
visibility: visible;
white-space: normal;
14 years
JBoss Tools SVN: r37457 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot: matcher/console and 9 other directories.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2011-12-20 05:27:02 -0500 (Tue, 20 Dec 2011)
New Revision: 37457
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/JavaPerspectiveAbstractSWTMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/WorkspaceAssert.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ExceptionInConsoleOutputMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenJavaPerspectiveTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenPerspectiveTask.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/DefaultMatchersFactory.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ExistingProjectMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFileMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/testcase/SWTTaskBasedTestCase.java
Log:
Matchers refactoring
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/JavaPerspectiveAbstractSWTMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/JavaPerspectiveAbstractSWTMatcher.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/JavaPerspectiveAbstractSWTMatcher.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -0,0 +1,21 @@
+package org.jboss.tools.portlet.ui.bot.matcher;
+
+import org.jboss.tools.portlet.ui.bot.matcher.perspective.OpenJavaPerspectiveTask;
+
+/**
+ * Matcher that operates in Java Perspective.
+ *
+ * @author Lucia Jelinkova
+ *
+ * @param <T>
+ */
+public abstract class JavaPerspectiveAbstractSWTMatcher<T> extends AbstractSWTMatcher<T> {
+
+ protected abstract boolean matchesSafelyInJavaPerspective(T item);
+
+ @Override
+ public final boolean matchesSafely(T item) {
+ performInnerTask(new OpenJavaPerspectiveTask());
+ return matchesSafelyInJavaPerspective(item);
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/WorkspaceAssert.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/WorkspaceAssert.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/WorkspaceAssert.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -0,0 +1,49 @@
+package org.jboss.tools.portlet.ui.bot.matcher;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.StringDescription;
+
+/**
+ * Custom implementation of {@link MatcherAssert} that allows to customize the error message.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class WorkspaceAssert {
+
+ public static void assertThatInWorkspace(Matcher<Void> matcher) {
+ assertThatInWorkspace("", matcher);
+ }
+
+ public static void assertThatInWorkspace(String reason, Matcher<Void> matcher) {
+ if (!matcher.matches(null)) {
+ Description description = new StringDescription();
+ description.appendText(reason)
+ .appendText("\nExpected that ")
+ .appendDescriptionOf(matcher)
+ .appendText("\n");
+
+ throw new java.lang.AssertionError(description.toString());
+ }
+ }
+
+ public static <T> void assertThatInWorkspace(T actual, Matcher<T> matcher) {
+ assertThatInWorkspace("", actual, matcher);
+ }
+
+ public static <T> void assertThatInWorkspace(String reason, T actual, Matcher<T> matcher) {
+ if (!matcher.matches(actual)) {
+ Description description = new StringDescription();
+ description.appendText(reason)
+ .appendText("\nExpected that ")
+ .appendValue(actual)
+ .appendText(" ")
+ .appendDescriptionOf(matcher)
+ .appendText("\n");
+
+ throw new java.lang.AssertionError(description.toString());
+ }
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -25,6 +25,6 @@
@Override
public void describeTo(Description description) {
- description.appendText("console contains specified text [" + consoleText + "]");
+ description.appendText("is in console output, but instead: \n" + consoleText);
}
}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ExceptionInConsoleOutputMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ExceptionInConsoleOutputMatcher.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ExceptionInConsoleOutputMatcher.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -0,0 +1,33 @@
+package org.jboss.tools.portlet.ui.bot.matcher.console;
+
+import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.inConsoleOutput;
+
+import org.hamcrest.Description;
+import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
+import org.jboss.tools.portlet.ui.bot.matcher.SWTMatcher;
+
+/**
+ * Matcher for the current state of workspace - that there is an exception in console output.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class ExceptionInConsoleOutputMatcher extends AbstractSWTMatcher<Void> {
+
+ private SWTMatcher<String> consoleOutputMatcher;
+
+ public ExceptionInConsoleOutputMatcher() {
+ super();
+ consoleOutputMatcher = inConsoleOutput();
+ }
+
+ @Override
+ public boolean matchesSafely(Void item) {
+ return consoleOutputMatcher.matches("Exception:");
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("exception is in console output");
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/DefaultMatchersFactory.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/DefaultMatchersFactory.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/DefaultMatchersFactory.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -2,6 +2,7 @@
import org.jboss.tools.portlet.ui.bot.matcher.SWTMatcher;
import org.jboss.tools.portlet.ui.bot.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.portlet.ui.bot.matcher.console.ExceptionInConsoleOutputMatcher;
import org.jboss.tools.portlet.ui.bot.matcher.problems.NumberOfErrorsMatcher;
/**
@@ -23,4 +24,8 @@
public static SWTMatcher<String> inConsoleOutput(){
return new ConsoleOutputMatcher();
}
+
+ public static SWTMatcher<Void> exceptionInConsoleOutput(){
+ return new ExceptionInConsoleOutputMatcher();
+ }
}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenJavaPerspectiveTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenJavaPerspectiveTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenJavaPerspectiveTask.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -0,0 +1,17 @@
+package org.jboss.tools.portlet.ui.bot.matcher.perspective;
+
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+
+
+/**
+ * Opens Java perspective.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class OpenJavaPerspectiveTask extends OpenPerspectiveTask {
+
+ public OpenJavaPerspectiveTask() {
+ super(ActionItem.Perspective.JAVA.LABEL);
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenPerspectiveTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenPerspectiveTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/perspective/OpenPerspectiveTask.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -0,0 +1,26 @@
+package org.jboss.tools.portlet.ui.bot.matcher.perspective;
+
+import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.gen.IPerspective;
+
+/**
+ * Opens the given perspective.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class OpenPerspectiveTask extends AbstractSWTTask {
+
+ private IPerspective perspective;
+
+ public OpenPerspectiveTask(IPerspective name) {
+ super();
+ this.perspective = name;
+ }
+
+ @Override
+ public void perform() {
+ SWTBotFactory.getOpen().perspective(perspective);
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -2,9 +2,9 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.Description;
-import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
+import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher;
+import org.jboss.tools.portlet.ui.bot.matcher.perspective.OpenJavaPerspectiveTask;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.view.ProblemsView;
/**
@@ -13,15 +13,12 @@
* @author Lucia Jelinkova
*
*/
-public class NumberOfErrorsMatcher extends AbstractSWTMatcher<Integer> {
+public class NumberOfErrorsMatcher extends JavaPerspectiveAbstractSWTMatcher<Integer> {
- private int expectedNumber;
-
private int numberOfErrors;
@Override
- public boolean matchesSafely(Integer expectedNumber) {
- SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL);
+ protected boolean matchesSafelyInJavaPerspective(Integer expectedNumber) {
SWTBotTreeItem errorItem = ProblemsView.getErrorsNode(SWTBotFactory.getBot());
if (errorItem == null){
@@ -32,7 +29,6 @@
}
}
- this.expectedNumber = expectedNumber;
this.numberOfErrors = errorItem.getNodes().size();
return expectedNumber.equals(numberOfErrors);
@@ -40,8 +36,6 @@
@Override
public void describeTo(final Description description) {
- description.appendText("Different number of errors.\n");
- description.appendText("Number of expected errors: " + expectedNumber + "\n");
- description.appendText("Number of errors: " + numberOfErrors + "\n");
+ description.appendText("is number of errors in workspace but there are " + numberOfErrors + " errors");
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ExistingProjectMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ExistingProjectMatcher.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ExistingProjectMatcher.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -1,9 +1,8 @@
package org.jboss.tools.portlet.ui.bot.matcher.workspace;
import org.hamcrest.Description;
-import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
+import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
/**
* Checks if the project exists in the workspace.
@@ -11,17 +10,17 @@
* @author Lucia Jelinkova
*
*/
-public class ExistingProjectMatcher extends AbstractSWTMatcher<String> {
+public class ExistingProjectMatcher extends JavaPerspectiveAbstractSWTMatcher<String> {
+
@Override
- public boolean matchesSafely(String project) {
- SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL);
+ protected boolean matchesSafelyInJavaPerspective(String project) {
return SWTBotFactory.getEclipse().isProjectInPackageExplorer(project);
}
@Override
public void describeTo(Description description) {
- description.appendValue("existing project");
+ description.appendText("is an existing project");
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -6,7 +6,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.Description;
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
-import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
+import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher;
import org.jboss.tools.portlet.ui.bot.task.dialog.ProjectPropertyDialogCloseTask;
import org.jboss.tools.portlet.ui.bot.task.dialog.ProjectPropertyDialogOpenTask;
import org.jboss.tools.portlet.ui.bot.task.facet.AbstractFacetTask;
@@ -17,7 +17,7 @@
* @author Lucia Jelinkova
*
*/
-public class ProjectFacetsMatcher extends AbstractSWTMatcher<String> {
+public class ProjectFacetsMatcher extends JavaPerspectiveAbstractSWTMatcher<String> {
private List<FacetDefinition> facets;
@@ -26,7 +26,7 @@
}
@Override
- public boolean matchesSafely(String project) {
+ protected boolean matchesSafelyInJavaPerspective(String project) {
showPropertyDialog(project);
boolean result = checkFacets();
performInnerTask(new ProjectPropertyDialogCloseTask());
@@ -52,7 +52,8 @@
@Override
public void describeTo(Description description) {
- description.appendValue("file containing facet");
+ description.appendText("contains facets ");
+ description.appendValue(facets);
}
class ValueCheckedTask extends AbstractFacetTask {
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFileMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFileMatcher.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFileMatcher.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -2,9 +2,8 @@
import org.hamcrest.Description;
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
-import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
+import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
/**
* Checks if the file exists in the project.
@@ -12,16 +11,15 @@
* @author Lucia Jelinkova
*
*/
-public class ExistingFileMatcher extends AbstractSWTMatcher<WorkspaceFile> {
+public class ExistingFileMatcher extends JavaPerspectiveAbstractSWTMatcher<WorkspaceFile> {
@Override
- public boolean matchesSafely(WorkspaceFile file) {
- SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL);
+ protected boolean matchesSafelyInJavaPerspective(WorkspaceFile file) {
return SWTBotFactory.getPackageexplorer().isFilePresent(file.getProject(), file.getFilePathAsArray());
}
@Override
public void describeTo(Description description) {
- description.appendValue("existing file");
+ description.appendValue("is an existing file");
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -5,11 +5,10 @@
import org.hamcrest.Description;
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
-import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
+import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-public class ExistingFilesMatcher extends AbstractSWTMatcher<List<WorkspaceFile>> {
+public class ExistingFilesMatcher extends JavaPerspectiveAbstractSWTMatcher<List<WorkspaceFile>> {
private List<WorkspaceFile> missingFiles;
@@ -18,9 +17,7 @@
}
@Override
- public boolean matchesSafely(List<WorkspaceFile> files) {
- SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL);
-
+ protected boolean matchesSafelyInJavaPerspective(List<WorkspaceFile> files) {
for (WorkspaceFile file : files){
boolean isPresent = SWTBotFactory.getPackageexplorer().isFilePresent(file.getProject(), file.getFilePathAsArray());
@@ -34,6 +31,6 @@
@Override
public void describeTo(Description description) {
- description.appendText("existing files " + missingFiles);
+ description.appendText("are existing files, but the following files are missing: " + missingFiles);
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -9,7 +9,7 @@
import org.hamcrest.Description;
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.entity.XMLNode;
-import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
+import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
@@ -20,7 +20,7 @@
* @author Lucia Jelinkova
*
*/
-public class XMLFileNodeContentMatcher extends AbstractSWTMatcher<WorkspaceFile> {
+public class XMLFileNodeContentMatcher extends JavaPerspectiveAbstractSWTMatcher<WorkspaceFile> {
private List<XMLNode> nodes;
@@ -30,7 +30,7 @@
}
@Override
- public boolean matchesSafely(WorkspaceFile file) {
+ protected boolean matchesSafelyInJavaPerspective(WorkspaceFile file) {
SWTBotFactory.getPackageexplorer().openFile(file.getProject(), file.getFilePathAsArray());
SWTBotEditorExt editor = SWTBotFactory.getBot().swtBotEditorExtByTitle(file.getFileName());
SWTBotTree tree = editor.bot().tree();
@@ -58,7 +58,7 @@
@Override
public void describeTo(Description description) {
- description.appendText("file containing nodes: " + nodes);
+ description.appendText("contains XML nodes: " + nodes);
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -3,7 +3,6 @@
import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file;
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
-import org.jboss.tools.portlet.ui.bot.task.server.MarkFileAsDeployableTask;
import org.jboss.tools.portlet.ui.bot.task.server.RunningFileOnServerTask;
import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -77,12 +77,12 @@
public void testcreate(){
doPerform(getCreateDynamicWebProjectTask());
- doAssertThat(0, isNumberOfErrors());
- doAssertThat(getProjectName(), isExistingProject());
- doAssertThat(getProjectName(), hasFacets(getRequiredFacets()));
- doAssertThat(getExpectedWorkspaceFiles(), exist());
+ doAssertThatInWorkspace(0, isNumberOfErrors());
+ doAssertThatInWorkspace(getProjectName(), isExistingProject());
+ doAssertThatInWorkspace(getProjectName(), hasFacets(getRequiredFacets()));
+ doAssertThatInWorkspace(getExpectedWorkspaceFiles(), exist());
if (getNonExpectedFiles().size() > 0){
- doAssertThat(getNonExpectedWorkspaceFiles(), not(exist()));
+ doAssertThatInWorkspace(getNonExpectedWorkspaceFiles(), not(exist()));
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -50,12 +50,12 @@
public void testCreate(){
doPerform(getCreatePortletTask());
- doAssertThat(0, isNumberOfErrors());
- doAssertThat(getExpectedWorkspaceFiles(), exist());
+ doAssertThatInWorkspace(0, isNumberOfErrors());
+ doAssertThatInWorkspace(getExpectedWorkspaceFiles(), exist());
if (getNonExpectedWorkspaceFiles().size() > 0){
- doAssertThat(getNonExpectedWorkspaceFiles(), not(exist()));
+ doAssertThatInWorkspace(getNonExpectedWorkspaceFiles(), not(exist()));
}
- doAssertThat(file(getProjectName(), WEB_INF + "portlet.xml"),
+ doAssertThatInWorkspace(file(getProjectName(), WEB_INF + "portlet.xml"),
containsNodes(getExpectedXMLNodes()));
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -1,8 +1,7 @@
package org.jboss.tools.portlet.ui.bot.test.template;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.not;
-import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.inConsoleOutput;
+import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.exceptionInConsoleOutput;
import org.jboss.tools.portlet.ui.bot.task.console.ConsoleClearingTask;
import org.jboss.tools.portlet.ui.bot.task.server.RunninngProjectOnServerTask;
@@ -30,6 +29,6 @@
doPerform(new ConsoleClearingTask());
doPerform(new RunninngProjectOnServerTask(getProjectName()));
- assertThat("Exception:", not(inConsoleOutput()));
+ doAssertThatInWorkspace(not(exceptionInConsoleOutput()));
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/testcase/SWTTaskBasedTestCase.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/testcase/SWTTaskBasedTestCase.java 2011-12-20 10:25:23 UTC (rev 37456)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/testcase/SWTTaskBasedTestCase.java 2011-12-20 10:27:02 UTC (rev 37457)
@@ -1,6 +1,6 @@
package org.jboss.tools.portlet.ui.bot.test.testcase;
-import static org.junit.Assert.assertThat;
+import static org.jboss.tools.portlet.ui.bot.matcher.WorkspaceAssert.assertThatInWorkspace;
import org.hamcrest.Matcher;
import org.jboss.tools.portlet.ui.bot.matcher.SWTMatcher;
@@ -23,11 +23,32 @@
task.perform();
}
- protected <T> void doAssertThat(T actual, Matcher<T> matcher){
+ protected void doAssertThatInWorkspace(Matcher<Void> matcher){
if (matcher instanceof SWTBotAware){
((SWTBotAware) matcher).setBot(bot);
}
- assertThat(actual, matcher);
+ assertThatInWorkspace(matcher);
}
+ protected void doAssertThatInWorkspace(String reason, Matcher<Void> matcher){
+ if (matcher instanceof SWTBotAware){
+ ((SWTBotAware) matcher).setBot(bot);
+ }
+ assertThatInWorkspace(reason, matcher);
+ }
+
+ protected <T> void doAssertThatInWorkspace(T actual, Matcher<T> matcher){
+ if (matcher instanceof SWTBotAware){
+ ((SWTBotAware) matcher).setBot(bot);
+ }
+ assertThatInWorkspace(actual, matcher);
+ }
+
+ protected <T> void doAssertThatInWorkspace(String description, T actual, Matcher<T> matcher){
+ if (matcher instanceof SWTBotAware){
+ ((SWTBotAware) matcher).setBot(bot);
+ }
+ assertThatInWorkspace(description, actual, matcher);
+ }
+
}
14 years
JBoss Tools SVN: r37456 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2011-12-20 05:25:23 -0500 (Tue, 20 Dec 2011)
New Revision: 37456
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/FacetDefinition.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/WorkspaceFile.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/XMLNode.java
Log:
Entities cleanup
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/FacetDefinition.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/FacetDefinition.java 2011-12-20 10:12:44 UTC (rev 37455)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/FacetDefinition.java 2011-12-20 10:25:23 UTC (rev 37456)
@@ -1,5 +1,11 @@
package org.jboss.tools.portlet.ui.bot.entity;
+/**
+ * Holds values for project facets.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
public class FacetDefinition {
private String category;
@@ -49,4 +55,9 @@
public void setVersion(String version) {
this.version = version;
}
+
+ @Override
+ public String toString() {
+ return "Facet " + getCategory() + "/" + getName() + " in version " + getVersion();
+ }
}
\ No newline at end of file
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/WorkspaceFile.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/WorkspaceFile.java 2011-12-20 10:12:44 UTC (rev 37455)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/WorkspaceFile.java 2011-12-20 10:25:23 UTC (rev 37456)
@@ -1,5 +1,11 @@
package org.jboss.tools.portlet.ui.bot.entity;
+/**
+ * Holds information about one resource in the workspace.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
public class WorkspaceFile {
public static final String FILE_SEPARATOR = "/";
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/XMLNode.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/XMLNode.java 2011-12-20 10:12:44 UTC (rev 37455)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/entity/XMLNode.java 2011-12-20 10:25:23 UTC (rev 37456)
@@ -1,6 +1,11 @@
package org.jboss.tools.portlet.ui.bot.entity;
-
+/**
+ * Represents one node in XML file.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
public class XMLNode {
public static final String NODES_SEPARATOR = "/";
14 years
JBoss Tools SVN: r37455 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: quickfix/injection and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: jjankovi
Date: 2011-12-20 05:12:44 -0500 (Tue, 20 Dec 2011)
New Revision: 37455
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ConfigValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java
Log:
Correction of Seam3TestBase + template of Seam3ConfigValidationTest added
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java 2011-12-20 10:08:43 UTC (rev 37454)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java 2011-12-20 10:12:44 UTC (rev 37455)
@@ -11,6 +11,7 @@
package org.jboss.tools.cdi.bot.test;
+import org.jboss.tools.cdi.bot.test.seam3.Seam3ConfigValidationTest;
import org.jboss.tools.cdi.bot.test.seam3.Seam3GenericOpenOnTest;
import org.jboss.tools.cdi.bot.test.seam3.Seam3ResourceOpenOnTest;
import org.jboss.tools.cdi.bot.test.seam3.Seam3TestBase;
@@ -45,6 +46,7 @@
@SuiteClasses({
Seam3ResourceOpenOnTest.class,
Seam3GenericOpenOnTest.class,
+ Seam3ConfigValidationTest.class,
})
public class CDISeam3AllBotTests extends Seam3TestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-20 10:08:43 UTC (rev 37454)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-20 10:12:44 UTC (rev 37455)
@@ -14,7 +14,6 @@
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.EligibleInjectionQuickFixTestBase;
import org.junit.After;
-import org.junit.Ignore;
import org.junit.Test;
/**
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ConfigValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ConfigValidationTest.java 2011-12-20 10:08:43 UTC (rev 37454)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ConfigValidationTest.java 2011-12-20 10:12:44 UTC (rev 37455)
@@ -11,7 +11,9 @@
package org.jboss.tools.cdi.bot.test.seam3;
+import org.junit.Test;
+
public class Seam3ConfigValidationTest extends Seam3TestBase {
@Override
@@ -19,4 +21,9 @@
return "Seam3ConfigValidation";
}
+ @Test
+ public void testConfig() {
+
+ }
+
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java 2011-12-20 10:08:43 UTC (rev 37454)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java 2011-12-20 10:12:44 UTC (rev 37455)
@@ -45,7 +45,7 @@
@Override
public void checkAndCreateProject() {
if (!projectHelper.projectExists(getProjectName())) {
- projectHelper.createCDIProjectWithCDIWizard(getProjectName());
+ projectHelper.createCDIProjectWithDynamicWizard(getProjectName());
addSeamSolderLibrary();
}
}
14 years
JBoss Tools SVN: r37454 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test.
by jbosstools-commits@lists.jboss.org
Author: jjankovi
Date: 2011-12-20 05:08:43 -0500 (Tue, 20 Dec 2011)
New Revision: 37454
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDISeam3AllBotTests.launch
Log:
New launcher for Seam3 bot tests added
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDISeam3AllBotTests.launch
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDISeam3AllBotTests.launch (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDISeam3AllBotTests.launch 2011-12-20 10:08:43 UTC (rev 37454)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="true"/>
+<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">
+<listEntry value="/org.jboss.tools.cdi.core/bin"/>
+<listEntry value="/org.jboss.tools.cdi.solder.core/bin"/>
+<listEntry value="/org.jboss.tools.cdi.text.ext/bin"/>
+<listEntry value="/org.jboss.tools.cdi.xml/bin"/>
+<listEntry value="/org.jboss.tools.cdi.xml.ui/bin"/>
+<listEntry value="/org.jboss.tools.cdi.ui/bin"/>
+</listAttribute>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":1"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.cdi.bot.test.CDISeam3AllBotTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.cdi.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms256m -Xmx512m -Dswtbot.test.properties.file=${env_var:HOME}/swtbot.properties -Dusage_reporting_enabled=false"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
14 years
JBoss Tools SVN: r37453 - in trunk/documentation/whatsnew/examples: images and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2011-12-20 05:03:26 -0500 (Tue, 20 Dec 2011)
New Revision: 37453
Added:
trunk/documentation/whatsnew/examples/images/advanced-wizard.png
trunk/documentation/whatsnew/examples/images/missingEapRepoWarning.png
trunk/documentation/whatsnew/examples/images/simplified-wizard.png
Modified:
trunk/documentation/whatsnew/examples/examples-news-3.3.0.M5.html
Log:
JBIDE-10386 : maven project examples wizard N&N
Modified: trunk/documentation/whatsnew/examples/examples-news-3.3.0.M5.html
===================================================================
--- trunk/documentation/whatsnew/examples/examples-news-3.3.0.M5.html 2011-12-20 09:23:49 UTC (rev 37452)
+++ trunk/documentation/whatsnew/examples/examples-news-3.3.0.M5.html 2011-12-20 10:03:26 UTC (rev 37453)
@@ -36,7 +36,7 @@
</tr>
<tr>
<td valign="top" align="left">
- <a name="itemnam1e" id="itemname1"></a><b>Improve cheatsheets</b>
+ <a name="itemnam1e" id="itemname1"></a><b>Improved cheatsheet support</b>
</td>
<td width="70%" valign="top">
<p>Now the Project Example engine opens cheatsheet.xml, .cheatsheet.xml, readme.html, readme.txt and readme.md automatically when finding them in the root of some of the created projects.
@@ -44,11 +44,45 @@
<p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-10243">Related Jira</a></small></p>
</td>
</tr>
-
<tr>
<td colspan="2">
<hr />
</td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <a name="itemnam1e" id="itemname1"></a><b>New Wizard for Maven Archetypes</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>For project examples based on Maven archetypes, the project Wizard now provides a simplified UI, abstracting away anything Maven related.
+ The first page now displays the following :
+ </p>
+ <img src="images/simplified-wizard.png" alt="new simplified wizard for Maven archetype based project examples"/>
+ <p>Filling in the project name and a package fields will enable the "Finish" button so you can get started almost immediately.
+ Even though nothing maven related is displayed in this first page, if you click finish, the generated project will be a fully functional maven project.
+ Using the package value as groupId, Project name as artifactId and 0.0.1-SNAPSHOT as the default version.
+ </p>
+ <p>Setting the target runtime will, for JBoss archetypes, determine if the generated project will use the community
+ or enterprise version of some JBoss or Java EE 6 dependencies (this is equivalent to setting -Denterprise=true / false on the archetype).
+ By default, such archetypes will depend on org.jboss.spec:jboss-javaee-web-6.0 version 2.0.0.Final,
+ but if the "enterprise" version is selected (by choosing an EAP target runtime), version 3.0.0.Beta1-redhat-1 will be used instead.
+ </p>
+ <p>
+ If org.jboss.spec:jboss-javaee-web-6.0:pom:3.0.0.Beta1-redhat-1 can not be resolved from any available maven repositories, a warning will be displayed :
+ </p>
+ <img src="images/missingEapRepoWarning.png" alt="Warning if org.jboss.spec:jboss-javaee-web-6.0:pom:3.0.0.Beta1-redhat-1 is missing"/>
+ <p>
+ Clicking on the "Next" button, will display the regular Maven Archetype wizard, so you can have more control over the maven settings of your project.
+ If a maven profile is active by default for that archetype, the advanced section will be expanded :</p>
+ <img src="images/advanced-wizard.png" alt="Advanced page of Maven archetype based project examples"/>
+ <p><small>related JIRAs : <a href="https://jira.jboss.org/jira/browse/JBIDE-9776">JBIDE-9776</a>,
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-10209">JBIDE-10209</a>, <a href="https://jira.jboss.org/jira/browse/JBIDE-10200">JBIDE-10200</a> </small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
</tr>
</table>
Added: trunk/documentation/whatsnew/examples/images/advanced-wizard.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/examples/images/advanced-wizard.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/examples/images/missingEapRepoWarning.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/examples/images/missingEapRepoWarning.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/examples/images/simplified-wizard.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/examples/images/simplified-wizard.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years