JBoss Tools SVN: r32102 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-14 17:00:31 -0400 (Tue, 14 Jun 2011)
New Revision: 32102
Modified:
trunk/build/publish.sh
Log:
support better suffix options - not just 'trunk' but 'trunk/soa' too
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-06-14 20:57:45 UTC (rev 32101)
+++ trunk/build/publish.sh 2011-06-14 21:00:31 UTC (rev 32102)
@@ -8,6 +8,9 @@
# where to create the stuff to publish
STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}
+# for trunk, use "trunk" or "trunk/soa" instead of generated path from job name
+PUBLISHPATHSUFFIX=""; if [[ $1 ]]; then PUBLISHPATHSUFFIX="$1"; fi
+
# https://jira.jboss.org/browse/JBIDE-6956 "jbosstools-3.2.0.M2" is too verbose, use "3.2.0.M2" instead
JOBNAMEREDUX=${JOB_NAME/.aggregate}; JOBNAMEREDUX=${JOBNAMEREDUX/jbosstools-}
@@ -261,9 +264,10 @@
# if an aggregate build, put output elsewhere on disk
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
- if [[ $1 == "trunk" ]]; then
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/trunk/${BUILD_ID}-H${BUILD_NUMBER}/
- date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/trunk/
+
+ if [[ ${PUBLISHPATHSUFFIX} ]]; then
+ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
+ date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
else
date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
@@ -286,8 +290,8 @@
# extra publish step for aggregate update sites ONLY
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
- if [[ $1 == "trunk" ]]; then
- date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/
+ if [[ ${PUBLISHPATHSUFFIX} ]]; then
+ date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/
else
date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
fi
14 years, 10 months
JBoss Tools SVN: r32101 - trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-14 16:57:45 -0400 (Tue, 14 Jun 2011)
New Revision: 32101
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
Log:
[JBIDE-9137]
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml 2011-06-14 20:49:35 UTC (rev 32100)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml 2011-06-14 20:57:45 UTC (rev 32101)
@@ -18,7 +18,7 @@
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
<includes>
- <include>**/*Test*.class</include>
+ <include>**/*Test.class</include>
</includes>
<excludes>
<exclude>**/*IntegrationTest*.class</exclude>
14 years, 10 months
JBoss Tools SVN: r32099 - in trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests: src/org/jboss/ide/eclipse/as/internal/management/as7/tests and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-14 16:48:14 -0400 (Tue, 14 Jun 2011)
New Revision: 32099
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerTestUtils.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7IntegrationTestSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java
Log:
[JBIDE-9137]
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml 2011-06-14 20:47:22 UTC (rev 32098)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml 2011-06-14 20:48:14 UTC (rev 32099)
@@ -17,8 +17,11 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
+ <includes>
+ <include>**/*Test*.class</include>
+ </includes>
<excludes>
- <exclude>**/IntegrationTestSuite*.class</exclude>
+ <exclude>**/*IntegrationTest*.class</exclude>
</excludes>
</configuration>
</plugin>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7IntegrationTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7IntegrationTestSuite.java 2011-06-14 20:47:22 UTC (rev 32098)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7IntegrationTestSuite.java 2011-06-14 20:48:14 UTC (rev 32099)
@@ -19,7 +19,7 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({
AS7ManagerIntegrationTest.class
- , JBossManagementServiceIntegrationTest.class
+ , JBossManagementServiceTest.class
})
public class AS7IntegrationTestSuite {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2011-06-14 20:47:22 UTC (rev 32098)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2011-06-14 20:48:14 UTC (rev 32099)
@@ -26,6 +26,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7DeploymentState;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerState;
+import org.jboss.ide.eclipse.as.internal.management.as7.tests.utils.AS7ManagerTestUtils;
import org.jboss.ide.eclipse.as.management.as7.deployment.AS7Manager;
import org.junit.After;
import org.junit.Before;
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerTestUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerTestUtils.java 2011-06-14 20:47:22 UTC (rev 32098)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerTestUtils.java 2011-06-14 20:48:14 UTC (rev 32099)
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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.ide.eclipse.as.internal.management.as7.tests;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.ConnectException;
-import java.net.HttpURLConnection;
-import java.net.Socket;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.UnknownHostException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
-import org.jboss.ide.eclipse.as.management.as7.deployment.AS7Manager;
-import org.osgi.framework.Bundle;
-
-/**
- * @author André Dietisheim
- */
-public class AS7ManagerTestUtils {
-
- public static final String GWT_HELLOWORLD_WAR = "gwt-helloworld.war";
- public static final String MINIMALISTIC_WAR = "minimalistic.war";
-
- public static final String HOST = "localhost";
- public static final int WEB_PORT = 8080;
-
- private static final String WAR_FOLDER = "/wars/";
- private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as.management.as7.tests";
-
- private static final int RESPONSE_TIMEOUT = 10 * 1024;
- private static final long WAIT_TIMEOUT = 10 * 1024;
-
- public static File getWarFile(String name) throws URISyntaxException, IOException {
- Bundle bundle = Platform.getBundle(BUNDLE_ID);
- URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
- return new File(FileLocator.resolve(entryUrl).toURI());
- }
-
- public static String waitForRespose(String name, String host, int port) throws IOException {
- waitForResponseCode(200, name, host, port);
- return getResponse(name, host, port);
- }
-
- public static void quietlyUndeploy(File file, AS7Manager manager) {
- quietlyUndeploy(file.getName(), manager);
- }
-
- public static void quietlyUndeploy(String name, AS7Manager manager) {
- try {
- // DetypedDeployer.undeploy(name, AS7ManagerTestUtils.HOST,
- // AS7ManagerTestUtils.MGMT_PORT);
- waitUntilFinished(manager.undeploy(name));
- } catch (Exception e) {
- // ignore
- }
- }
-
- public static void quietlyRemove(String name, AS7Manager manager) {
- try {
- // DetypedDeployer.remove(name, AS7ManagerTestUtils.HOST,
- // AS7ManagerTestUtils.MGMT_PORT);
- waitUntilFinished(manager.remove(name));
- } catch (Exception e) {
- // ignore
- }
- }
-
- public static void waitUntilFinished(IJBoss7DeploymentResult result) throws JBoss7ManangerException {
- result.getStatus(); // wait for operation to finish
- }
-
- public static String getResponse(String name, String host, int port) throws IOException {
- URL url = new URL("http://" + host + ":" + port + "/" + name);
- HttpURLConnection connection = connect(url);
- return toString(new BufferedInputStream(connection.getInputStream()));
- }
-
- public static HttpURLConnection waitForResponseCode(int code, String name, String host, int port)
- throws IOException {
- URL url = new URL("http://" + host + ":" + port + "/" + name);
- long until = System.currentTimeMillis() + WAIT_TIMEOUT;
- while (System.currentTimeMillis() < until) {
- HttpURLConnection connection = connect(url);
- try {
- if (connection.getResponseCode() == code) {
- return connection;
- }
- } catch (FileNotFoundException e) {
- if (code == 404) {
- return connection;
- }
- throw e;
- }
- }
- throw new RuntimeException("wait on url " + url + " for response code " + code + " timed out.");
- }
-
- private static HttpURLConnection connect(URL url) throws IOException {
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setUseCaches(false);
- connection.setDoInput(true);
- connection.setAllowUserInteraction(false);
- connection.setConnectTimeout(RESPONSE_TIMEOUT);
- connection.setInstanceFollowRedirects(true);
- connection.setDoOutput(false);
- return connection;
- }
-
- public static String toString(InputStream in) throws IOException {
- StringWriter writer = new StringWriter();
- for (int data = -1; ((data = in.read()) != -1);) {
- writer.write(data);
- }
- return writer.toString();
- }
-
- public static boolean isListening(String host, int port) throws UnknownHostException, IOException {
- Socket socket = null;
- try {
- socket = new Socket(host, port);
- return socket.isConnected();
- } catch (ConnectException e) {
- return false;
- } finally {
- if (socket != null) {
- socket.close();
- }
- }
- }
-}
\ No newline at end of file
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceIntegrationTest.java 2011-06-14 20:47:22 UTC (rev 32098)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceIntegrationTest.java 2011-06-14 20:48:14 UTC (rev 32099)
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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.ide.eclipse.as.internal.management.as7.tests;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.net.UnknownHostException;
-
-import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.ServiceReference;
-
-/**
- *
- * @author André Dietisheim
- */
-public class JBossManagementServiceIntegrationTest {
-
- private static final String DS_BUNDLEID = "org.eclipse.equinox.ds";
-
- @Before
- public void setUp() throws UnknownHostException {
- }
-
- @After
- public void tearDown() {
- }
-
- @Test
- public void serviceIsReachable() throws BundleException {
- ensureDSIsRunning();
- BundleContext context = Activator.getContext();
- ServiceReference<IJBoss7ManagerService> reference =
- context.getServiceReference(IJBoss7ManagerService.class);
- assertNotNull(reference);
- IJBoss7ManagerService service = context.getService(reference);
- assertNotNull(service);
- }
-
- private void ensureDSIsRunning() throws BundleException {
- BundleContext context = Activator.getContext();
- assertNotNull("bundle of this test is not active", context);
- Bundle bundle = getDSBundle();
- assertNotNull(
- DS_BUNDLEID + " not installed. You have to install the declarative services daemon so that "
- + IJBoss7ManagerService.class + " service is registered"
- , bundle);
- if (bundle.getState() != Bundle.ACTIVE) {
- bundle.start();
- }
- }
-
- private Bundle getDSBundle() {
- Bundle dsBundle = null;
- for (Bundle bundle : Activator.getContext().getBundles()) {
- if (DS_BUNDLEID.equals(bundle.getSymbolicName())) {
- dsBundle = bundle;
- break;
- }
- }
- return dsBundle;
- }
-}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java (from rev 32096, trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceIntegrationTest.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java 2011-06-14 20:48:14 UTC (rev 32099)
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.ide.eclipse.as.internal.management.as7.tests;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.net.UnknownHostException;
+
+import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.ServiceReference;
+
+/**
+ *
+ * @author André Dietisheim
+ */
+public class JBossManagementServiceTest {
+
+ private static final String DS_BUNDLEID = "org.eclipse.equinox.ds";
+
+ @Before
+ public void setUp() throws UnknownHostException {
+ }
+
+ @After
+ public void tearDown() {
+ }
+
+ @Test
+ public void serviceIsReachable() throws BundleException {
+ ensureDSIsRunning();
+ BundleContext context = Activator.getContext();
+ ServiceReference<IJBoss7ManagerService> reference =
+ context.getServiceReference(IJBoss7ManagerService.class);
+ assertNotNull(reference);
+ IJBoss7ManagerService service = context.getService(reference);
+ assertNotNull(service);
+ }
+
+ private void ensureDSIsRunning() throws BundleException {
+ BundleContext context = Activator.getContext();
+ assertNotNull("bundle of this test is not active", context);
+ Bundle bundle = getDSBundle();
+ assertNotNull(
+ DS_BUNDLEID + " not installed. You have to install the declarative services daemon so that "
+ + IJBoss7ManagerService.class + " service is registered"
+ , bundle);
+ if (bundle.getState() != Bundle.ACTIVE) {
+ bundle.start();
+ }
+ }
+
+ private Bundle getDSBundle() {
+ Bundle dsBundle = null;
+ for (Bundle bundle : Activator.getContext().getBundles()) {
+ if (DS_BUNDLEID.equals(bundle.getSymbolicName())) {
+ dsBundle = bundle;
+ break;
+ }
+ }
+ return dsBundle;
+ }
+}
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java (from rev 32096, trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerTestUtils.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java 2011-06-14 20:48:14 UTC (rev 32099)
@@ -0,0 +1,151 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.ide.eclipse.as.internal.management.as7.tests.utils;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.net.ConnectException;
+import java.net.HttpURLConnection;
+import java.net.Socket;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.UnknownHostException;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangerException;
+import org.jboss.ide.eclipse.as.management.as7.deployment.AS7Manager;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author André Dietisheim
+ */
+public class AS7ManagerTestUtils {
+
+ public static final String GWT_HELLOWORLD_WAR = "gwt-helloworld.war";
+ public static final String MINIMALISTIC_WAR = "minimalistic.war";
+
+ public static final String HOST = "localhost";
+ public static final int WEB_PORT = 8080;
+
+ private static final String WAR_FOLDER = "/wars/";
+ private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as.management.as7.tests";
+
+ private static final int RESPONSE_TIMEOUT = 10 * 1024;
+ private static final long WAIT_TIMEOUT = 10 * 1024;
+
+ private AS7ManagerTestUtils() {
+ // inhibit instantiation
+ }
+
+ public static File getWarFile(String name) throws URISyntaxException, IOException {
+ Bundle bundle = Platform.getBundle(BUNDLE_ID);
+ URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
+ return new File(FileLocator.resolve(entryUrl).toURI());
+ }
+
+ public static String waitForRespose(String name, String host, int port) throws IOException {
+ waitForResponseCode(200, name, host, port);
+ return getResponse(name, host, port);
+ }
+
+ public static void quietlyUndeploy(File file, AS7Manager manager) {
+ quietlyUndeploy(file.getName(), manager);
+ }
+
+ public static void quietlyUndeploy(String name, AS7Manager manager) {
+ try {
+ // DetypedDeployer.undeploy(name, AS7ManagerTestUtils.HOST,
+ // AS7ManagerTestUtils.MGMT_PORT);
+ waitUntilFinished(manager.undeploy(name));
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+
+ public static void quietlyRemove(String name, AS7Manager manager) {
+ try {
+ // DetypedDeployer.remove(name, AS7ManagerTestUtils.HOST,
+ // AS7ManagerTestUtils.MGMT_PORT);
+ waitUntilFinished(manager.remove(name));
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+
+ public static void waitUntilFinished(IJBoss7DeploymentResult result) throws JBoss7ManangerException {
+ result.getStatus(); // wait for operation to finish
+ }
+
+ public static String getResponse(String name, String host, int port) throws IOException {
+ URL url = new URL("http://" + host + ":" + port + "/" + name);
+ HttpURLConnection connection = connect(url);
+ return toString(new BufferedInputStream(connection.getInputStream()));
+ }
+
+ public static HttpURLConnection waitForResponseCode(int code, String name, String host, int port)
+ throws IOException {
+ URL url = new URL("http://" + host + ":" + port + "/" + name);
+ long until = System.currentTimeMillis() + WAIT_TIMEOUT;
+ while (System.currentTimeMillis() < until) {
+ HttpURLConnection connection = connect(url);
+ try {
+ if (connection.getResponseCode() == code) {
+ return connection;
+ }
+ } catch (FileNotFoundException e) {
+ if (code == 404) {
+ return connection;
+ }
+ throw e;
+ }
+ }
+ throw new RuntimeException("wait on url " + url + " for response code " + code + " timed out.");
+ }
+
+ private static HttpURLConnection connect(URL url) throws IOException {
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setUseCaches(false);
+ connection.setDoInput(true);
+ connection.setAllowUserInteraction(false);
+ connection.setConnectTimeout(RESPONSE_TIMEOUT);
+ connection.setInstanceFollowRedirects(true);
+ connection.setDoOutput(false);
+ return connection;
+ }
+
+ public static String toString(InputStream in) throws IOException {
+ StringWriter writer = new StringWriter();
+ for (int data = -1; ((data = in.read()) != -1);) {
+ writer.write(data);
+ }
+ return writer.toString();
+ }
+
+ public static boolean isListening(String host, int port) throws UnknownHostException, IOException {
+ Socket socket = null;
+ try {
+ socket = new Socket(host, port);
+ return socket.isConnected();
+ } catch (ConnectException e) {
+ return false;
+ } finally {
+ if (socket != null) {
+ socket.close();
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 10 months
JBoss Tools SVN: r32098 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-14 16:47:22 -0400 (Tue, 14 Jun 2011)
New Revision: 32098
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9088
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java 2011-06-14 20:24:22 UTC (rev 32097)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java 2011-06-14 20:47:22 UTC (rev 32098)
@@ -28,30 +28,31 @@
}
public void testCAforIncludeTaglibInInenerNodes() throws Throwable {
- IFile file = (IFile) TestUtil.getComponentPath("JBIDE/6922/jbide6922.xhtml", //$NON-NLS-1$
- JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
- IEditorInput input = new FileEditorInput(file);
- JSPMultiPageEditor multiPageEditor = openEditor(input);
- IMarker[] problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
- assertEquals("There shouldn't be any problems on page", 0,problemMarkers.length); //$NON-NLS-1$
- StyledText styledText = multiPageEditor.getSourceEditor().getTextViewer()
- .getTextWidget();
- int caretOffcet = TestUtil.getLinePositionOffcet(multiPageEditor.getSourceEditor().getTextViewer(), 4, 5);
- styledText.setCaretOffset(caretOffcet);
- styledText.insert("xmlns:test=\"http://java.sun.com/jsf/composite/test\""); //$NON-NLS-1$
- TestUtil.delay(1200);
- TestUtil.waitForJobs();
- problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
- assertEquals("res folder marker is expected", 1, problemMarkers.length); //$NON-NLS-1$
- String message = (String) problemMarkers[0].getAttribute(IMarker.MESSAGE);
- assertEquals("Error messages should be","JSF 2 Resources folder \"/resources/test\" is missing in a project web directory",message); //$NON-NLS-1$ //$NON-NLS-2$
- caretOffcet = TestUtil.getLinePositionOffcet(multiPageEditor.getSourceEditor().getTextViewer(), 6, 1);
- styledText.setCaretOffset(caretOffcet);
- styledText.insert("<test:testElement />"); //$NON-NLS-1$
- TestUtil.delay(1200);
- TestUtil.waitForJobs();
- problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
- assertEquals("Number of markers should be",2, problemMarkers.length); //$NON-NLS-1$
+ // TODO Fix this test. See JBIDE-9088
+// IFile file = (IFile) TestUtil.getComponentPath("JBIDE/6922/jbide6922.xhtml", //$NON-NLS-1$
+// JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
+// IEditorInput input = new FileEditorInput(file);
+// JSPMultiPageEditor multiPageEditor = openEditor(input);
+// IMarker[] problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+// assertEquals("There shouldn't be any problems on page", 0,problemMarkers.length); //$NON-NLS-1$
+// StyledText styledText = multiPageEditor.getSourceEditor().getTextViewer()
+// .getTextWidget();
+// int caretOffcet = TestUtil.getLinePositionOffcet(multiPageEditor.getSourceEditor().getTextViewer(), 4, 5);
+// styledText.setCaretOffset(caretOffcet);
+// styledText.insert("xmlns:test=\"http://java.sun.com/jsf/composite/test\""); //$NON-NLS-1$
+// TestUtil.delay(1200);
+// TestUtil.waitForJobs();
+// problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+// assertEquals("res folder marker is expected", 1, problemMarkers.length); //$NON-NLS-1$
+// String message = (String) problemMarkers[0].getAttribute(IMarker.MESSAGE);
+// assertEquals("Error messages should be","JSF 2 Resources folder \"/resources/test\" is missing in a project web directory",message); //$NON-NLS-1$ //$NON-NLS-2$
+// caretOffcet = TestUtil.getLinePositionOffcet(multiPageEditor.getSourceEditor().getTextViewer(), 6, 1);
+// styledText.setCaretOffset(caretOffcet);
+// styledText.insert("<test:testElement />"); //$NON-NLS-1$
+// TestUtil.delay(1200);
+// TestUtil.waitForJobs();
+// problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+// assertEquals("Number of markers should be",2, problemMarkers.length); //$NON-NLS-1$
}
}
14 years, 10 months
JBoss Tools SVN: r32097 - trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-14 16:24:22 -0400 (Tue, 14 Jun 2011)
New Revision: 32097
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/build.properties
Log:
[JBIDE-9137] added pom, renamed packages to internal packages
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/build.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/build.properties 2011-06-14 20:22:34 UTC (rev 32096)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/build.properties 2011-06-14 20:24:22 UTC (rev 32097)
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = src/,\
+ wars/
output.. = bin/
bin.includes = META-INF/,\
.,\
14 years, 10 months
JBoss Tools SVN: r32096 - in trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests: META-INF and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-14 16:22:34 -0400 (Tue, 14 Jun 2011)
New Revision: 32096
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7IntegrationTestSuite.java
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerTestUtils.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/Activator.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceIntegrationTest.java
Log:
[JBIDE-9137] added pom, renamed packages to internal packages
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2011-06-14 20:02:47 UTC (rev 32095)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2011-06-14 20:22:34 UTC (rev 32096)
@@ -12,4 +12,4 @@
Bundle-ClassPath: .,
wars/
Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.jboss.ide.eclipse.as.management.as7.tests.Activator
+Bundle-Activator: org.jboss.ide.eclipse.as.internal.management.as7.tests.Activator
Added: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml 2011-06-14 20:22:34 UTC (rev 32096)
@@ -0,0 +1,27 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.as</groupId>
+ <artifactId>tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.as.tests</groupId>
+ <artifactId>org.jboss.ide.eclipse.as.management.as7.tests</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/IntegrationTestSuite*.class</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7IntegrationTestSuite.java (from rev 32095, trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7IntegrationTestSuite.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7IntegrationTestSuite.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7IntegrationTestSuite.java 2011-06-14 20:22:34 UTC (rev 32096)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.ide.eclipse.as.internal.management.as7.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author Andre Dietisheim
+ */
+(a)RunWith(Suite.class)
+(a)Suite.SuiteClasses({
+ AS7ManagerIntegrationTest.class
+ , JBossManagementServiceIntegrationTest.class
+})
+public class AS7IntegrationTestSuite {
+
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerIntegrationTest.java 2011-06-14 18:01:14 UTC (rev 32093)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2011-06-14 20:22:34 UTC (rev 32096)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7.tests;
+package org.jboss.ide.eclipse.as.internal.management.as7.tests;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerTestUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7ManagerTestUtils.java 2011-06-14 18:01:14 UTC (rev 32093)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerTestUtils.java 2011-06-14 20:22:34 UTC (rev 32096)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7.tests;
+package org.jboss.ide.eclipse.as.internal.management.as7.tests;
import java.io.BufferedInputStream;
import java.io.File;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/Activator.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/Activator.java 2011-06-14 18:01:14 UTC (rev 32093)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/Activator.java 2011-06-14 20:22:34 UTC (rev 32096)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7.tests;
+package org.jboss.ide.eclipse.as.internal.management.as7.tests;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/JBossManagementServiceIntegrationTest.java 2011-06-14 18:01:14 UTC (rev 32093)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceIntegrationTest.java 2011-06-14 20:22:34 UTC (rev 32096)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7.tests;
+package org.jboss.ide.eclipse.as.internal.management.as7.tests;
import static org.junit.Assert.assertNotNull;
14 years, 10 months
JBoss Tools SVN: r32095 - trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-14 16:02:47 -0400 (Tue, 14 Jun 2011)
New Revision: 32095
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7IntegrationTestSuite.java
Log:
[JBIDE-9137] added integration tests suite
Added: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7IntegrationTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7IntegrationTestSuite.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7IntegrationTestSuite.java 2011-06-14 20:02:47 UTC (rev 32095)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.ide.eclipse.as.management.as7.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author Andre Dietisheim
+ */
+(a)RunWith(Suite.class)
+(a)Suite.SuiteClasses({
+ AS7ManagerIntegrationTest.class
+ , JBossManagementServiceIntegrationTest.class
+})
+public class AS7IntegrationTestSuite {
+
+}
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/AS7IntegrationTestSuite.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 10 months
JBoss Tools SVN: r32094 - trunk/as/features/org.jboss.ide.eclipse.as.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-14 15:51:18 -0400 (Tue, 14 Jun 2011)
New Revision: 32094
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
Log:
[JBIDE-9137] added org.jboss.ide.eclipse.as.management.as7.tests to tests feature
Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2011-06-14 18:01:14 UTC (rev 32093)
+++ trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2011-06-14 19:51:18 UTC (rev 32094)
@@ -52,4 +52,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.ide.eclipse.as.management.as7.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
14 years, 10 months
JBoss Tools SVN: r32093 - in branches/jbosstools-3.2.x/common: tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-14 14:01:14 -0400 (Tue, 14 Jun 2011)
New Revision: 32093
Modified:
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java
branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9077 Fixed
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java 2011-06-14 16:38:28 UTC (rev 32092)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java 2011-06-14 18:01:14 UTC (rev 32093)
@@ -191,7 +191,7 @@
super.cancelPressed();
}
- private void submit() {
+ protected void submit() {
String email = ReportPreference.E_MAIL_OPTION.getValue();
String other = ReportPreference.OTHER_OPTION.getValue();
String text = "" + getEnvironment() + "\n" + problemText; //$NON-NLS-1$//$NON-NLS-2$
Modified: branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java
===================================================================
--- branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java 2011-06-14 16:38:28 UTC (rev 32092)
+++ branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java 2011-06-14 18:01:14 UTC (rev 32093)
@@ -105,6 +105,11 @@
super(shell, title, exception);
}
+ @Override
+ protected void submit() {
+ // Do nothing
+ }
+
public void buttonPressed(int id) {
// TODO Auto-generated method stub
super.buttonPressed(id);
14 years, 10 months