JBoss Tools SVN: r44280 - in trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core: parametized/server/publishing/defect and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-10-04 03:42:04 -0400 (Thu, 04 Oct 2012)
New Revision: 44280
Modified:
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/ResourceUtils.java
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/publishing/defect/RepublishDefectTest.java
Log:
JBIDE-12786 fix for inconsistant test results
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/ResourceUtils.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/ResourceUtils.java 2012-10-04 07:29:39 UTC (rev 44279)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/ResourceUtils.java 2012-10-04 07:42:04 UTC (rev 44280)
@@ -81,8 +81,8 @@
}
public static void deleteProject(String name) {
- final IProject projectA = findProject("d1");
- Job deleteJob = new Job("delete d1") {
+ final IProject projectA = findProject(name);
+ Job deleteJob = new Job("delete " + name) {
protected IStatus run(IProgressMonitor monitor) {
try {
projectA.delete(true, new NullProgressMonitor());
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/publishing/defect/RepublishDefectTest.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/publishing/defect/RepublishDefectTest.java 2012-10-04 07:29:39 UTC (rev 44279)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/publishing/defect/RepublishDefectTest.java 2012-10-04 07:42:04 UTC (rev 44280)
@@ -56,7 +56,7 @@
OperationTestCase.runAndVerify(dyn1Model);
IDataModel dyn2Model = CreateProjectOperationsUtility.getWebDataModel(ap("d2v"), ap("ear"), null, null, null, JavaEEFacetConstants.WEB_23, true);
OperationTestCase.runAndVerify(dyn2Model);
- addModuleToServer(ServerUtil.getModule(findProject("ear")));
+ addModuleToServer(ServerUtil.getModule(findProject(ap("ear"))));
}
/* Append myCount as a suffix to this original*/
11 years, 7 months
JBoss Tools SVN: r44279 - trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-10-04 03:29:39 -0400 (Thu, 04 Oct 2012)
New Revision: 44279
Modified:
trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallFromCentralTest.java
Log:
Close welcome screen to ensure Central gets enough space to work.
Modified: trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallFromCentralTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallFromCentralTest.java 2012-10-04 07:20:26 UTC (rev 44278)
+++ trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallFromCentralTest.java 2012-10-04 07:29:39 UTC (rev 44279)
@@ -1,12 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2012 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
+/*******************************************************************************
+ * Copyright (c) 2012 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.tests.installation;
@@ -19,27 +19,37 @@
import org.eclipse.swtbot.swt.finder.waits.ICondition;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* This is a bot scenario which performs install through JBoss Central.
- *
+ *
* @author Mickael Istria
*/
@RunWith(SWTBotJunit4ClassRunner.class)
public class InstallFromCentralTest extends SWTBotEclipseTestCase {
-
+
+ @Before
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ if (this.bot.activeView().getTitle().equals("Welcome")) {
+ this.bot.viewByTitle("Welcome").close();
+ }
+ }
+
@Test
public void testInstall() throws Exception {
- bot.menu("Help").menu("JBoss Central").click();
- SWTBotMultiPageEditor centralEditor = (SWTBotMultiPageEditor) bot.multipageEditorByTitle("JBoss Central");
+ this.bot.menu("Help").menu("JBoss Central").click();
+ SWTBotMultiPageEditor centralEditor = (SWTBotMultiPageEditor) this.bot.multipageEditorByTitle("JBoss Central");
centralEditor.show();
centralEditor.activatePage("Software/Update");
try {
int i = 0;
SWTBotCheckBox check = null;
- while ((check = bot.checkBox(i)) != null) {
+ while ((check = this.bot.checkBox(i)) != null) {
if (check.getText() == null || !check.getText().contains("Show Installed")) {
check.click();
}
@@ -56,21 +66,21 @@
public boolean test() throws Exception {
return bot.activeShell().getText().equals("Install") || bot.activeShell().getText().equals("Problem Occured");
}
-
+
@Override
public void init(SWTBot bot) {
}
-
+
@Override
public String getFailureMessage() {
return "Blocking while calculating deps";
}
}, 10 * 60000); // 5 minutes timeout
- if (bot.activeShell().getText().equals("Problem Occured")) {
- String reason = bot.text().getText();
+ if (this.bot.activeShell().getText().equals("Problem Occured")) {
+ String reason = this.bot.text().getText();
Assert.fail("Could not install Central content from " + System.getProperty("org.jboss.tools.central.discovery") + "\n" + reason);
}
- bot.button("Next >").click();
+ this.bot.button("Next >").click();
InstallTest.continueInstall(bot);
}
11 years, 7 months
JBoss Tools SVN: r44278 - in trunk/archives: tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-10-04 03:20:26 -0400 (Thu, 04 Oct 2012)
New Revision: 44278
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBMarshallTest.java
Log:
JBIDE-12495 to trunk
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2012-10-04 03:02:14 UTC (rev 44277)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2012-10-04 07:20:26 UTC (rev 44278)
@@ -112,8 +112,8 @@
private static List nullSafe(List list) {
return list == null ? new ArrayList() : list;
}
- private static boolean isEmpty(String s) {
- return s != null && !"".equals(s); //$NON-NLS-1$
+ private static boolean isEmpty(String s) {
+ return (s == null || s.isEmpty());
}
private static void marshallAddPackages(XMLMemento memento, List packages) throws XbException {
Iterator i = packages.iterator();
Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBMarshallTest.java
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBMarshallTest.java 2012-10-04 03:02:14 UTC (rev 44277)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBMarshallTest.java 2012-10-04 07:20:26 UTC (rev 44278)
@@ -111,7 +111,22 @@
}
}
}
-
+ protected String writeToString(XbPackages packs, boolean shouldPass) {
+ XbException e = null;
+ try {
+ return XMLBinding.serializePackages(packs, new NullProgressMonitor());
+ } catch( XbException xbe ) {
+ e = xbe;
+ } finally {
+ if( e == null && !shouldPass) {
+ fail("Incomplete Model saved when it should not have been.");
+ }
+ if( e != null && shouldPass) {
+ fail("Model failed to save when it should have saved. " + e.getMessage());
+ }
+ }
+ return null;
+ }
protected void writePackage(String name, String toDir, boolean shouldPass) {
XbPackages packs = new XbPackages();
XbPackage pack = new XbPackage();
@@ -121,12 +136,28 @@
write(packs, shouldPass);
}
+ protected String writePackageToString(String name, String toDir, boolean shouldPass) {
+ XbPackages packs = new XbPackages();
+ XbPackage pack = new XbPackage();
+ pack.setName(name);
+ pack.setToDir(toDir);
+ packs.addChild(pack);
+ return writeToString(packs, true);
+ }
+
public void testWritePackageSuccess() {
writePackage("someName", "someFile.jar", true);
}
public void testWritePackageMissingName() {
writePackage(null, "someFile.jar", false);
}
+ public void test12495Defect() {
+ String result = writePackageToString("someName", "outs", true);
+ boolean b = result.contains("todir=\"outs\"");
+ if( !b ) {
+ fail();
+ }
+ }
// Currently the schema is written that this will pass
// public void testWritePackageMissingDir() {
11 years, 7 months
JBoss Tools SVN: r44277 - in trunk: as/tests/org.jboss.ide.eclipse.as.ui.bot.test and 12 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-03 23:02:14 -0400 (Wed, 03 Oct 2012)
New Revision: 44277
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml
trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/pom.xml
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-11687 remove unnecessary chunk of configuration -- now building on 6 platforms in parent pom so don't need to state the same thing in other tests'/plugins' poms
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -77,47 +77,6 @@
</dependencies>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -374,48 +374,7 @@
</dependencies>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
+
</plugins>
</build>
</project>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -71,47 +71,7 @@
</dependencies>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
+
</plugins>
</build>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -82,47 +82,6 @@
</dependencies>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -20,49 +20,6 @@
<build>
<plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
-
</plugins>
</build>
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -122,49 +122,6 @@
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
-
</plugins>
</build>
</project>
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -19,47 +19,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -74,47 +74,6 @@
</dependencies>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -84,47 +84,6 @@
</dependencies>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -140,48 +140,6 @@
</dependencies>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/pom.xml
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -163,47 +163,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -80,47 +80,6 @@
</dependencies>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -25,47 +25,6 @@
<skip>${swtbot.test.skip}</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-10-04 03:01:46 UTC (rev 44276)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-10-04 03:02:14 UTC (rev 44277)
@@ -80,47 +80,6 @@
</dependencies>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
11 years, 7 months
JBoss Tools SVN: r44276 - trunk/build/target-platforms.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-03 23:01:46 -0400 (Wed, 03 Oct 2012)
New Revision: 44276
Modified:
trunk/build/target-platforms/publish.sh
Log:
use commandline flags that match values in the jobs
Modified: trunk/build/target-platforms/publish.sh
===================================================================
--- trunk/build/target-platforms/publish.sh 2012-10-04 01:03:04 UTC (rev 44275)
+++ trunk/build/target-platforms/publish.sh 2012-10-04 03:01:46 UTC (rev 44276)
@@ -23,7 +23,7 @@
'-include') include="$2"; shift 2;;
'-exclude') exclude="$2"; shift 2;;
- '-jbt_4.0.juno.SR1')
+ '-jbosstools-JunoSR1')
# defaults for JBT (trunk)
targetZipFile=e421-wtp341.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR1
@@ -33,7 +33,7 @@
exclude="--exclude '.blobstore'" # exclude the .blobstore
shift 1;;
- '-jbds_4.0.juno.SR1')
+ '-jbdevstudio-JunoSR1')
# defaults for JBDS (trunk)
targetZipFile=jbds600-e421-wtp341.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_4.0.juno.SR1
@@ -43,7 +43,7 @@
exclude=""
shift 1;;
- '-jbt_4.0.juno.SR0b')
+ '-jbosstools-JunoSR0b')
# defaults for JBT (trunk)
targetZipFile=e420-wtp340.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR0b
@@ -53,7 +53,7 @@
exclude="--exclude '.blobstore'" # exclude the .blobstore
shift 1;;
- '-jbds_4.0.juno.SR0b')
+ '-jbdevstudio-JunoSR0b')
# defaults for JBDS (trunk)
targetZipFile=jbds600-e420-wtp340.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_4.0.juno.SR0b
11 years, 7 months
JBoss Tools SVN: r44275 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-10-03 21:03:04 -0400 (Wed, 03 Oct 2012)
New Revision: 44275
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
Log:
https://issues.jboss.org/browse/JBIDE-12778 EL completition doesn't understand Seam EntityHome<E> anymore
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2012-10-03 22:51:56 UTC (rev 44274)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2012-10-04 01:03:04 UTC (rev 44275)
@@ -13,6 +13,7 @@
import java.lang.reflect.Modifier;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -811,37 +812,8 @@
fTypeInfo = new TypeInfo(binType, fMember, fMember.isDataModel());
}
TypeInfo parent = fTypeInfo;
- List<IType> allTypes = new ArrayList<IType>();
- Set<IType> allTypesSet = new HashSet<IType>();
- Set<IType> superinterfaces = new HashSet<IType>();
- while (binType != null && binType.exists()) {
- if(allTypesSet.contains(binType)) break;
- allTypes.add(binType);
- allTypesSet.add(binType);
- initSuperinterfaces(binType, superinterfaces); // JBIDE-10809
- binType = getSuperclass(binType);
- if(binType!=null) {
- TypeInfo superType = new TypeInfo(binType, originalParent, parent.isDataModel());
- parent.setSuperType(superType);
- parent = superType;
- }
- }
+ initSuperTypes(binType, var, parent, originalParent, new TreeSet<String>());
- allTypes.addAll(superinterfaces);
- for (IType type : allTypes) {
- IMethod[] binMethods = type.getMethods();
- for (int i = 0; binMethods != null && i < binMethods.length; i++) {
- if (binMethods[i].isConstructor()) {
- continue;
- }
- MethodInfo info = new MethodInfo(binMethods[i], fTypeInfo, parent, false);
- if(info.getType().isArray() && var) {
- info.setDataModel(true);
- }
- fMethods.add(info);
- }
- }
-
// This inserts here methods "public int size()" and "public boolean isEmpty()" for javax.faces.model.DataModel
// as requested by Gavin in JBIDE-1256
if(isDataModelObject(fType)) {
@@ -856,6 +828,46 @@
}
}
+ private void initSuperTypes(IType binType, boolean var, TypeInfo parent, MemberInfo originalParent, Collection<String> allTypes) throws JavaModelException {
+ IMethod[] binMethods = binType.getMethods();
+ for (int i = 0; binMethods != null && i < binMethods.length; i++) {
+ if (binMethods[i].isConstructor()) {
+ continue;
+ }
+ MethodInfo info = new MethodInfo(binMethods[i], fTypeInfo, parent, false);
+ if(info.getType().isArray() && var) {
+ info.setDataModel(true);
+ }
+ fMethods.add(info);
+ }
+
+ String[] superinterfaceNames = binType.getSuperInterfaceNames();
+ for (String superinterface : superinterfaceNames) {
+ String fullSuperInterfaceName = EclipseJavaUtil.resolveType(binType, superinterface);
+ if(fullSuperInterfaceName!=null) {
+ if(fullSuperInterfaceName.equals(binType.getFullyQualifiedName())) {
+ break;
+ }
+ IType superBinType = binType.getJavaProject().findType(fullSuperInterfaceName);
+ if(superBinType!=null && !allTypes.contains(superBinType.getFullyQualifiedName())) {
+ initType(superBinType, var, parent, originalParent, allTypes);
+ }
+ }
+ }
+
+ IType superBinType = getSuperclass(binType);
+ if(superBinType!=null && !allTypes.contains(superBinType.getFullyQualifiedName())) {
+ initType(superBinType, var, parent, originalParent, allTypes);
+ }
+ }
+
+ private void initType(IType binType, boolean var, TypeInfo parent, MemberInfo originalParent, Collection<String> allTypes) throws JavaModelException {
+ TypeInfo superType = new TypeInfo(binType, originalParent, parent.isDataModel());
+ parent.setSuperType(superType);
+ allTypes.add(binType.getFullyQualifiedName());
+ initSuperTypes(binType, var, superType, originalParent, allTypes);
+ }
+
boolean isDataModelObject(IType type) throws JavaModelException {
return isInstanceofType(type, "javax.faces.model.DataModel"); //$NON-NLS-1$
}
@@ -983,25 +995,6 @@
return null;
}
- public static void initSuperinterfaces(IType type, Set<IType> result) throws JavaModelException {
-// IType superType = getSuperclass(type);
-// if(superType)
- String[] superinterfaceNames = type.getSuperInterfaceNames();
- for (String superinterface : superinterfaceNames) {
- String fullySuperclassName = EclipseJavaUtil.resolveType(type, superinterface);
- if(fullySuperclassName!=null) {
- if(fullySuperclassName.equals(type.getFullyQualifiedName())) {
- break;
- }
- IType superType = type.getJavaProject().findType(fullySuperclassName);
- if(superType != null) {
- result.add(superType);
- initSuperinterfaces(superType, result);
- }
- }
- }
- }
-
public MethodInfo[] findMethodInfos(IMethod iMethod) {
List<MethodInfo> methods = new ArrayList<MethodInfo>();
11 years, 7 months
JBoss Tools SVN: r44274 - trunk/tests/scripts/installation-updates/src/main/groovy.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2012-10-03 18:51:56 -0400 (Wed, 03 Oct 2012)
New Revision: 44274
Modified:
trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy
Log:
Fixed iniFile initialization on Mac OSX and invalid thread access when invoking tests on mac osx.
Modified: trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy
===================================================================
--- trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy 2012-10-03 19:58:50 UTC (rev 44273)
+++ trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy 2012-10-03 22:51:56 UTC (rev 44274)
@@ -35,12 +35,19 @@
String report = "TEST-install-" + new SimpleDateFormat("yyyyMMddh-hmm").format(new Date()) + ".xml";
File output = File.createTempFile("install", ".txt");
output.deleteOnExit();
+
+ String specificVMArgs="";
+ String osName = System.properties['os.name'].toLowerCase();
+ if(osName.contains("mac")){
+ specificVMArgs="-XstartOnFirstThread";
+ }
// Invoke tests
Java proc = new org.apache.tools.ant.taskdefs.Java();
proc.setFork(true);
proc.setDir(eclipseHome);
proc.setOutput(output);
proc.setJvmargs(additionalVMArgs + " " +
+ specificVMArgs + " " +
"-Dorg.eclipse.swtbot.search.timeout=10000 " +
"-Dusage_reporting_enabled=false " +
"-Xms256M -Xmx768M -XX:MaxPermSize=512M");
@@ -114,8 +121,17 @@
proc.init();
int returnCode = proc.executeJava();
-
-File iniFile = eclipseHome.listFiles().find({it.getName().endsWith(".ini")});
+File iniFile;
+String osName = System.properties['os.name'].toLowerCase();
+if(osName.contains("mac")){
+ //Mac OSX
+ iniFile = new File(eclipseHome.getAbsolutePath() + "/Eclipse.app/Contents/MacOS").listFiles().find({it.getName().endsWith(".ini")});
+ if(iniFile == null){
+ iniFile = new File(eclipseHome.getAbsolutePath() + "/JBoss Developer Studio.app/Contents/MacOS").listFiles().find({it.getName().endsWith(".ini")});
+ }
+}else{
+ iniFile = eclipseHome.listFiles().find({it.getName().endsWith(".ini")});
+}
iniLines = iniFile.readLines();
targetIndex = iniLines.findIndexOf {line -> line.startsWith("-product") };
String productName = iniLines[targetIndex + 1];
11 years, 7 months
JBoss Tools SVN: r44273 - trunk/build/target-platforms.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-03 15:58:50 -0400 (Wed, 03 Oct 2012)
New Revision: 44273
Modified:
trunk/build/target-platforms/publish.sh
Log:
add support for SR0b build
Modified: trunk/build/target-platforms/publish.sh
===================================================================
--- trunk/build/target-platforms/publish.sh 2012-10-03 19:23:02 UTC (rev 44272)
+++ trunk/build/target-platforms/publish.sh 2012-10-03 19:58:50 UTC (rev 44273)
@@ -43,6 +43,26 @@
exclude=""
shift 1;;
+ '-jbt_4.0.juno.SR0b')
+ # defaults for JBT (trunk)
+ targetZipFile=e420-wtp340.target
+ repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR0b
+ destinationPath=/home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR0b
+ DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/juno/SR0b
+ include="*"
+ exclude="--exclude '.blobstore'" # exclude the .blobstore
+ shift 1;;
+
+ '-jbds_4.0.juno.SR0b')
+ # defaults for JBDS (trunk)
+ targetZipFile=jbds600-e420-wtp340.target
+ repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_4.0.juno.SR0b
+ destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR0b
+ DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_4.0.juno.SR0b
+ include=".blobstore *" # include the .blobstore
+ exclude=""
+ shift 1;;
+
*)
echo "Unknown parameter " $1
exit 1;;
11 years, 7 months
JBoss Tools SVN: r44272 - trunk/build/target-platforms.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-03 15:23:02 -0400 (Wed, 03 Oct 2012)
New Revision: 44272
Modified:
trunk/build/target-platforms/README.txt
Log:
space error
Modified: trunk/build/target-platforms/README.txt
===================================================================
--- trunk/build/target-platforms/README.txt 2012-10-03 19:22:18 UTC (rev 44271)
+++ trunk/build/target-platforms/README.txt 2012-10-03 19:23:02 UTC (rev 44272)
@@ -24,7 +24,6 @@
To build JBT/JBDS target platforms with Juno SRx (moves forward when there's a new release):
-
mvn install -P jbdevstudio-latest
mvn install -P jbosstools-latest
11 years, 7 months