JBoss Tools SVN: r43146 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-08-22 03:46:15 -0400 (Wed, 22 Aug 2012)
New Revision: 43146
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Delete this node label added into IDELabel
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-08-22 03:43:13 UTC (rev 43145)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-08-22 07:46:15 UTC (rev 43146)
@@ -153,6 +153,7 @@
public static final String IMPORT_JSF_PROJECT = "Import JSF Project";
public static final String IMPORT = "Import";
public static final String DELETE_SERVER = "Delete Server";
+ public static final String DELETE_NODE = "Delete this node?";
public static final String SERVER = "Server";
public static final String NEW_STRUTS_PROJECT = "New Struts Project";
public static final String PREFERENCES = "Preferences";
12 years, 4 months
JBoss Tools SVN: r43145 - in trunk/as/plugins: org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-21 23:43:13 -0400 (Tue, 21 Aug 2012)
New Revision: 43145
Added:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.60
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.70
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.71
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.60
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
Log:
JBIDE-12453 adding default filesets for newer app server versions
Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.60
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.60
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.70
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.70
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.71
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.71
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.60
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.60
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 2012-08-22 03:06:52 UTC (rev 43144)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 2012-08-22 03:43:13 UTC (rev 43145)
@@ -84,12 +84,23 @@
public String getExcludesPattern() {
return excludesPattern == null ? "" : excludesPattern; //$NON-NLS-1$
}
+
+ public String getResolvedExclude() {
+ String pattern = excludesPattern == null ? "" : excludesPattern; //$NON-NLS-1$
+ String resolved = new ConfigNameResolver().performSubstitutions(pattern, runtime == null ? null : runtime.getName(), true);
+ return resolved;
+ }
/**
* @return the includesPattern
*/
public String getIncludesPattern() {
return includesPattern == null ? "" : includesPattern; //$NON-NLS-1$
}
+ public String getResolvedIncludesPattern() {
+ String pattern = includesPattern == null ? "" : includesPattern; //$NON-NLS-1$
+ String resolved = new ConfigNameResolver().performSubstitutions(pattern, runtime == null ? null : runtime.getName(), true);
+ return resolved;
+ }
/**
* @param excludesPattern the excludesPattern to set
@@ -155,8 +166,8 @@
public IPath[] findPaths() {
String dir = getFolder();
- String includes = getIncludesPattern();
- String excludes = getExcludesPattern();
+ String includes = getResolvedIncludesPattern();
+ String excludes = getResolvedExclude();
return findPaths(dir, includes, excludes);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java 2012-08-22 03:06:52 UTC (rev 43144)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java 2012-08-22 03:43:13 UTC (rev 43145)
@@ -228,8 +228,11 @@
}
private void updatePreview() {
- if( preview != null )
- preview.setInput(findPaths(fileset.getFolder(), includes, excludes));
+ if( preview != null ) {
+ String resInc = fileset.getResolvedIncludesPattern();
+ String resExc = fileset.getResolvedExclude();
+ preview.setInput(findPaths(fileset.getFolder(), resInc, resExc));
+ }
}
public String getDir() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-08-22 03:06:52 UTC (rev 43144)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-08-22 03:43:13 UTC (rev 43145)
@@ -89,8 +89,11 @@
// Overrides of as6-and-below's notion of configuration
@Override
public String getConfigLocation() {
- return new Path(getConfigurationFile()).removeLastSegments(1).toFile().getAbsolutePath();
+ IPath config = getRuntime().getLocation().append(IJBossRuntimeResourceConstants.AS7_STANDALONE)
+ .append(IJBossRuntimeResourceConstants.CONFIGURATION);
+ return config.toFile().getAbsolutePath();
}
+
@Override
public String getJBossConfiguration() {
return ""; //$NON-NLS-1$
12 years, 4 months
JBoss Tools SVN: r43144 - in trunk/as: tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-21 23:06:52 -0400 (Tue, 21 Aug 2012)
New Revision: 43144
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/ServerCreationTestUtils.java
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/CreateServerCheckDefaultsTest.java
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ProjectRuntimeClasspathTest.java
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ServerBeanLoader3Test.java
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ServerParameterUtils.java
Log:
JBIDE-12363 more test stuff
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-08-22 00:49:07 UTC (rev 43143)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-08-22 03:06:52 UTC (rev 43144)
@@ -13,6 +13,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.internal.launching.environments.EnvironmentsManager;
import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
@@ -88,7 +89,7 @@
// Overrides of as6-and-below's notion of configuration
@Override
public String getConfigLocation() {
- return ""; //$NON-NLS-1$
+ return new Path(getConfigurationFile()).removeLastSegments(1).toFile().getAbsolutePath();
}
@Override
public String getJBossConfiguration() {
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/ServerCreationTestUtils.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/ServerCreationTestUtils.java 2012-08-22 00:49:07 UTC (rev 43143)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/ServerCreationTestUtils.java 2012-08-22 03:06:52 UTC (rev 43144)
@@ -130,7 +130,7 @@
String loc = TestConstants.getServerHome(serverType);
assertNotNull("Runtime location for server type " + serverType + " not set in test suite", loc);
File locFile = new Path(loc).toFile();
- assertTrue(locFile.exists());
+ assertTrue("Runtime location for server type " + serverType + " (" + locFile.getAbsolutePath() + "), does not exist", locFile.exists());
return createServerWithRuntime(serverType, name, locFile);
}
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/CreateServerCheckDefaultsTest.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/CreateServerCheckDefaultsTest.java 2012-08-22 00:49:07 UTC (rev 43143)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/CreateServerCheckDefaultsTest.java 2012-08-22 03:06:52 UTC (rev 43144)
@@ -89,7 +89,7 @@
ServerExtendedProperties props = ExtendedServerPropertiesAdapterFactory.getServerExtendedProperties(server);
assertNotNull(props);
- assertTrue(props.verifyServerStructure().isOK());
+ assertTrue("Server creation structure fails a verify call for server type " + serverType, props.verifyServerStructure().isOK());
if( props.canVerifyRemoteModuleState())
assertNotNull(props.getModuleStateVerifier());
if( props.hasWelcomePage()) {
@@ -151,7 +151,7 @@
}
assertNotNull("No filesets created", fs);
- assertTrue("0 filesets added for server " + server.getName(), fs.length > 0);
+ assertTrue("0 filesets added for server type " + serverType, fs.length > 0);
}
private IJBossServerRuntime getJBossRuntime(IServer s) {
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ProjectRuntimeClasspathTest.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ProjectRuntimeClasspathTest.java 2012-08-22 00:49:07 UTC (rev 43143)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ProjectRuntimeClasspathTest.java 2012-08-22 03:06:52 UTC (rev 43144)
@@ -66,7 +66,7 @@
@Before
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.ide.eclipse.as.test", null, "basicwebproject", true);
+ provider = new TestProjectProvider("org.jboss.tools.as.test.core", null, "basicwebproject", true);
project = provider.getProject();
project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
server = ServerCreationTestUtils.createServerWithRuntime(serverType, getClass().getName() + serverType);
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ServerBeanLoader3Test.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ServerBeanLoader3Test.java 2012-08-22 00:49:07 UTC (rev 43143)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ServerBeanLoader3Test.java 2012-08-22 03:06:52 UTC (rev 43144)
@@ -98,9 +98,9 @@
ServerBeanLoader loader = new ServerBeanLoader(serverDir);
JBossServerType type = loader.getServerType();
- assertEquals(expectedType, type);
+ assertEquals("Expected and actual server beans do not match for server type " + serverType, expectedType, type);
String fullVersion = loader.getFullServerVersion();
- assertTrue(fullVersion + " does not begin with " + expectedVersion,
+ assertTrue(fullVersion + " does not begin with " + expectedVersion + " for server type " + serverType,
fullVersion.startsWith(expectedVersion));
assertEquals(loader.getServerAdapterId(), serverType);
}
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ServerParameterUtils.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ServerParameterUtils.java 2012-08-22 00:49:07 UTC (rev 43143)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/ServerParameterUtils.java 2012-08-22 03:06:52 UTC (rev 43144)
@@ -1,6 +1,7 @@
package org.jboss.tools.as.test.core.parametized.server;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
@@ -29,14 +30,30 @@
}
return ret;
}
+
+ public static boolean skipPrivateRequirements() {
+ String prop = System.getProperty("org.jboss.tools.tests.skipPrivateRequirements");
+ boolean skipReqs = prop == null || new Boolean(prop).booleanValue();
+ return skipReqs;
+ }
+
public static Object[] getJBossServerTypeParamterers() {
- return IJBossToolingConstants.ALL_JBOSS_SERVERS;
+ boolean skipReqs = skipPrivateRequirements();
+ ArrayList<String> jbservers = new ArrayList<String>();
+ for( int i = 0; i < IJBossToolingConstants.ALL_JBOSS_SERVERS.length; i++ ) {
+ // we're not skipping reqs, or, we are skipping AND it doesn't start with eap, then add
+ if( !skipReqs || !IJBossToolingConstants.ALL_JBOSS_SERVERS[i].startsWith(IJBossToolingConstants.EAP_SERVER_PREFIX)) {
+ jbservers.add(IJBossToolingConstants.ALL_JBOSS_SERVERS[i]);
+ }
+ }
+ return (String[]) jbservers.toArray(new String[jbservers.size()]);
}
+
public static Object[] getAllJBossServerTypeParamterers() {
- Object[] ret = new Object[IJBossToolingConstants.ALL_JBOSS_SERVERS.length + 1];
- ret[0] = IJBossToolingConstants.DEPLOY_ONLY_SERVER;
- System.arraycopy(IJBossToolingConstants.ALL_JBOSS_SERVERS, 0, ret, 1, IJBossToolingConstants.ALL_JBOSS_SERVERS.length);
- return ret;
+ ArrayList<Object> list = new ArrayList<Object>();
+ list.add(IJBossToolingConstants.DEPLOY_ONLY_SERVER);
+ list.addAll(Arrays.asList(getJBossServerTypeParamterers()));
+ return (Object[]) list.toArray(new Object[list.size()]);
}
/*
12 years, 4 months
JBoss Tools SVN: r43143 - in trunk/common: tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-08-21 20:49:07 -0400 (Tue, 21 Aug 2012)
New Revision: 43143
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/RelevanceCheckTest.java
Log:
asserts related to JavaCore were removed
code clean up, excessive null checks were removed
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java 2012-08-22 00:40:41 UTC (rev 43142)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java 2012-08-22 00:49:07 UTC (rev 43143)
@@ -22,30 +22,27 @@
boolean isIType = false;
public DefaultJavaRelevanceCheck(IJavaElement element) {
- if(element == null) return;
test1 = element.getElementName();
- if(element instanceof IMethod) {
- if((test1.startsWith("get") || test1.startsWith("set")) && test1.length() > 3) { //$NON-NLS-1$ //$NON-NLS-2$
+ if (element instanceof IMethod) {
+ if(test1.length() > 3 && (test1.startsWith("get") || test1.startsWith("set"))) { //$NON-NLS-1$ //$NON-NLS-2$
test2 = test1.substring(3, 4).toLowerCase() + test1.substring(4);
test3 = test1.substring(3);
- } else if(test1.startsWith("is") && test1.length() > 2) { //$NON-NLS-1$
+ } else if(test1.length() > 2 && test1.startsWith("is")) { //$NON-NLS-1$
test2 = test1.substring(2, 3).toLowerCase() + test1.substring(3);
test3 = test1.substring(2);
}
- if(test3 != null && test3.equals(test2)) test3 = null;
- }else if(element instanceof IType){
+ if(test3.equals(test2)) {
+ test3 = null;
+ }
+ } else if (element instanceof IType){
isIType = true;
}
}
public boolean isRelevant(String content) {
- if(isIType)
- return true;
-
- if(test1 != null && content.contains(test1)) return true;
- if(test2 != null && content.contains(test2)) return true;
- if(test3 != null && content.contains(test3)) return true;
- return false;
+ return isIType
+ || content.contains(test1)
+ || test2 != null && content.contains(test2)
+ || test3 != null && content.contains(test3);
}
-
}
Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/RelevanceCheckTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/RelevanceCheckTest.java 2012-08-22 00:40:41 UTC (rev 43142)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/RelevanceCheckTest.java 2012-08-22 00:49:07 UTC (rev 43143)
@@ -50,7 +50,6 @@
IType bean = jp.findType("test.Bean");
IField f = bean.getField("myField");
- assertTrue("Field myField is not found", f != null && f.exists());
DefaultJavaRelevanceCheck check = new DefaultJavaRelevanceCheck(f);
assertTrue("'myField' should be relevant", check.isRelevant("myField"));
@@ -58,7 +57,6 @@
assertFalse("'myFiel' should not be relevant", check.isRelevant("myFiel"));
IMethod m = bean.getMethod("getProp1", new String[0]);
- assertTrue("Method getProp1 is not found", m != null && m.exists());
check = new DefaultJavaRelevanceCheck(m);
assertTrue("'prop1' should be relevant", check.isRelevant("prop1"));
@@ -66,7 +64,6 @@
assertFalse("'getProp2' should not be relevant", check.isRelevant("getProp2"));
m = bean.getMethod("isProp2", new String[0]);
- assertTrue("Method isProp2 is not found", m != null && m.exists());
check = new DefaultJavaRelevanceCheck(m);
assertTrue("'prop1' should be relevant", check.isRelevant("prop2"));
@@ -74,7 +71,6 @@
assertFalse("'getProp3' should not be relevant", check.isRelevant("isProp3"));
m = bean.getMethod("setProp3", new String[]{"QString;"});
- assertTrue("Method setProp3 is not found", m != null && m.exists());
check = new DefaultJavaRelevanceCheck(m);
assertTrue("'prop1' should be relevant", check.isRelevant("prop3"));
12 years, 4 months
JBoss Tools SVN: r43142 - trunk/common/tests.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-08-21 20:40:41 -0400 (Tue, 21 Aug 2012)
New Revision: 43142
Modified:
trunk/common/tests/pom.xml
Log:
run test product instead or eclipse.ide
Modified: trunk/common/tests/pom.xml
===================================================================
--- trunk/common/tests/pom.xml 2012-08-22 00:34:36 UTC (rev 43141)
+++ trunk/common/tests/pom.xml 2012-08-22 00:40:41 UTC (rev 43142)
@@ -61,5 +61,17 @@
</modules>
</profile>
</profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <product>org.jboss.tools.tests.product</product>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
12 years, 4 months
JBoss Tools SVN: r43141 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-08-21 20:34:36 -0400 (Tue, 21 Aug 2012)
New Revision: 43141
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaEditorTracker.java
Log:
suppress JavaEditorTraking in case of running tests in core mode
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaEditorTracker.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaEditorTracker.java 2012-08-21 23:20:02 UTC (rev 43140)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaEditorTracker.java 2012-08-22 00:34:36 UTC (rev 43141)
@@ -26,6 +26,7 @@
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.validation.CommonValidationPlugin;
/**
@@ -52,13 +53,15 @@
}
private void init() {
- IWorkbench workbench = CommonValidationPlugin.getDefault().getWorkbench();
- if(workbench != null) {
- IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (IWorkbenchWindow window: windows) {
- windowOpened(window);
+ if(PlatformUI.isWorkbenchRunning()) {
+ IWorkbench workbench = CommonValidationPlugin.getDefault().getWorkbench();
+ if(workbench != null) {
+ IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
+ for (IWorkbenchWindow window: windows) {
+ windowOpened(window);
+ }
+ CommonValidationPlugin.getDefault().getWorkbench().addWindowListener(this);
}
- CommonValidationPlugin.getDefault().getWorkbench().addWindowListener(this);
}
}
12 years, 4 months
JBoss Tools SVN: r43140 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-08-21 19:20:02 -0400 (Tue, 21 Aug 2012)
New Revision: 43140
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/DirtyEditorTracker.java
Log:
added check for PlatforUI.isWorkbenchIsRunning() to avoid problems during core tests
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/DirtyEditorTracker.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/DirtyEditorTracker.java 2012-08-21 23:07:21 UTC (rev 43139)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/DirtyEditorTracker.java 2012-08-21 23:20:02 UTC (rev 43140)
@@ -28,6 +28,7 @@
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.CommonPlugin;
/**
@@ -53,13 +54,15 @@
}
private void init() {
- IWorkbench workbench = CommonPlugin.getDefault().getWorkbench();
- if(workbench != null) {
- IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (IWorkbenchWindow window: windows) {
- windowOpened(window);
+ if( PlatformUI.isWorkbenchRunning() ) {
+ IWorkbench workbench = CommonPlugin.getDefault().getWorkbench();
+ if(workbench != null) {
+ IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
+ for (IWorkbenchWindow window: windows) {
+ windowOpened(window);
+ }
+ CommonPlugin.getDefault().getWorkbench().addWindowListener(this);
}
- CommonPlugin.getDefault().getWorkbench().addWindowListener(this);
}
}
12 years, 4 months