JBoss Tools SVN: r38479 - in trunk/openshift: plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-07 14:07:02 -0500 (Tue, 07 Feb 2012)
New Revision: 38479
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/utils/
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/utils/RegexUtils.java
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/EGitCoreActivator.java
trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java
trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestRepository.java
Log:
[JBIDE-10479] implemented EGitUtils#hasRemote(name, url) that reponds whether a repo has a configured remote with the given name and url
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2012-02-07 16:31:34 UTC (rev 38478)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2012-02-07 19:07:02 UTC (rev 38479)
@@ -71,6 +71,7 @@
import org.eclipse.team.core.RepositoryProvider;
import org.eclipse.wst.server.core.IServer;
import org.jboss.tools.openshift.egit.core.internal.EGitCoreActivator;
+import org.jboss.tools.openshift.egit.core.internal.utils.RegexUtils;
/**
* The Class EGitUtils.
@@ -363,20 +364,20 @@
public static List<URIish> getRemoteURIs(IProject p) throws CoreException {
RemoteConfig rc = getRemoteConfig(p);
- if( rc != null ) {
+ if (rc != null) {
return rc.getURIs();
}
return new ArrayList<URIish>();
}
-
+
public static RemoteConfig getRemoteConfig(IProject project) throws CoreException {
Repository rep = getRepository(project);
- if( rep != null ) {
+ if (rep != null) {
return getRemoteConfig(rep);
}
return null;
}
-
+
/**
* Pushes the current branch of the given repository to the remote
* repository that it originates from.
@@ -686,10 +687,6 @@
return remoteConfig;
}
- public static boolean hasRemoteConfig(String name, List<RemoteConfig> remoteConfigs) {
- return getRemoteConfig(name, remoteConfigs) != null;
- }
-
/**
* Returns all the remote configs from the given repository.
*
@@ -706,10 +703,6 @@
repository.toString()));
}
}
-
- public static boolean hasRemoteUrl(String regex, Repository repository) throws CoreException {
- return hasRemoteUrl(Pattern.compile(regex), repository);
- }
/**
* Returns <code>true</code> if the given repository has a configured remote
@@ -722,17 +715,46 @@
*/
public static boolean hasRemoteUrl(Pattern pattern, Repository repository) throws CoreException {
for (RemoteConfig config : getAllRemoteConfigs(repository)) {
- for (URIish uri : config.getURIs()) {
- Matcher matcher = pattern.matcher(uri.toString());
- if (matcher.find()) {
- return true;
- }
+ if (hasRemoteUrl(pattern, config)) {
+ return true;
}
}
return false;
}
+ public static boolean hasRemoteUrl(Pattern pattern, RemoteConfig config) {
+ for (URIish uri : config.getURIs()) {
+ Matcher matcher = pattern.matcher(uri.toString());
+ if (matcher.find()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
+ * Returns <code>true</code> if the given repository has a remote config
+ * with the given name and url.
+ *
+ * @param name
+ * the name that the remote config shall match
+ * @param url
+ * the url that the remote config shall match
+ * @param repository
+ * the repository that is searched
+ * @return
+ * @throws CoreException
+ */
+ public static boolean hasRemote(String name, String url, Repository repository) throws CoreException {
+ RemoteConfig remoteConfig = getRemoteConfig(name, repository);
+ if (remoteConfig == null) {
+ return false;
+ }
+
+ return hasRemoteUrl(Pattern.compile(RegexUtils.toPatternString(url)), remoteConfig);
+ }
+
+ /**
* Returns <code>true</code> if the given repository has several configured
* remotes
*
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/EGitCoreActivator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/EGitCoreActivator.java 2012-02-07 16:31:34 UTC (rev 38478)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/EGitCoreActivator.java 2012-02-07 19:07:02 UTC (rev 38479)
@@ -37,6 +37,10 @@
EGitCoreActivator.context = null;
}
+ public static IStatus createErrorStatus(String message) {
+ return createStatus(IStatus.ERROR, message, null);
+ }
+
public static IStatus createErrorStatus(String message, Throwable throwable) {
return createStatus(IStatus.ERROR, message, throwable);
}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/utils/RegexUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/utils/RegexUtils.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/utils/RegexUtils.java 2012-02-07 19:07:02 UTC (rev 38479)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * 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.openshift.egit.core.internal.utils;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class RegexUtils {
+
+ public static String toPatternString(String string) {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < string.length(); ++i) {
+ char ch = string.charAt(i);
+ if ("\\.^$|?*+[]{}()".indexOf(ch) != -1) {
+ // reserved char char
+ builder.append('\\').append(ch);
+// } else if (Character.isLetter(ch)) {
+// // letter
+// builder.append("[A-Za-z]");
+// } else if (Character.isDigit(ch)) {
+// // digit
+// builder.append("\\d");
+ } else {
+ builder.append(ch);
+ }
+ }
+ return builder.toString();
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/utils/RegexUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java 2012-02-07 16:31:34 UTC (rev 38478)
+++ trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java 2012-02-07 19:07:02 UTC (rev 38479)
@@ -258,4 +258,12 @@
assertNotNull(repo2Config);
}
+ @Test
+ public void canCheckIfHasRemote() throws CoreException, MalformedURLException, URISyntaxException, IOException {
+ String repo2RemoteName = "repo2";
+
+ testRepositoryClone.addRemoteTo(repo2RemoteName, testRepository2.getRepository());
+ assertTrue(
+ EGitUtils.hasRemote(repo2RemoteName, testRepository2.getUri().toString(), testRepositoryClone.getRepository()));
+ }
}
Modified: trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestRepository.java
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestRepository.java 2012-02-07 16:31:34 UTC (rev 38478)
+++ trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestRepository.java 2012-02-07 19:07:02 UTC (rev 38479)
@@ -282,7 +282,7 @@
* @throws IOException
*/
public void add(File file) throws IOException {
- String repoPath =
+ String repoPath =
getRepoRelativePath(file.getAbsolutePath());
try {
new Git(repository).add().addFilepattern(repoPath).call();
@@ -575,4 +575,8 @@
config.save();
}
+ public URIish getUri() throws MalformedURLException {
+ return new URIish(repository.getDirectory().toURI().toURL());
+ }
+
}
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r38478 - in trunk/maven: tests/org.jboss.tools.maven.configurators.tests/projects/seam and 30 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-07 11:31:34 -0500 (Tue, 07 Feb 2012)
New Revision: 38478
Added:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/.gitignore
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ear/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ear/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/controller/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/controller/MemberRegistration.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/data/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/data/MemberListProducer.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/model/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/model/Member.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/util/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/util/Resources.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/META-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/META-INF/beans.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/META-INF/persistence.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/import.sql
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/java/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/java/org/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/java/org/jboss/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/java/org/jboss/tools/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/java/org/jboss/tools/example/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/java/org/jboss/tools/example/test/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/java/org/jboss/tools/example/test/MemberRegistrationTest.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/resources/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/resources/arquillian.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/src/main/java/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/src/main/webapp/WEB-INF/faces-config.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/pom.xml
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java
Log:
JBIDE-10790 : added test case
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2012-02-07 16:24:53 UTC (rev 38477)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2012-02-07 16:31:34 UTC (rev 38478)
@@ -16,6 +16,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.project.MavenProject;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -460,8 +461,7 @@
private String getSeamVersion(MavenProject mavenProject) {
List<Artifact> artifacts = new ArrayList<Artifact>();
- ArtifactFilter filter = new org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter(
- Artifact.SCOPE_TEST);
+ ArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_TEST);
for (Artifact artifact : mavenProject.getArtifacts()) {
if (filter.include(artifact)) {
artifacts.add(artifact);
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/.gitignore
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/.gitignore (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/.gitignore 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,10 @@
+*~
+.classpath
+.project
+target
+.settings
+.DS_Store
+.faces-config.xml.jsfdia
+MANIFEST.MF
+.idea
+*.iml
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ear/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ear/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ear/pom.xml 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>multi</artifactId>
+ <groupId>org.jboss.tools.example</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>multi-ear</artifactId>
+ <packaging>ear</packaging>
+
+ <name>multi EAR module</name>
+
+ <dependencies>
+
+ <!-- Depend on the ejb module and war so that we can package them -->
+ <dependency>
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>multi-web</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>multi-ejb</artifactId>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>multi</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <!-- Tell Maven we are using Java EE 6 -->
+ <version>6</version>
+ <!-- Use Java EE ear libraries as needed. Java EE ear libraries
+ are in easy way to package any libraries needed in the ear, and automatically
+ have any modules (EJB-JARs and WARs) use them -->
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
+ <modules></modules>
+ </configuration>
+ </plugin>
+ <!-- The JBoss AS plugin deploys your ear to a local JBoss AS container -->
+ <!-- Due to Maven's lack of intelligence with EARs we need to configure
+ the jboss-as maven plugin to skip deployment for all modules. We then enable
+ it specifically in the ear module. -->
+ <plugin>
+ <groupId>org.jboss.as.plugins</groupId>
+ <artifactId>jboss-as-maven-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!-- When built in OpenShift the 'openshift' profile will be used when invoking mvn. -->
+ <!-- Use this profile for any OpenShift specific customization your app will need. -->
+ <!-- By default that is to put the resulting archive into the 'deployments' folder. -->
+ <!-- http://maven.apache.org/guides/mini/guide-building-for-different-environm... -->
+ <id>openshift</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <outputDirectory>deployments</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/pom.xml 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>multi</artifactId>
+ <groupId>org.jboss.tools.example</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>multi-ejb</artifactId>
+ <packaging>ejb</packaging>
+
+ <name>multi EJB module</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>2.2.2.Final</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <!-- Tell Maven we are using EJB 3.1 -->
+ <ejbVersion>3.0</ejbVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <!-- The JBoss Community public repository is a composite repository
+ of several major repositories -->
+ <!-- see http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <repository>
+ <id>jboss-public-repository</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <!-- These optional flags are designed to speed up your builds
+ by reducing remote server calls -->
+ <releases>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+
+</project>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/controller/MemberRegistration.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/controller/MemberRegistration.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/controller/MemberRegistration.java 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,53 @@
+package org.jboss.tools.example.controller;
+
+import java.util.logging.Logger;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Stateful;
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Model;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.persistence.EntityManager;
+
+import org.jboss.tools.example.model.Member;
+
+// The @Stateful annotation eliminates the need for manual transaction demarcation
+@Stateful
+// The @Model stereotype is a convenience mechanism to make this a request-scoped bean that has an
+// EL name
+// Read more about the @Model stereotype in this FAQ:
+// http://sfwk.org/Documentation/WhatIsThePurposeOfTheModelAnnotation
+@Model
+public class MemberRegistration {
+
+ @Inject
+ private Logger log;
+
+ @Inject
+ private EntityManager em;
+
+ @Inject
+ private Event<Member> memberEventSrc;
+
+ private Member newMember;
+
+ @Produces
+ @Named
+ public Member getNewMember() {
+ return newMember;
+ }
+
+ public void register() throws Exception {
+ log.info("Registering " + newMember.getName());
+ em.persist(newMember);
+ memberEventSrc.fire(newMember);
+ initNewMember();
+ }
+
+ @PostConstruct
+ public void initNewMember() {
+ newMember = new Member();
+ }
+}
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/data/MemberListProducer.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/data/MemberListProducer.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/data/MemberListProducer.java 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,48 @@
+package org.jboss.tools.example.data;
+
+import org.jboss.tools.example.model.Member;
+import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.event.Reception;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.persistence.EntityManager;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+
+@RequestScoped
+public class MemberListProducer {
+ @Inject
+ private EntityManager em;
+
+ private List<Member> members;
+
+ // @Named provides access the return value via the EL variable name "members" in the UI (e.g.,
+ // Facelets or JSP view)
+ @Produces
+ @Named
+ public List<Member> getMembers() {
+ return members;
+ }
+
+ public void onMemberListChanged(@Observes(notifyObserver = Reception.IF_EXISTS) final Member member) {
+ retrieveAllMembersOrderedByName();
+ }
+
+ @PostConstruct
+ public void retrieveAllMembersOrderedByName() {
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery<Member> criteria = cb.createQuery(Member.class);
+ Root<Member> member = criteria.from(Member.class);
+ // Swap criteria statements if you would like to try out type-safe criteria queries, a new
+ // feature in JPA 2.0
+ // criteria.select(member).orderBy(cb.asc(member.get(Member_.name)));
+ criteria.select(member).orderBy(cb.asc(member.get("name")));
+ members = em.createQuery(criteria).getResultList();
+ }
+}
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/model/Member.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/model/Member.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/model/Member.java 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,78 @@
+package org.jboss.tools.example.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotEmpty;
+
+@Entity
+@XmlRootElement
+@Table(name = "Registrant", uniqueConstraints = @UniqueConstraint(columnNames = "email"))
+public class Member implements Serializable {
+ /** Default value included to remove warning. Remove or modify at will. **/
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue
+ private Long id;
+
+ @NotNull
+ @Size(min = 1, max = 25)
+ @Pattern(regexp = "[A-Za-z ]*", message = "must contain only letters and spaces")
+ private String name;
+
+ @NotNull
+ @NotEmpty
+ @Email
+ private String email;
+
+ @NotNull
+ @Size(min = 10, max = 12)
+ @Digits(fraction = 0, integer = 12)
+ @Column(name = "phone_number")
+ private String phoneNumber;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getPhoneNumber() {
+ return phoneNumber;
+ }
+
+ public void setPhoneNumber(String phoneNumber) {
+ this.phoneNumber = phoneNumber;
+ }
+}
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/util/Resources.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/util/Resources.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/java/org/jboss/tools/example/util/Resources.java 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,33 @@
+package org.jboss.tools.example.util;
+
+import java.util.logging.Logger;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * This class uses CDI to alias Java EE resources, such as the persistence context, to CDI beans
+ *
+ * <p>
+ * Example injection on a managed bean field:
+ * </p>
+ *
+ * <pre>
+ * @Inject
+ * private EntityManager em;
+ * </pre>
+ */
+public class Resources {
+ // use @SuppressWarnings to tell IDE to ignore warnings about field not being referenced directly
+ @SuppressWarnings("unused")
+ @Produces
+ @PersistenceContext
+ private EntityManager em;
+
+ @Produces
+ public Logger produceLog(InjectionPoint injectionPoint) {
+ return Logger.getLogger(injectionPoint.getMember().getDeclaringClass().getName());
+ }
+}
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/META-INF/beans.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/META-INF/beans.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/META-INF/beans.xml 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,3 @@
+<?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"/>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/META-INF/persistence.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/META-INF/persistence.xml 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.0"
+ xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ <persistence-unit name="primary">
+ <!-- If you are running in a production environment, add a managed
+ data source, the example data source is just for proofs of concept! -->
+ <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
+ <properties>
+ <!-- Properties for Hibernate -->
+ <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+ <property name="hibernate.show_sql" value="false" />
+ </properties>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/import.sql
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/import.sql (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/main/resources/import.sql 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,2 @@
+-- You can use this file to load seed data into the database using SQL statements
+insert into Registrant(id, name, email, phone_number) values (0, 'John Smith', 'john.smith(a)mailinator.com', '2125551212')
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/java/org/jboss/tools/example/test/MemberRegistrationTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/java/org/jboss/tools/example/test/MemberRegistrationTest.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/java/org/jboss/tools/example/test/MemberRegistrationTest.java 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,49 @@
+package org.jboss.tools.example.test;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.jboss.tools.example.controller.MemberRegistration;
+import org.jboss.tools.example.model.Member;
+import org.jboss.tools.example.util.Resources;
+
+(a)RunWith(Arquillian.class)
+public class MemberRegistrationTest {
+ @Deployment
+ public static Archive<?> createTestArchive() {
+ return ShrinkWrap.create(WebArchive.class, "test.war")
+ .addClasses(Member.class, MemberRegistration.class, Resources.class)
+ .addAsResource("META-INF/persistence.xml", "META-INF/persistence.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Inject
+ MemberRegistration memberRegistration;
+
+ @Inject
+ Logger log;
+
+ @Test
+ public void testRegister() throws Exception {
+ Member newMember = memberRegistration.getNewMember();
+ newMember.setName("Jane Doe");
+ newMember.setEmail("jane(a)mailinator.com");
+ newMember.setPhoneNumber("2125551234");
+ memberRegistration.register();
+ assertNotNull(newMember.getId());
+ log.info(newMember.getName() + " was persisted with id " + newMember.getId());
+ }
+
+}
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/resources/arquillian.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/resources/arquillian.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-ejb/src/test/resources/arquillian.xml 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns="http://jboss.org/schema/arquillian"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/schema/arquillian
+ http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+ <!-- Uncomment to have test archives exported to the file system for inspection -->
+<!-- <engine> -->
+<!-- <property name="deploymentExportPath">target/</property> -->
+<!-- </engine> -->
+
+ <!-- Force the use of the Servlet 3.0 protocol with all containers, as it is the most mature -->
+ <defaultProtocol type="Servlet 3.0" />
+
+ <!-- Example configuration for a remote JBoss AS 7 instance -->
+ <container qualifier="jboss" default="true">
+ <!-- If you want to use the JBOSS_HOME environment variable, just delete the jbossHome property -->
+ <configuration>
+ <property name="jbossHome">/path/to/jboss/as</property>
+ </configuration>
+ </container>
+
+</arquillian>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/pom.xml 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>multi</artifactId>
+ <groupId>org.jboss.tools.example</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>multi-web</artifactId>
+ <packaging>war</packaging>
+
+ <name>multi Web module</name>
+
+ <dependencies>
+
+ <!-- Dependency on the EJB module so we can use it's services if needed -->
+ <dependency>
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>multi-ejb</artifactId>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/multi-web/src/main/webapp/WEB-INF/faces-config.xml 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is not required if you don't need any extra configuration. -->
+<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
+
+ <!-- This descriptor activates the JSF 2.0 Servlet -->
+
+ <!-- Write your navigation rules here. You are encouraged to use CDI for
+ creating @Named managed beans. -->
+
+</faces-config>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/multi/pom.xml 2012-02-07 16:31:34 UTC (rev 38478)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>multi</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>multi application</name>
+
+ <modules>
+ <module>multi-ejb</module>
+ <module>multi-web</module>
+ <module>multi-ear</module>
+ </modules>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <!-- Define the version of the EJB jar so that we don't need to repeat
+ ourselves in every module -->
+ <dependency>
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>multi-ejb</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>ejb</type>
+ </dependency>
+
+ <!-- Define the version of the WAR so that we don't need to repeat ourselves
+ in every module -->
+ <dependency>
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>multi-web</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>war</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java 2012-02-07 16:24:53 UTC (rev 38477)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java 2012-02-07 16:31:34 UTC (rev 38478)
@@ -4,14 +4,23 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.m2e.core.project.ResolverConfiguration;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.maven.jsf.configurators.JSFProjectConfigurator;
import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
import org.junit.Test;
@SuppressWarnings("restriction")
public class SeamConfiguratorTest extends AbstractMavenConfiguratorTest {
+ private static final IProjectFacet SEAM_FACET = ProjectFacetsManager.getProjectFacet("jst.seam");
+
@Test
public void testJBIDE9454_webXml_overwrite() throws Exception {
IProject project = importAndCheckSeamProject("seam-webxml");
@@ -47,4 +56,33 @@
assertTrue("Seam nature is missing", ejb.hasNature(ISeamProject.NATURE_ID));
assertTrue("KB nature is missing", ejb.hasNature(IKbProject.NATURE_ID));
}
+
+ @Test
+ public void testJBIDE10790_earConfiguration() throws Exception {
+ IProject[] projects = importProjects("projects/seam/multi",
+ new String[]{ "pom.xml",
+ "multi-ear/pom.xml",
+ "multi-ejb/pom.xml",
+ "multi-web/pom.xml"},
+ new ResolverConfiguration());
+ waitForJobsToComplete();
+
+ IProject pom = projects[0];
+ IProject ear = projects[1];
+ IProject ejb = projects[2];
+ IProject web = projects[3];
+
+ assertNoErrors(pom);
+ assertNoErrors(ejb);
+ assertNoErrors(ear);
+ assertNoErrors(web);
+
+ assertTrue("Seam nature is missing", ejb.hasNature(ISeamProject.NATURE_ID));
+ assertTrue("KB nature is missing", ejb.hasNature(IKbProject.NATURE_ID));
+
+ IFacetedProject fpWeb = ProjectFacetsManager.create(web);
+ assertEquals(SEAM_FACET.getVersion("2.2"), fpWeb.getProjectFacetVersion(SEAM_FACET));
+ IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(web);
+ assertEquals(ISeamFacetDataModelProperties.DEPLOY_AS_EAR, prefs.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, null));
+ }
}
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r38477 - trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-07 11:24:53 -0500 (Tue, 07 Feb 2012)
New Revision: 38477
Modified:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java
Log:
JBIDE-10750 : fixed test cases
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java 2012-02-07 15:59:28 UTC (rev 38476)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java 2012-02-07 16:24:53 UTC (rev 38477)
@@ -32,14 +32,14 @@
assertNoErrors(project);
JpaProjectManager manager = JptJpaCorePlugin.getJpaProjectManager();
JpaProject jpa = manager.getJpaProject(project);
- assertEquals(jpa.getJpaPlatform().getId() + " is not the expected eclipselink platform", jpa.getJpaPlatform().getId().startsWith("eclipselink"));
+ assertTrue(jpa.getJpaPlatform().getId() + " is not the expected eclipselink platform", jpa.getJpaPlatform().getId().startsWith("eclipselink"));
project = importProject( "projects/jpa/simple-1.0/pom.xml");
waitForJobsToComplete();
assertIsJpaProject(project, JpaFacet.VERSION_1_0);
assertNoErrors(project);
jpa = manager.getJpaProject(project);
- assertEquals(jpa.getJpaPlatform().getId() + " is not the expected hibernate platform", jpa.getJpaPlatform().getId().startsWith("hibernate"));
+ assertTrue(jpa.getJpaPlatform().getId() + " is not the expected hibernate platform", jpa.getJpaPlatform().getId().startsWith("hibernate"));
}
protected void assertIsJpaProject(IProject project, IProjectFacetVersion expectedJpaVersion) throws Exception {
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r38476 - in trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext: wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-02-07 10:59:28 -0500 (Tue, 07 Feb 2012)
New Revision: 38476
Added:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ProgressInformationShellIsActiveCondition.java
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java
Log:
Created new waiting condition for wizard
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ProgressInformationShellIsActiveCondition.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ProgressInformationShellIsActiveCondition.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ProgressInformationShellIsActiveCondition.java 2012-02-07 15:59:28 UTC (rev 38476)
@@ -0,0 +1,39 @@
+package org.jboss.tools.ui.bot.ext.condition;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.waits.ICondition;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+
+/**
+ * Checks if the progress information dialog is visible.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class ProgressInformationShellIsActiveCondition implements ICondition {
+
+ private static final String DIALOG_TITLE = "Progress Information";
+
+ private SWTBotShell shell;
+
+ @Override
+ public void init(SWTBot bot) {
+ try {
+ shell = SWTBotFactory.getBot().shell("Progress Information");
+ } catch (WidgetNotFoundException e){
+ // nothing, dialog is not there
+ }
+ }
+
+ @Override
+ public boolean test() throws Exception {
+ return shell != null && shell.isActive();
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return "Expected the " + DIALOG_TITLE + " shell to become non active";
+ }
+}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java 2012-02-07 15:59:06 UTC (rev 38475)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java 2012-02-07 15:59:28 UTC (rev 38476)
@@ -15,16 +15,17 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
+import org.jboss.tools.ui.bot.ext.condition.ProgressInformationShellIsActiveCondition;
import org.jboss.tools.ui.bot.ext.condition.ShellIsActiveCondition;
import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
public class SWTBotWizard extends SWTBotShell {
-
+
public SWTBotWizard() {
this(SWTTestExt.bot.activeShell().widget);
}
-
+
public SWTBotWizard(Shell shell) {
super(shell);
assert getText().contains("New ");
@@ -45,6 +46,13 @@
return this;
}
+ public SWTBotWizard nextWithWait() {
+ SWTBotShell activeShell = getActiveShell();
+ next();
+ bot().waitUntil(new ShellIsActiveCondition(activeShell));
+ return this;
+ }
+
public void cancel() {
clickButton(IDELabel.Button.CANCEL);
}
@@ -52,14 +60,15 @@
public void finish() {
clickButton(IDELabel.Button.FINISH);
}
-
+
public void finishWithWait() {
SWTBotShell activeShell = getActiveShell();
finish();
bot().waitWhile(new ShellIsActiveCondition(activeShell), TaskDuration.LONG.getTimeout());
+ bot().waitWhile(new ProgressInformationShellIsActiveCondition(), TaskDuration.LONG.getTimeout());
bot().waitWhile(new NonSystemJobRunsCondition(), TaskDuration.LONG.getTimeout());
}
-
+
protected void clickButton(String text) {
bot().button(text).click();
bot().sleep(500);
@@ -70,7 +79,7 @@
t.setFocus();
t.setText(text);
}
-
+
private SWTBotShell getActiveShell(){
for (SWTBotShell shell : bot().shells()){
if (shell.isActive()){
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r38475 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-02-07 10:59:06 -0500 (Tue, 07 Feb 2012)
New Revision: 38475
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotImportWizard.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotNewObjectWizard.java
Log:
overriden bot() method
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotImportWizard.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotImportWizard.java 2012-02-07 15:58:30 UTC (rev 38474)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotImportWizard.java 2012-02-07 15:59:06 UTC (rev 38475)
@@ -3,6 +3,7 @@
import java.util.Arrays;
import java.util.List;
+import org.eclipse.swtbot.swt.finder.SWTBot;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
import org.jboss.tools.ui.bot.ext.gen.IImport;
@@ -37,4 +38,9 @@
}
};
}
+
+ @Override
+ public SWTBot bot() {
+ return SWTBotFactory.getBot().activeShell().bot();
+ }
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotNewObjectWizard.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotNewObjectWizard.java 2012-02-07 15:58:30 UTC (rev 38474)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotNewObjectWizard.java 2012-02-07 15:59:06 UTC (rev 38475)
@@ -3,6 +3,7 @@
import java.util.Arrays;
import java.util.List;
+import org.eclipse.swtbot.swt.finder.SWTBot;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
import org.jboss.tools.ui.bot.ext.gen.INewObject;
@@ -36,4 +37,9 @@
}
};
}
+
+ @Override
+ public SWTBot bot() {
+ return SWTBotFactory.getBot().activeShell().bot();
+ }
}
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r38474 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/META-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-02-07 10:58:30 -0500 (Tue, 07 Feb 2012)
New Revision: 38474
Added:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/BasicWidgetsVisitor.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/LogWidgetsVisitor.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/VisitableWidget.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetVisitor.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetsFinder.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetsLogger.java
Removed:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/finder/
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/log4j.xml
Log:
Moved logging functionality from portlet to swtbotext
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2012-02-07 15:49:35 UTC (rev 38473)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2012-02-07 15:58:30 UTC (rev 38474)
@@ -16,6 +16,7 @@
org.jboss.tools.ui.bot.ext.gen,
org.jboss.tools.ui.bot.ext.generator,
org.jboss.tools.ui.bot.ext.helper,
+ org.jboss.tools.ui.bot.ext.logging,
org.jboss.tools.ui.bot.ext.matcher,
org.jboss.tools.ui.bot.ext.parts,
org.jboss.tools.ui.bot.ext.types,
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/log4j.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/log4j.xml 2012-02-07 15:49:35 UTC (rev 38473)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/log4j.xml 2012-02-07 15:58:30 UTC (rev 38474)
@@ -50,6 +50,10 @@
<!-- set to a value higher than debug to turn on. -->
<priority value="DEBUG" />
</category>
+
+ <category name="org.jboss.tools.ui.bot.ext.logging">
+ <priority value="ALL" />
+ </category>
<category name="org.eclipse.swtbot">
<priority value="ALL" />
Copied: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/BasicWidgetsVisitor.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/finder/BasicWidgetsVisitor.java)
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/BasicWidgetsVisitor.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/BasicWidgetsVisitor.java 2012-02-07 15:58:30 UTC (rev 38474)
@@ -0,0 +1,170 @@
+package org.jboss.tools.ui.bot.ext.logging;
+
+import javax.swing.table.TableColumn;
+
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.DateTime;
+import org.eclipse.swt.widgets.ExpandBar;
+import org.eclipse.swt.widgets.ExpandItem;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Scale;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Slider;
+import org.eclipse.swt.widgets.Spinner;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tray;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+
+/**
+ * Distinguishes basic types that are known for SWTBot.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class BasicWidgetsVisitor implements WidgetVisitor {
+
+ @Override
+ public void visit(Widget widget) {
+ if (widget instanceof Button){
+ visitButton((Button) widget);
+ } else if (widget instanceof Browser){
+ visitBrowser((Browser) widget);
+ } else if (widget instanceof CCombo){
+ visitCCombo((CCombo) widget);
+ } else if (widget instanceof CLabel){
+ visitCLabel((CLabel) widget);
+ } else if (widget instanceof Combo){
+ visitCombo((Combo) widget);
+ } else if (widget instanceof CTabItem){
+ visitCTabItem((CTabItem) widget);
+ } else if (widget instanceof DateTime){
+ visitDateTime((DateTime) widget);
+ } else if (widget instanceof ExpandBar){
+ visitExpandBar((ExpandBar) widget);
+ } else if (widget instanceof ExpandItem){
+ visitExpandItem((ExpandItem) widget);
+ } else if (widget instanceof Label){
+ visitLabel((Label) widget);
+ } else if (widget instanceof Link){
+ visitLink((Link) widget);
+ } else if (widget instanceof List){
+ visitList((List) widget);
+ } else if (widget instanceof Menu){
+ visitMenu((Menu) widget);
+ } else if (widget instanceof Scale){
+ visitScale((Scale) widget);
+ } else if (widget instanceof Shell){
+ visitShell((Shell) widget);
+ } else if (widget instanceof Slider){
+ visitSlider((Slider) widget);
+ } else if (widget instanceof Spinner){
+ visitSpinner((Spinner) widget);
+ } else if (widget instanceof StyledText){
+ visitStyledText((StyledText) widget);
+ } else if (widget instanceof TabItem){
+ visitTabItem((TabItem) widget);
+ } else if (widget instanceof Table){
+ visitTable((Table) widget);
+ } else if (widget instanceof TableItem){
+ visitTableItem((TableItem) widget);
+ } else if (widget instanceof Text){
+ visitText((Text) widget);
+ } else if (widget instanceof ToolBar){
+ visitToolBar((ToolBar) widget);
+ } else if (widget instanceof ToolItem){
+ visitToolItem((ToolItem) widget);
+ } else if (widget instanceof Tray){
+ visitTray((Tray) widget);
+ } else if (widget instanceof Tree){
+ visitTree((Tree) widget);
+ } else if (widget instanceof TreeItem){
+ visitTreeItem((TreeItem) widget);
+ } else if (widget instanceof Hyperlink){
+ visitHyperLink((Hyperlink) widget);
+ } else if (widget instanceof Group){
+ visitGroup((Group) widget);
+ } else {
+ visitUnkownItem(widget);
+ }
+ }
+
+ protected abstract void visitButton(Button widget);
+
+ protected abstract void visitBrowser(Browser widget);
+
+ protected abstract void visitCCombo(CCombo widget);
+
+ protected abstract void visitCLabel(CLabel widget);
+
+ protected abstract void visitCombo(Combo widget);
+
+ protected abstract void visitCTabItem(CTabItem widget);
+
+ protected abstract void visitDateTime(DateTime widget);
+
+ protected abstract void visitExpandBar(ExpandBar widget);
+
+ protected abstract void visitExpandItem(ExpandItem widget);
+
+ protected abstract void visitLabel(Label widget);
+
+ protected abstract void visitLink(Link widget);
+
+ protected abstract void visitList(List widget);
+
+ protected abstract void visitMenu(Menu widget);
+
+ protected abstract void visitScale(Scale widget);
+
+ protected abstract void visitShell(Shell widget);
+
+ protected abstract void visitSlider(Slider widget);
+
+ protected abstract void visitSpinner(Spinner widget);
+
+ protected abstract void visitStyledText(StyledText widget);
+
+ protected abstract void visitTabItem(TabItem widget);
+
+ protected abstract void visitTable(Table widget);
+
+ protected abstract void visitTableColumn(TableColumn widget);
+
+ protected abstract void visitTableItem(TableItem widget);
+
+ protected abstract void visitText(Text widget);
+
+ protected abstract void visitToolBar(ToolBar widget);
+
+ protected abstract void visitToolItem(ToolItem widget);
+
+ protected abstract void visitTray(Tray widget);
+
+ protected abstract void visitTree(Tree widget);
+
+ protected abstract void visitTreeItem(TreeItem widget);
+
+ protected abstract void visitHyperLink(Hyperlink widget);
+
+ protected abstract void visitGroup(Group widget);
+
+ protected abstract void visitUnkownItem(Widget widget);
+}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/LogWidgetsVisitor.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/LogWidgetsVisitor.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/LogWidgetsVisitor.java 2012-02-07 15:58:30 UTC (rev 38474)
@@ -0,0 +1,236 @@
+package org.jboss.tools.ui.bot.ext.logging;
+
+import javax.swing.table.TableColumn;
+
+import org.apache.log4j.Logger;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.DateTime;
+import org.eclipse.swt.widgets.ExpandBar;
+import org.eclipse.swt.widgets.ExpandItem;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Scale;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Slider;
+import org.eclipse.swt.widgets.Spinner;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tray;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+
+class LogWidgetsVisitor extends BasicWidgetsVisitor {
+
+ private Logger log = Logger.getLogger(LogWidgetsVisitor.class);
+
+ @Override
+ protected void visitButton(Button widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitBrowser(Browser widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitCCombo(CCombo widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitCLabel(CLabel widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitCombo(Combo widget) {
+ StringBuilder text = new StringBuilder();
+ text.append("Combo {");
+ text.append("selected = '");
+ text.append(widget.getText());
+ text.append("', ");
+ text.append("items = {");
+ for (String item : widget.getItems()){
+ text.append(item + ", ");
+ }
+ text.append("}");
+ text.append("}");
+ log.info(text.toString());
+ }
+
+ @Override
+ protected void visitCTabItem(CTabItem widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitDateTime(DateTime widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitExpandBar(ExpandBar widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitExpandItem(ExpandItem widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitLabel(Label widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitLink(Link widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitList(List widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitMenu(Menu widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitScale(Scale widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitShell(Shell widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitSlider(Slider widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitSpinner(Spinner widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitStyledText(StyledText widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitTabItem(TabItem widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitTable(Table widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitTableColumn(TableColumn widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitTableItem(TableItem widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitText(Text widget) {
+ StringBuilder text = new StringBuilder();
+ text.append("Text {");
+ text.append(widget.getText());
+ text.append("}");
+ log.info(text.toString());
+ }
+
+ @Override
+ protected void visitToolBar(ToolBar widget) {
+ StringBuilder text = new StringBuilder();
+ text.append("Toolbar {");
+ text.append(widget.getRowCount() + " row(s), ");
+ text.append(widget.getItemCount() + " item(s)");
+ text.append("}");
+ log.info(text.toString());
+ }
+
+ @Override
+ protected void visitToolItem(ToolItem widget) {
+ StringBuilder text = new StringBuilder();
+ text.append("Toolitem {");
+ text.append("text = '" + widget.getText() + "', ");
+ text.append("tooltip = '" + widget.getToolTipText() + "'");
+ text.append("}");
+ log.info(text.toString());
+ }
+
+ @Override
+ protected void visitTray(Tray widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitTree(Tree widget) {
+ StringBuilder text = new StringBuilder();
+ text.append("Tree {");
+ text.append(widget.getItemCount() + " item(s), ");
+ text.append(widget.getColumnCount() + " columns(s), ");
+ text.append("items = {");
+ for (SWTBotTreeItem item : new SWTBotTree(widget).getAllItems()){
+ text.append(item.getText() + ", ");
+ }
+ text.append("}");
+ text.append("}");
+ log.info(text.toString());
+ }
+
+ @Override
+ protected void visitTreeItem(TreeItem widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitHyperLink(Hyperlink widget) {
+ StringBuilder text = new StringBuilder();
+ text.append("Hyperlink {");
+ text.append("text = '" + widget.getText() + "'");
+ text.append("}");
+ log.info(text.toString());
+ }
+
+ @Override
+ protected void visitGroup(Group widget) {
+ log.info(widget);
+ }
+
+ @Override
+ protected void visitUnkownItem(Widget widget) {
+ log.info("Unknown: " + widget);
+ }
+}
\ No newline at end of file
Copied: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/VisitableWidget.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/finder/VisitableWidget.java)
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/VisitableWidget.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/VisitableWidget.java 2012-02-07 15:58:30 UTC (rev 38474)
@@ -0,0 +1,23 @@
+package org.jboss.tools.ui.bot.ext.logging;
+
+import org.eclipse.swt.widgets.Widget;
+
+/**
+ * Wraps {@link Widget} so that it can be used
+ * in Visitor pattern.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class VisitableWidget {
+
+ private Widget widget;
+
+ public VisitableWidget(Widget w) {
+ this.widget = w;
+ }
+
+ public void accept(WidgetVisitor visitor){
+ visitor.visit(widget);
+ }
+}
Copied: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetVisitor.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/finder/WidgetVisitor.java)
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetVisitor.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetVisitor.java 2012-02-07 15:58:30 UTC (rev 38474)
@@ -0,0 +1,15 @@
+package org.jboss.tools.ui.bot.ext.logging;
+
+import org.eclipse.swt.widgets.Widget;
+
+/**
+ * Visitor for the {@link Widget} objects.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public interface WidgetVisitor {
+
+ void visit(Widget widget);
+
+}
Copied: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetsFinder.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/finder/WidgetFindingTask.java)
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetsFinder.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetsFinder.java 2012-02-07 15:58:30 UTC (rev 38474)
@@ -0,0 +1,118 @@
+package org.jboss.tools.ui.bot.ext.logging;
+
+import static org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable.syncExec;
+import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.results.VoidResult;
+import org.hamcrest.Matcher;
+
+/**
+ *
+ * Finds all widgets recursively and delegates the concrete action
+ * to be performed on the visitor (see GOF Visitor pattern)
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class WidgetsFinder {
+
+ private Matcher<? extends Widget> matcher;
+
+ private Widget parentWidget;
+
+ private WidgetVisitor visitor;
+
+ private SWTBot bot;
+
+ /**
+ * Finds all widgets for the active shell.
+ */
+ public WidgetsFinder(WidgetVisitor visitor) {
+ this(null, visitor);
+ }
+
+ /**
+ * Finds all widgets meeting specified matcher's condition for the active shell.
+ *
+ * @param matcher
+ */
+ public WidgetsFinder(Matcher<? extends Widget> matcher, WidgetVisitor visitor) {
+ this(null, matcher, visitor);
+ }
+
+ /**
+ * Finds all widgets starting from the specified widget meeting
+ * specified matcher condition.
+ *
+ * @param widget
+ * @param matcher
+ */
+ public WidgetsFinder(Widget widget, Matcher<? extends Widget> matcher, WidgetVisitor visitor) {
+ super();
+ this.matcher = matcher;
+ this.parentWidget = widget;
+ this.visitor = visitor;
+ }
+
+ public void find() {
+ syncExec(new VoidResult() {
+
+ @Override
+ public void run() {
+ findWidgetRecursive(getParentWidget(), new ArrayList<Widget>());
+ }
+ });
+ }
+
+ private void findWidgetRecursive(Widget widget, ArrayList<Widget> visited){
+
+ if (visited.contains(widget)){
+ return;
+ }
+
+ visited.add(widget);
+ visitWidget(widget);
+
+ if (widget instanceof Composite && ((Composite) widget).getChildren().length == 0){
+ return;
+ }
+
+ List<? extends Widget> children = getBot().widgets(getMatcher(), widget);
+ for (Widget child : children){
+ findWidgetRecursive(child, visited);
+ }
+ }
+
+ private void visitWidget(Widget widget){
+ new VisitableWidget(widget).accept(visitor);
+ }
+
+ public Matcher<? extends Widget> getMatcher() {
+ if (matcher == null){
+ matcher = widgetOfType(Widget.class);
+ }
+ return matcher;
+ }
+
+ private Widget getParentWidget() {
+ if (parentWidget == null){
+ // get active shell from generic bot
+ parentWidget = new SWTBot().activeShell().widget;
+ }
+ return parentWidget;
+ }
+
+ private SWTBot getBot(){
+ if (bot == null){
+ // create bot for parent widget
+ bot = new SWTBot(getParentWidget());
+ }
+ return bot;
+ }
+}
Copied: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetsLogger.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/PrintWidgetsTask.java)
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetsLogger.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/WidgetsLogger.java 2012-02-07 15:58:30 UTC (rev 38474)
@@ -0,0 +1,34 @@
+package org.jboss.tools.ui.bot.ext.logging;
+
+import org.apache.log4j.Logger;
+import org.eclipse.swt.widgets.Widget;
+import org.hamcrest.Matcher;
+
+/**
+ * Contains methods for convenient print of widgets.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class WidgetsLogger {
+
+ private static final Logger log = Logger.getLogger(WidgetsLogger.class);
+
+ public static void log() {
+ log(null);
+ }
+
+ public static void log(Matcher<? extends Widget> matcher) {
+ log(matcher, null);
+ }
+
+ public static void log(Matcher<? extends Widget> matcher, Widget parentWidget) {
+ if (log.isInfoEnabled()){
+ log.info("--------------- Start of the list of widgets ---------------");
+ new WidgetsFinder(parentWidget, matcher, new LogWidgetsVisitor()).find();
+ log.info("--------------- End of the list of widgets ---------------");
+ } else {
+ System.out.println("INFO for " + WidgetsLogger.class + " is not enabled");
+ }
+ }
+}
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r38473 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: webservice/eap and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-02-07 10:49:35 -0500 (Tue, 07 Feb 2012)
New Revision: 38473
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/BottomUpWSTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/TopDownWSTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wsclient/WsClientTest.java
Log:
Set correct author of some tests
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/BottomUpWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/BottomUpWSTest.java 2012-02-07 15:47:13 UTC (rev 38472)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/BottomUpWSTest.java 2012-02-07 15:49:35 UTC (rev 38473)
@@ -15,7 +15,7 @@
/**
* Test operates on Web Service Wizard with bottom up process of creating web service
- * @author jjankovi
+ * @author jlukas
*
*/
public class BottomUpWSTest extends WebServiceTestBase {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/TopDownWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/TopDownWSTest.java 2012-02-07 15:47:13 UTC (rev 38472)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/TopDownWSTest.java 2012-02-07 15:49:35 UTC (rev 38473)
@@ -16,7 +16,7 @@
/**
* Test operates on Web Service Wizard with top down process of creating web service
- * @author jjankovi
+ * @author jlukas
*
*/
public class TopDownWSTest extends WebServiceTestBase {
@@ -66,7 +66,7 @@
setLevel(Slider_Level.DEVELOP);
topDownWS();
}
- @Ignore
+
@Test
public void testAssembleService() {
setLevel(Slider_Level.ASSEMBLE);
@@ -90,7 +90,7 @@
setLevel(Slider_Level.TEST);
topDownWS();
}
-
+ @Ignore
@Test
public void testDefaultPkg() {
setLevel(Slider_Level.ASSEMBLE);
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java 2012-02-07 15:47:13 UTC (rev 38472)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java 2012-02-07 15:49:35 UTC (rev 38473)
@@ -34,7 +34,7 @@
/**
* Test operates on creating non-trivial EAP project from Java class
- * @author jjankovi
+ * @author jlukas
*
*/
@SuiteClasses({ WSAllBotTests.class, EAPCompAllTests.class })
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java 2012-02-07 15:47:13 UTC (rev 38472)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java 2012-02-07 15:49:35 UTC (rev 38473)
@@ -43,7 +43,7 @@
/**
* Test operates on creating non-trivial EAP project from wsdl file
- * @author jjankovi
+ * @author jlukas
*
*/
@SuiteClasses({ WSAllBotTests.class, EAPCompAllTests.class })
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wsclient/WsClientTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wsclient/WsClientTest.java 2012-02-07 15:47:13 UTC (rev 38472)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wsclient/WsClientTest.java 2012-02-07 15:49:35 UTC (rev 38473)
@@ -19,7 +19,7 @@
/**
* Test operates on Web Service Client Wizard
- * @author jjankovi
+ * @author jlukas
*
*/
public class WsClientTest extends WSTestBase {
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r38472 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-02-07 10:47:13 -0500 (Tue, 07 Feb 2012)
New Revision: 38472
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java
Log:
Removed assert methods
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java 2012-02-07 15:45:21 UTC (rev 38471)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java 2012-02-07 15:47:13 UTC (rev 38472)
@@ -74,7 +74,6 @@
.selectTemplate("Web", "Dynamic Web Project").next();
new DynamicWebProjectWizard().setProjectName(name).finish();
util.waitForNonIgnoredJobs();
- assertTrue(projectExplorer.existsResource(name));
projectExplorer.selectProject(name);
}
@@ -93,7 +92,6 @@
wiz.checkBox("Generate application.xml deployment descriptor").click();
open.finish(wiz);
bot.sleep(5000);
- assertTrue(projectExplorer.existsResource(name));
projectExplorer.selectProject(name);
}
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r38471 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-02-07 10:45:21 -0500 (Tue, 07 Feb 2012)
New Revision: 38471
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
Log:
Modified addRestEasyLibs to return List of String (libs which were added to classPath of project) + small other changes
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-02-07 15:43:33 UTC (rev 38470)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-02-07 15:45:21 UTC (rev 38471)
@@ -79,7 +79,7 @@
projectHelper.createClass(getWsProjectName(), getWsPackage(), getWsName());
}
}
-
+
protected SWTBotTreeItem[] getRESTValidationErrors(String wsProjectName) {
return ProblemsView.getFilteredErrorsTreeItems(bot,
PATH_PARAM_VALID_ERROR, "/" + wsProjectName, null, null);
@@ -148,16 +148,20 @@
@SuppressWarnings("static-access")
- private void addRestEasyLibs(String wsProjectName) {
+ private List<String> addRestEasyLibs(String wsProjectName) {
List<File> restLibsPaths = getPathForRestLibs();
+ List<String> variables = new ArrayList<String>();
+
BuildPathHelper buildPathHelper = new BuildPathHelper();
for (File f : restLibsPaths) {
- buildPathHelper.addExternalJar(f.getPath(), getWsProjectName(), true);
+ variables.add(buildPathHelper.addExternalJar(f.getPath(), getWsProjectName(), true));
}
+ return variables;
+
}
private List<File> getPathForRestLibs() {
@@ -175,9 +179,8 @@
String restEasyDirPath = eapDirHome + "/" + "resteasy";
File restEasyDir = new File(restEasyDirPath);
+ String[] restEasyLibs = {"jaxrs-api.jar"};
- String[] restEasyLibs = {"jaxrs-api.jar"};
-// String[] restEasyLibs = {"jaxrs-api.jar", "resteasy-jaxrs.jar", "scannotation.jar"};
return resourceHelper.searchAllFiles(restEasyDir, restEasyLibs);
}
@@ -192,8 +195,9 @@
option == ConfigureOption.ADD ? RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_ADD
.getLabel() : RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_REMOVE
.getLabel()).click();
- bot.sleep(Timing.time2S());
- util.waitForNonIgnoredJobs();
+ bot.sleep(Timing.time2S());
+ util.waitForAll();
+
}
private SWTBot openPreferencePage(final String name,
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r38470 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-02-07 10:43:33 -0500 (Tue, 07 Feb 2012)
New Revision: 38470
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
Log:
Modified some atributes to not be final anymore
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-02-07 15:42:22 UTC (rev 38469)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-02-07 15:43:33 UTC (rev 38470)
@@ -52,10 +52,10 @@
protected final String LINE_SEPARATOR = System.getProperty("line.separator");
- protected static final ResourceHelper resourceHelper = new ResourceHelper();
- protected static final ProjectHelper projectHelper = new ProjectHelper();
- protected static final DeploymentHelper deploymentHelper = new DeploymentHelper();
- protected static final WebServiceClientHelper clientHelper = new WebServiceClientHelper();
+ protected static ResourceHelper resourceHelper = new ResourceHelper();
+ protected static ProjectHelper projectHelper = new ProjectHelper();
+ protected static DeploymentHelper deploymentHelper = new DeploymentHelper();
+ protected static WebServiceClientHelper clientHelper = new WebServiceClientHelper();
@Before
public void setup() {
@@ -67,15 +67,15 @@
}
}
- protected boolean projectExists(String name) {
- return projectExplorer.existsResource(name);
- }
-
@After
public void cleanup() {
servers.removeAllProjectsFromServer();
}
+ protected boolean projectExists(String name) {
+ return projectExplorer.existsResource(name);
+ }
+
protected Slider_Level getLevel() {
return level;
}
14 years, 2 months
- 1
- 0