JBoss Tools SVN: r44098 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation: project and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-27 11:51:25 -0400 (Thu, 27 Sep 2012)
New Revision: 44098
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/AbstractProjectImportOperation.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/GeneralProjectImportOperation.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/MavenProjectImportOperation.java
Log:
split wizard package into distinct parts
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/AbstractProjectImportOperation.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/AbstractProjectImportOperation.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/AbstractProjectImportOperation.java 2012-09-27 15:51:25 UTC (rev 44098)
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.project;
+
+import java.io.File;
+
+/**
+ * @author André Dietisheim <adietish(a)redhat.com>
+ */
+public class AbstractProjectImportOperation {
+
+ private File projectFolder;
+
+ public AbstractProjectImportOperation(File projectDirectory) {
+ this.projectFolder = projectDirectory;
+ }
+
+ protected File getProjectDirectory() {
+ return projectFolder;
+ }
+
+ protected boolean isReadable(File destination) {
+ return destination != null
+ && destination.exists()
+ && destination.canRead();
+ }
+}
\ No newline at end of file
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/GeneralProjectImportOperation.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/GeneralProjectImportOperation.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/GeneralProjectImportOperation.java 2012-09-27 15:51:25 UTC (rev 44098)
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.project;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * @author Andre Dietisheim <adietish(a)redhat.com>
+ *
+ */
+public class GeneralProjectImportOperation extends AbstractProjectImportOperation {
+
+ public GeneralProjectImportOperation(File projectDirectory) {
+ super(projectDirectory);
+ }
+
+ public List<IProject> importToWorkspace(IProgressMonitor monitor)
+ throws CoreException, InterruptedException {
+
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IProject project = workspace.getRoot().getProject(getProjectDirectory().getName());
+ overwriteExistingProject(project, workspace, monitor);
+ importToWorkspace(getProjectDirectory(), workspace, monitor);
+ return Collections.singletonList(project);
+ }
+
+ private void importToWorkspace(File projectDirectory, IWorkspace workspace, IProgressMonitor monitor)
+ throws CoreException {
+ String projectName = projectDirectory.getName();
+ IProjectDescription description = workspace.newProjectDescription(projectName);
+ description.setLocation(Path.fromOSString(projectDirectory.getAbsolutePath()));
+ IProject project = workspace.getRoot().getProject(projectName);
+ project.create(description, monitor);
+ project.open(IResource.BACKGROUND_REFRESH, monitor);
+ }
+
+ private void overwriteExistingProject(final IProject project, IWorkspace workspace, IProgressMonitor monitor)
+ throws CoreException {
+ if (project == null
+ || !project.exists()) {
+ return;
+ }
+
+ final boolean[] overwrite = new boolean[1];
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ overwrite[0] = MessageDialog.openQuestion(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ "Overwrite project?",
+ NLS.bind(
+ "A project \"{0}\" already exists in the workspace.\n"
+ + "If you want to import the OpenShift \"{0}\", the project in your workspace will "
+ + "get overwritten and may not be recovered.\n\n"
+ + "Are you sure that you want to overwrite the project \"{0}\" in your workspace?",
+ project.getName()));
+ }
+
+ });
+ if (overwrite[0]) {
+ project.delete(true, true, monitor);
+ }
+ }
+}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/MavenProjectImportOperation.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/MavenProjectImportOperation.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/project/MavenProjectImportOperation.java 2012-09-27 15:51:25 UTC (rev 44098)
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.project;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.m2e.core.embedder.MavenModelManager;
+import org.eclipse.m2e.core.internal.MavenPluginActivator;
+import org.eclipse.m2e.core.project.IMavenProjectImportResult;
+import org.eclipse.m2e.core.project.IProjectConfigurationManager;
+import org.eclipse.m2e.core.project.LocalProjectScanner;
+import org.eclipse.m2e.core.project.MavenProjectInfo;
+import org.eclipse.m2e.core.project.ProjectImportConfiguration;
+
+/**
+ * @author Andre Dietisheim <adietish(a)redhat.com>
+ *
+ */
+public class MavenProjectImportOperation extends AbstractProjectImportOperation {
+
+ private static final String POM_FILE = "pom.xml";
+
+ public MavenProjectImportOperation(File projectFolder) {
+ super(projectFolder);
+ }
+
+ public List<IProject> importToWorkspace(IProgressMonitor monitor)
+ throws CoreException, InterruptedException {
+ MavenPluginActivator mavenPlugin = MavenPluginActivator.getDefault();
+ IProjectConfigurationManager configurationManager = mavenPlugin.getProjectConfigurationManager();
+ MavenModelManager modelManager = mavenPlugin.getMavenModelManager();
+ Set<MavenProjectInfo> projectInfos = getMavenProjects(getProjectDirectory(), modelManager, monitor);
+ ProjectImportConfiguration projectImportConfiguration = new ProjectImportConfiguration();
+ List<IMavenProjectImportResult> importResults =
+ configurationManager.importProjects(projectInfos, projectImportConfiguration, monitor);
+ return toProjects(importResults);
+ }
+
+ private List<IProject> toProjects(List<IMavenProjectImportResult> importResults) {
+ List<IProject> projects = new ArrayList<IProject>();
+ for (IMavenProjectImportResult importResult : importResults) {
+ IProject project = importResult.getProject();
+ if (project != null) {
+ projects.add(importResult.getProject());
+ }
+ }
+ return projects;
+ }
+
+ private Set<MavenProjectInfo> getMavenProjects(File directory, MavenModelManager modelManager,
+ IProgressMonitor monitor) throws InterruptedException {
+ LocalProjectScanner scanner = new LocalProjectScanner(directory.getParentFile(), directory.toString(), false,
+ modelManager);
+ scanner.run(monitor);
+ return collectProjects(scanner.getProjects());
+ }
+
+ public boolean isMavenProject() {
+ if (!isReadable(getProjectDirectory())
+ || !getProjectDirectory().isDirectory()) {
+ return false;
+ }
+
+ return isReadable(new File(getProjectDirectory(), POM_FILE));
+ }
+
+ public Set<MavenProjectInfo> collectProjects(
+ Collection<MavenProjectInfo> projects) {
+ return new LinkedHashSet<MavenProjectInfo>() {
+ private static final long serialVersionUID = 1L;
+
+ public Set<MavenProjectInfo> collectProjects(
+ Collection<MavenProjectInfo> projects) {
+ for (MavenProjectInfo projectInfo : projects) {
+ add(projectInfo);
+ collectProjects(projectInfo.getProjects());
+ }
+ return this;
+ }
+ }.collectProjects(projects);
+ }
+}
11 years, 7 months
JBoss Tools SVN: r44096 - branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-27 11:10:21 -0400 (Thu, 27 Sep 2012)
New Revision: 44096
Modified:
branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
Log:
[JBIDE-12739] making sure widgets are correctly updated after wizard runnable (and job) is finished
Modified: branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-09-27 14:47:43 UTC (rev 44095)
+++ branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-09-27 15:10:21 UTC (rev 44096)
@@ -195,7 +195,7 @@
GridDataFactory.fillDefaults()
.align(SWT.FILL, SWT.CENTER).grab(true, false).indent(10, 0).applyTo(sshLink);
sshLink.addSelectionListener(onSshPrefs("SSH2 Preferences"));
- sshLink.addSelectionListener(onManageSSHKeys("SSH Keys wizard"));
+ sshLink.addSelectionListener(onManageSSHKeys("SSH Keys wizard", dbc));
// we need a binding to have validation setting wizard validation status
Label dummyLabel = new Label(parent, SWT.None);
@@ -222,7 +222,7 @@
}
})
.in(dbc);
- refreshHasRemoteKeys();
+ refreshHasRemoteKeys(dbc);
return cloneGroup;
}
@@ -262,7 +262,7 @@
};
}
- private SelectionAdapter onManageSSHKeys(String text) {
+ private SelectionAdapter onManageSSHKeys(String text, final DataBindingContext dbc) {
return new LinkSelectionAdapter(text) {
@Override
@@ -270,7 +270,7 @@
WizardDialog manageSSHKeysWizard =
new OkButtonWizardDialog(getShell(), new ManageSSHKeysWizard(wizardModel.getUser()));
if (manageSSHKeysWizard.open() == Dialog.OK) {
- refreshHasRemoteKeys();
+ refreshHasRemoteKeys(dbc);
}
}
};
@@ -280,7 +280,7 @@
enableWidgets(pageModel.isNewProject());
repoPathValidator.forceRevalidate();
setSSHLinkText();
- refreshHasRemoteKeys();
+ refreshHasRemoteKeys(dbc);
}
private void setSSHLinkText() {
@@ -295,7 +295,7 @@
sshLink.getParent().layout(true, true);
}
- private void refreshHasRemoteKeys() {
+ private void refreshHasRemoteKeys(DataBindingContext dbc) {
try {
if (!wizardModel.hasUser()) {
return;
@@ -309,7 +309,7 @@
return Status.OK_STATUS;
}
});
- WizardUtils.runInWizard(loadKeysJob, getContainer());
+ WizardUtils.runInWizard(loadKeysJob, getContainer(), dbc);
} catch (Exception e) {
StatusManager.getManager().handle(
OpenShiftUIActivator.createErrorStatus("Could not load ssh keys.", e), StatusManager.LOG);
11 years, 7 months
JBoss Tools SVN: r44095 - trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: psuchy
Date: 2012-09-27 10:47:43 -0400 (Thu, 27 Sep 2012)
New Revision: 44095
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/pom.xml
Log:
edit pom.xml (debugging on jenkins)
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-09-27 14:32:08 UTC (rev 44094)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/pom.xml 2012-09-27 14:47:43 UTC (rev 44095)
@@ -20,6 +20,7 @@
<test.class>org.jboss.tools.runtime.as.ui.bot.test.ProjectTestsSuite</test.class>
<additionalSystemProperties></additionalSystemProperties>
<systemProperties>${additionalSystemProperties}</systemProperties>
+ <surefire.timeout>7200</surefire.timeout>
</properties>
<profiles>
11 years, 7 months
JBoss Tools SVN: r44094 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-27 10:32:08 -0400 (Thu, 27 Sep 2012)
New Revision: 44094
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java
Log:
added DataBindingUtils#observeAndPrintValidationState to ease tracking of validation related bugs
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java 2012-09-27 14:30:25 UTC (rev 44093)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java 2012-09-27 14:32:08 UTC (rev 44094)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport;
import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
@@ -155,4 +156,15 @@
});
}
+ /**
+ * Observe and print validation state changes. Utility method to ease bug
+ * tracking in wizards.
+ *
+ * @param label the label to use when printing validation state changes
+ * @param dbc the databinding context to observe for validation changes
+ * @param wizardPage the wizard page whose databinding context shall get observed
+ */
+ public static void observeAndPrintValidationState(IWizardPage wizardPage, DataBindingContext dbc) {
+ observeAndPrintValidationState(wizardPage.getName(), dbc);
+ }
}
11 years, 7 months
JBoss Tools SVN: r44093 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-27 10:30:25 -0400 (Thu, 27 Sep 2012)
New Revision: 44093
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java
Log:
added DataBindingUtils#observeAndPrintValidationState to ease tracking of validation related bugs
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java 2012-09-27 14:28:58 UTC (rev 44092)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java 2012-09-27 14:30:25 UTC (rev 44093)
@@ -146,11 +146,11 @@
@Override
public void handleValueChange(ValueChangeEvent event) {
- System.err.println("------------------------");
+ System.err.println("========================");
System.err.println(label);
System.err.println("------------------------");
System.err.println(event.diff.getNewValue());
- System.err.println("------------------------");
+ System.err.println("========================");
}
});
}
11 years, 7 months
JBoss Tools SVN: r44092 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-27 10:28:58 -0400 (Thu, 27 Sep 2012)
New Revision: 44092
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java
Log:
added DataBindingUtils#observeAndPrintValidationState to ease tracking of validation related bugs
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java 2012-09-27 12:29:29 UTC (rev 44091)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/databinding/DataBindingUtils.java 2012-09-27 14:28:58 UTC (rev 44092)
@@ -18,6 +18,8 @@
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport;
import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -131,4 +133,26 @@
return binding;
}
+ /**
+ * Observe and print validation state changes. Utility method to ease bug
+ * tracking.
+ *
+ * @param label the label to use when printing validation state changes
+ * @param dbc the databinding context to observe for validation changes
+ */
+ public static void observeAndPrintValidationState(final String label, DataBindingContext dbc) {
+ AggregateValidationStatus status = new AggregateValidationStatus(dbc, AggregateValidationStatus.MAX_SEVERITY);
+ status.addValueChangeListener(new IValueChangeListener() {
+
+ @Override
+ public void handleValueChange(ValueChangeEvent event) {
+ System.err.println("------------------------");
+ System.err.println(label);
+ System.err.println("------------------------");
+ System.err.println(event.diff.getNewValue());
+ System.err.println("------------------------");
+ }
+ });
+ }
+
}
11 years, 7 months
JBoss Tools SVN: r44091 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-27 08:29:29 -0400 (Thu, 27 Sep 2012)
New Revision: 44091
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
Log:
Added downloading of AS 7.0 and AS 6
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-09-27 11:00:29 UTC (rev 44090)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2012-09-27 12:29:29 UTC (rev 44091)
@@ -212,6 +212,30 @@
<artifactId>maven-download-plugin</artifactId>
<executions>
<execution>
+ <id>install-as-6.1.0</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://download.jboss.org/jbossas/6.1/jboss-as-distribution-6.1.0.Final.zip</url>
+ <md5>2264e4d5ba448fa07716008d1452f1e7</md5>
+ <unpack>true</unpack>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-as-7.0.2</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://download.jboss.org/jbossas/7.0/jboss-as-7.0.2.Final/jboss-as-7.0.2...</url>
+ <md5>774556618e73c2273fff91fa5e92c1d5</md5>
+ <unpack>true</unpack>
+ </configuration>
+ </execution>
+ <execution>
<id>install-as-7.1.1</id>
<phase>pre-integration-test</phase>
<goals>
@@ -249,30 +273,6 @@
<artifactId>maven-download-plugin</artifactId>
<executions>
<execution>
- <id>install-as-6.1.0</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>http://download.jboss.org/jbossas/6.1/jboss-as-distribution-6.1.0.Final.zip</url>
- <md5>2264e4d5ba448fa07716008d1452f1e7</md5>
- <unpack>true</unpack>
- </configuration>
- </execution>
- <execution>
- <id>install-as-7.0.2</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>http://download.jboss.org/jbossas/7.0/jboss-as-7.0.2.Final/jboss-as-7.0.2...</url>
- <md5>774556618e73c2273fff91fa5e92c1d5</md5>
- <unpack>true</unpack>
- </configuration>
- </execution>
- <execution>
<id>install-eap-5</id>
<phase>pre-integration-test</phase>
<goals>
11 years, 7 months
JBoss Tools SVN: r44090 - in trunk/vpe/tests/org.jboss.tools.vpe.jsp.test: resources/jspTest/WebContent/pages/components and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-09-27 07:00:29 -0400 (Thu, 27 Sep 2012)
New Revision: 44090
Added:
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp.xml
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp.xml
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp.xml
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp.xml
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp.xml
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp.xml
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentContentTest.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/catalog.tag
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/double.tag
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/attribute.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/declaration.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_page.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_tag.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_taglib.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/element.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/expression.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/forward.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/get_property.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/output.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/plugin.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/root.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/scriptlet.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/set_property.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/useBean.jsp
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9181 - tests for jsp templates were added.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/catalog.tag
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/catalog.tag 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/catalog.tag 2012-09-27 11:00:29 UTC (rev 44090)
@@ -2,10 +2,10 @@
<jsp:directive.taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<jsp:directive.attribute name="bookDB" required="true" type="com.sun.bookstore3.database.BookDB" %>
-<jsp:directive.attribute name="color" required="true" />
+<jsp:directive.attribute name="color" required="true" id="DirectiveAttribute" />
<jsp:directive.attribute name="normalPrice" fragment="true" />
<jsp:directive.attribute name="onSale" fragment="true" />
-<jsp:directive.variable name-given="price" />
+<jsp:directive.variable name-given="price" id="DirectiveVariable"/>
<jsp:directive.variable name-given="salePrice" />
<center>
@@ -24,7 +24,7 @@
<c:set var="price" value="${book.price}" />
<c:choose>
<c:when test="${book.onSale}" >
- <jsp:invoke fragment="onSale" />
+ <jsp:invoke fragment="onSale" id="Invoke"/>
</c:when>
<c:otherwise>
<jsp:invoke fragment="normalPrice" />
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/double.tag
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/double.tag 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/WEB-INF/tags/double.tag 2012-09-27 11:00:29 UTC (rev 44090)
@@ -1,3 +1,3 @@
<%-- double.tag --%>
-<jsp:doBody />
+<jsp:doBody id="DoBody"/>
<jsp:doBody />
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/attribute.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/attribute.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/attribute.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -10,7 +10,7 @@
</head>
<body>
<h1>jsp:attribute test</h1>
- <jsp:attribute name="user">User</jsp:attribute>
+ <jsp:attribute name="user" id="attribute">User</jsp:attribute>
<p>User is : ${param.user}</p>
</body>
</html>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>jsp:body test</title>
</head>
- <jsp:body>
+ <jsp:body id="body">
<h1>jsp:body test</h1>
</jsp:body>
</html>
Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/body.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090)
@@ -0,0 +1,11 @@
+<tests>
+<test id="body">
+<DIV>
+<H1>
+<SPAN CLASS="vpe-text">
+jsp:body test
+</SPAN>
+</H1>
+</DIV>
+</test>
+</tests>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/declaration.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/declaration.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/declaration.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -11,7 +11,7 @@
</head>
<body>
<h1>Declaration test</h1>
- <jsp:declaration>
+ <jsp:declaration id="declaration">
Date date = new Date();
</jsp:declaration>
<jsp:scriptlet>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -10,7 +10,7 @@
</head>
<body>
<h1>jsp:directive.include test with absolute path</h1>
- <jsp:directive.include file="/pages/components/include.jsp"/>
+ <jsp:directive.include file="/pages/components/include.jsp" id="directive_include_absolute"/>
</body>
</html>
</jsp:root>
Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_absolute.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090)
@@ -0,0 +1,6 @@
+<tests>
+<test id="directive_include_absolute">
+<DIV VPE:INCLUDE-ELEMENT="yes">
+</DIV>
+</test>
+</tests>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -10,7 +10,7 @@
</head>
<body>
<h1>jsp:directive.include test with relative path</h1>
- <jsp:directive.include file="./include.jsp"/>
+ <jsp:directive.include file="./include.jsp" id="directive_include_relative"/>
</body>
</html>
</jsp:root>
Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_include_relative.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090)
@@ -0,0 +1,6 @@
+<tests>
+<test id="directive_include_relative">
+<DIV VPE:INCLUDE-ELEMENT="yes">
+</DIV>
+</test>
+</tests>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_page.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_page.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_page.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
- <jsp:directive.page import="java.util.Date" />
+ <jsp:directive.page import="java.util.Date" id="directive_page" />
<jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8" />
<![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]>
<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">]]>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_tag.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_tag.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_tag.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -2,6 +2,7 @@
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8" />
+ <jsp:directive.tag name="msg" display-name="Message" id="directive_tag" />
<![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]>
<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">]]>
<html xmlns="http://www.w3.org/1999/xhtml">
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_taglib.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_taglib.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/directive_taglib.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
- <jsp:directive.taglib uri="http://java.sun.com/jstl/core" prefix="c" />
+ <jsp:directive.taglib uri="http://java.sun.com/jstl/core" prefix="c" id="directive_taglib"/>
<jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8" />
<![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]>
<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">]]>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/element.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/element.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/element.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>jsp:element test</title>
</head>
- <jsp:element name="body">
+ <jsp:element name="body" id="element">
<jsp:body>
<h1>jsp:element test</h1>
</jsp:body>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/expression.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/expression.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/expression.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -11,7 +11,7 @@
</head>
<body>
<h1>Expression test</h1>
- <jsp:expression>
+ <jsp:expression id="expression">
new Date()
</jsp:expression>
</body>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/forward.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/forward.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/forward.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -10,7 +10,7 @@
</head>
<jsp:body>
<h1>jsp:forward test</h1>
- <jsp:forward page="forward1.jsp">
+ <jsp:forward page="forward1.jsp" id="forward">
<jsp:param name="username" value="User" />
</jsp:forward>
</jsp:body>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/get_property.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/get_property.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/get_property.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -12,7 +12,7 @@
<h1>jsp:getProperty test</h1>
<jsp:useBean id="calendar" scope="page" class="org.jboss.jsp.test.Calendar" />
<h2>Calendar for <jsp:getProperty name="calendar"
- property="username" /></h2>
+ property="username" id="get_property" /></h2>
</body>
</html>
</jsp:root>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -10,7 +10,7 @@
</head>
<body>
<h1>jsp:include test with absolute path</h1>
- <jsp:include page="/pages/components/include.jsp"/>
+ <jsp:include page="/pages/components/include.jsp" id="include_absolute"/>
</body>
</html>
</jsp:root>
Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_absolute.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090)
@@ -0,0 +1,6 @@
+<tests>
+<test id="include_absolute">
+<DIV VPE:INCLUDE-ELEMENT="yes">
+</DIV>
+</test>
+</tests>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -10,7 +10,7 @@
</head>
<body>
<h1>jsp:include test with relative path</h1>
- <jsp:include page="./include.jsp"/>
+ <jsp:include page="./include.jsp" id="include_relative"/>
</body>
</html>
</jsp:root>
Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/include_relative.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090)
@@ -0,0 +1,6 @@
+<tests>
+<test id="include_relative">
+<DIV VPE:INCLUDE-ELEMENT="yes">
+</DIV>
+</test>
+</tests>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/output.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/output.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/output.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -10,7 +10,7 @@
</head>
<body>
<h1>jsp:output test</h1>
- <jsp:output doctype-root-element="html"
+ <jsp:output doctype-root-element="html" id="output"
doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" />
</body>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/plugin.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/plugin.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/plugin.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -12,7 +12,7 @@
<h1>jsp:plugin test</h1>
<jsp:plugin type="applet" code="JavaClock.class"
codebase="/resources/applets" width="160"
- height="150">
+ height="150" id="plugin">
<jsp:fallback>
Plugin tag not supported.
</jsp:fallback>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/root.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/root.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/root.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" id="root">
<jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8" />
<![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]>
<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">]]>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/scriptlet.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/scriptlet.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/scriptlet.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -11,7 +11,7 @@
</head>
<body>
<h1>Scriptlet Test</h1>
- <jsp:scriptlet>
+ <jsp:scriptlet id="scriptlet">
out.print(new Date());
</jsp:scriptlet>
</body>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/set_property.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/set_property.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/set_property.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -11,7 +11,7 @@
<body>
<h1>jsp:setProperty test</h1>
<jsp:useBean id="calendar" scope="page" class="org.jboss.jsp.test.Calendar" />
- <jsp:setProperty name="calendar" property="username" value="User" />
+ <jsp:setProperty name="calendar" property="username" value="User" id="set_property"/>
<h2>Calendar for <jsp:getProperty name="calendar"
property="username" /></h2>
</body>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -10,7 +10,7 @@
</head>
<body>
<h1>text test</h1>
- <jsp:text>
+ <jsp:text id="text">
Any Text
</jsp:text>
</body>
Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/text.jsp.xml 2012-09-27 11:00:29 UTC (rev 44090)
@@ -0,0 +1,9 @@
+<tests>
+<test id="text">
+<SPAN CLASS="vpe-text">
+<SPAN CLASS="vpe-text">
+Any Text
+</SPAN>
+</SPAN>
+</test>
+</tests>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/useBean.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/useBean.jsp 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/jspTest/WebContent/pages/components/useBean.jsp 2012-09-27 11:00:29 UTC (rev 44090)
@@ -10,9 +10,9 @@
</head>
<body>
<h1>jsp:setProperty test</h1>
- <jsp:useBean id="calendar" scope="page" class="org.jboss.jsp.test.Calendar" />
- <jsp:setProperty name="calendar" property="username" value="User" />
- <h2>Calendar for <jsp:getProperty name="calendar"
+ <jsp:useBean scope="page" class="org.jboss.jsp.test.Calendar" id="useBean"/>
+ <jsp:setProperty name="useBean" property="username" value="User" />
+ <h2>Calendar for <jsp:getProperty name="useBean"
property="username" /></h2>
</body>
</html>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2012-09-27 11:00:29 UTC (rev 44090)
@@ -16,12 +16,17 @@
import junit.framework.TestSuite;
public class JSPAllTests {
+
+ // import project name
+ public static final String IMPORT_PROJECT_NAME = "jspTest"; //$NON-NLS-1$
+
public static Test suite() {
TestSuite suite = new TestSuite("Tests for Vpe JSP components"); //$NON-NLS-1$
// $JUnit-BEGIN$
suite.addTestSuite(JSPComponentTest.class);
suite.addTestSuite(JSPTemplatePluginTest.class);
+ suite.addTestSuite(JSPComponentContentTest.class);
// $JUnit-END$
return new VpeTestSetup(suite);
}
Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentContentTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentContentTest.java 2012-09-27 11:00:29 UTC (rev 44090)
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * 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.vpe.jsp.test;
+
+import org.jboss.tools.vpe.base.test.ComponentContentTest;
+
+public class JSPComponentContentTest extends ComponentContentTest {
+
+ public JSPComponentContentTest(String name) {
+ super(name);
+ setCheckWarning(false);
+ }
+
+ public void testDeclaration() throws Throwable {
+ performInvisibleTagTest("components/declaration.jsp", "declaration"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testExpression() throws Throwable {
+ performInvisibleTagTest("components/expression.jsp", "expression"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testScriptlet() throws Throwable {
+ performInvisibleTagTest("components/scriptlet.jsp", "scriptlet"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testDirectiveAttribute() throws Throwable {
+ performInvisibleTagTestByFullPath("WebContent/WEB-INF/tags/catalog.tag", "DirectiveAttribute"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testDirectiveInclude() throws Throwable {
+ performContentTest("components/directive_include_absolute.jsp"); //$NON-NLS-1$
+ performContentTest("components/directive_include_relative.jsp"); //$NON-NLS-1$
+ }
+
+ public void testInclude() throws Throwable {
+ performContentTest("components/include_absolute.jsp"); //$NON-NLS-1$
+ performContentTest("components/include_relative.jsp"); //$NON-NLS-1$
+ }
+
+ public void testDirectivePage() throws Throwable {
+ performInvisibleTagTest("components/directive_page.jsp", "directive_page"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testDirectiveTag() throws Throwable {
+ performInvisibleTagTest("components/directive_tag.jsp", "directive_tag"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testDirectiveTaglib() throws Throwable {
+ performInvisibleTagTest("components/directive_taglib.jsp", "directive_taglib"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testDirectiveVariable() throws Throwable {
+ performInvisibleTagTestByFullPath("WebContent/WEB-INF/tags/catalog.tag", "DirectiveVariable"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testAttribute() throws Throwable {
+ performInvisibleTagTest("components/attribute.jsp", "attribute"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testBody() throws Throwable {
+ performContentTest("components/body.jsp"); //$NON-NLS-1$
+ }
+
+ public void testElement() throws Throwable {
+ performInvisibleTagTest("components/element.jsp", "element"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testDoBody() throws Throwable {
+ performInvisibleTagTestByFullPath("WebContent/WEB-INF/tags/double.tag", "DoBody"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testForward() throws Throwable {
+ performInvisibleTagTest("components/forward.jsp", "forward"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testGetProperty() throws Throwable {
+ performInvisibleTagTest("components/get_property.jsp", "get_property"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testInvoke() throws Throwable {
+ performInvisibleTagTestByFullPath("WebContent/WEB-INF/tags/catalog.tag", "Invoke"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testOutput() throws Throwable {
+ performInvisibleTagTest("components/output.jsp", "output"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testPlugin() throws Throwable {
+ performInvisibleTagTest("components/plugin.jsp", "plugin"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testRoot() throws Throwable {
+ performInvisibleTagTest("components/root.jsp", "root"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testSetProperty() throws Throwable {
+ performInvisibleTagTest("components/set_property.jsp", "set_property"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testText() throws Throwable {
+ performContentTest("components/text.jsp"); //$NON-NLS-1$
+ }
+
+ public void testUseBean() throws Throwable {
+ performInvisibleTagTest("components/useBean.jsp", "useBean"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ @Override
+ protected String getTestProjectName() {
+ return JSPAllTests.IMPORT_PROJECT_NAME;
+ }
+
+}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java 2012-09-27 10:46:01 UTC (rev 44089)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java 2012-09-27 11:00:29 UTC (rev 44090)
@@ -23,9 +23,6 @@
*/
public class JSPComponentTest extends VpeTest {
- // import project name
- public static final String IMPORT_PROJECT_NAME = "jspTest"; //$NON-NLS-1$
-
public JSPComponentTest(String name) {
super(name);
setCheckWarning(false);
@@ -38,7 +35,7 @@
*/
public void testDeclaration() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/declaration.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/declaration.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
/**
@@ -48,7 +45,7 @@
*/
public void testExpression() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/expression.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/expression.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
/**
@@ -58,7 +55,7 @@
*/
public void testScriptlet() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/scriptlet.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/scriptlet.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
/**
@@ -68,7 +65,7 @@
*/
public void testDirectiveAttribute() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "../WEB-INF/tags/catalog.tag", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
/**
@@ -78,10 +75,10 @@
*/
public void testDirectiveInclude() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/directive_include_absolute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/directive_include_absolute.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/directive_include_relative.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/directive_include_relative.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -92,10 +89,10 @@
*/
public void testInclude() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/include_absolute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/include_absolute.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/include_relative.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/include_relative.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -106,7 +103,7 @@
*/
public void testDirectivePage() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/directive_page.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/directive_page.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -117,7 +114,7 @@
*/
public void testDirectiveTag() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/directive_tag.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/directive_tag.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -128,7 +125,7 @@
*/
public void testDirectiveTaglib() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/directive_taglib.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/directive_taglib.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -139,7 +136,7 @@
*/
public void testDirectiveVariable() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "../WEB-INF/tags/catalog.tag", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -150,7 +147,7 @@
*/
public void testAttribute() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/attribute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/attribute.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -161,7 +158,7 @@
*/
public void testBody() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/body.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/body.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -172,7 +169,7 @@
*/
public void testElement() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/element.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/element.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -183,7 +180,7 @@
*/
public void testDoBody() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "../WEB-INF/tags/double.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "../WEB-INF/tags/double.tag", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -194,7 +191,7 @@
*/
public void testForward() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/forward.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/forward.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -205,7 +202,7 @@
*/
public void testGetProperty() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/get_property.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/get_property.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -216,7 +213,7 @@
*/
public void testInvoke() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "../WEB-INF/tags/catalog.tag", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -227,7 +224,7 @@
*/
public void testOutput() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/output.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/output.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -238,7 +235,7 @@
*/
public void testPlugin() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/plugin.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/plugin.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -249,7 +246,7 @@
*/
public void testRoot() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/root.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/root.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -260,7 +257,7 @@
*/
public void testSetProperty() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/set_property.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/set_property.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -271,7 +268,7 @@
*/
public void testText() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/text.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/text.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
@@ -282,7 +279,7 @@
*/
public void testUseBean() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/useBean.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/useBean.jsp", JSPAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
11 years, 7 months
JBoss Tools SVN: r44089 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-27 06:46:01 -0400 (Thu, 27 Sep 2012)
New Revision: 44089
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
Log:
Added downloading of AS 7.0 and AS 6
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-09-27 10:42:57 UTC (rev 44088)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2012-09-27 10:46:01 UTC (rev 44089)
@@ -249,6 +249,30 @@
<artifactId>maven-download-plugin</artifactId>
<executions>
<execution>
+ <id>install-as-6.1.0</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://download.jboss.org/jbossas/6.1/jboss-as-distribution-6.1.0.Final.zip</url>
+ <md5>2264e4d5ba448fa07716008d1452f1e7</md5>
+ <unpack>true</unpack>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-as-7.0.2</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://download.jboss.org/jbossas/7.0/jboss-as-7.0.2.Final/jboss-as-7.0.2...</url>
+ <md5>774556618e73c2273fff91fa5e92c1d5</md5>
+ <unpack>true</unpack>
+ </configuration>
+ </execution>
+ <execution>
<id>install-eap-5</id>
<phase>pre-integration-test</phase>
<goals>
11 years, 7 months
JBoss Tools SVN: r44088 - trunk/tests/scripts/installation-updates.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-09-27 06:42:57 -0400 (Thu, 27 Sep 2012)
New Revision: 44088
Removed:
trunk/tests/scripts/installation-updates/assembly.xml
trunk/tests/scripts/installation-updates/testInstall.sh
Log:
JBIDE-12717: Remove useless files
Deleted: trunk/tests/scripts/installation-updates/assembly.xml
===================================================================
--- trunk/tests/scripts/installation-updates/assembly.xml 2012-09-27 10:38:53 UTC (rev 44087)
+++ trunk/tests/scripts/installation-updates/assembly.xml 2012-09-27 10:42:57 UTC (rev 44088)
@@ -1,32 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>delivery</id>
- <formats>
- <format>zip</format>
- <format>dir</format>
- </formats>
- <baseDirectory>/</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*.sh</include>
- </includes>
- <fileMode>777</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/scenarios</directory>
- <outputDirectory>scenarios</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>777</fileMode>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/repository</outputDirectory>
- <unpack>true</unpack>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
Deleted: trunk/tests/scripts/installation-updates/testInstall.sh
===================================================================
--- trunk/tests/scripts/installation-updates/testInstall.sh 2012-09-27 10:38:53 UTC (rev 44087)
+++ trunk/tests/scripts/installation-updates/testInstall.sh 2012-09-27 10:42:57 UTC (rev 44088)
@@ -1,151 +0,0 @@
-#!/bin/bash
-
-usage() {
- echo "Script to test installation"
- echo "usage: $0 <eclipse_home> <file_containing_list_of_sites|repository_url|CHECK_FOR_UPDATES>*"
- echo " <eclipse_home>: an eclipse installation will be performed on"
- echo " <file_containing_list_of_sites> a file containing a list of p2-friendly URLs of repositories"
- echo " separated by spaces or line breaks"
- echo " <repository_url>: URL of a p2 repo to install from"
- echo " CHECK_FOR_UPDATES: will trigger the check for updates"
-}
-
-
-# Takes a repo or a directory.xml URL single parameter
-install_url() {
- repoName="$1"
- echo "$repoName" | grep ".xml$"
- if [ "$?" -eq 0 ]; then
- #Found .xml suffix
- install_central "$1"
- else
- echo "$repoName" | grep CHECK_FOR_UPDATES
- if [ "$?" -eq 0 ]; then
- check_for_updates
- else
- install_repo "$1"
- fi
- fi
-}
-
-
-# Takes repo URL as single parameter
-install_repo() {
- echo "Installing content from " $1
- report=TEST-install-$(date +%Y%m%d%H%M).xml
- #Invoke tests
- output=$(java \
- -DUPDATE_SITE=$1 \
- -Dorg.eclipse.swtbot.search.timeout=10000 \
- -Dusage_reporting_enabled=false \
- -Xms256M -Xmx768M -XX:MaxPermSize=512M \
- -jar plugins/org.eclipse.equinox.launcher_*.jar \
- -application org.eclipse.swtbot.eclipse.junit4.headless.swtbottestapplication \
- -testApplication org.eclipse.ui.ide.workbench \
- -product $productName \
- -data workspace/ \
- formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,$report \
- formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter \
- -testPluginName org.jboss.tools.tests.installation \
- -className org.jboss.tools.tests.installation.InstallTest \
- -consoleLog -debug)
- if [[ ! "$output" == *"Failures: 0, Errors: 0"* ]]; then
- echo "Error while installing from " $site ". Read $report for details and see screenshots/"
- popd
- exit 1
- fi
-}
-
-# Takes a Central directory.xml URL single parameter
-install_central() {
- echo "Installing Central from " $1
- report=TEST-install-$(date +%Y%m%d%H%M).xml
- #Invoke tests
- output=$(java \
- -Djboss.discovery.directory.url=$1 \
- -Dorg.eclipse.swtbot.search.timeout=10000 \
- -Dusage_reporting_enabled=false \
- -Xms256M -Xmx768M -XX:MaxPermSize=512M \
- -jar plugins/org.eclipse.equinox.launcher_*.jar \
- -application org.eclipse.swtbot.eclipse.junit4.headless.swtbottestapplication \
- -testApplication org.eclipse.ui.ide.workbench \
- -product $productName \
- -data workspace/ \
- formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,$report \
- formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter \
- -testPluginName org.jboss.tools.tests.installation \
- -className org.jboss.tools.tests.installation.InstallFromCentralTest \
- -consoleLog -debug)
- if [[ ! "$output" == *"Failures: 0, Errors: 0"* ]]; then
- echo "Error while installing from " $site ". Read $report for details and see screenshots/"
- popd
- exit 1
- fi
-}
-
-# Check for updates
-check_for_updates() {
- echo "Checking for updates"
- report=TEST-install-$(date +%Y%m%d%H%M).xml
- #Invoke tests
- output=$(java \
- -Dorg.eclipse.swtbot.search.timeout=10000 \
- -Dusage_reporting_enabled=false \
- -Xms256M -Xmx768M -XX:MaxPermSize=512M \
- -jar plugins/org.eclipse.equinox.launcher_*.jar \
- -application org.eclipse.swtbot.eclipse.junit4.headless.swtbottestapplication \
- -testApplication org.eclipse.ui.ide.workbench \
- -product $productName \
- -data workspace/ \
- formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,$report \
- formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter \
- -testPluginName org.jboss.tools.tests.installation \
- -className org.jboss.tools.tests.installation.CheckForUpdatesTest \
- -consoleLog -debug)
- if [[ ! "$output" == *"Failures: 0, Errors: 0"* ]]; then
- echo "Error while installing from " $site ". Read $report for details and see screenshots/"
- popd
- exit 1
- fi
-}
-
-eclipse_home=$1
-shift
-
-if [ ! -d "$eclipse_home" -o ! -d "$eclipse_home/plugins" ]; then
- usage
- exit 2
-fi
-if (( $# <= 0)); then
- usage
- exit 2
-fi
-
-echo "Preparing tests, installing framework"
-pushd $eclipse_home
-iniFile=$(ls -1 *.ini)
-productLineNumber=$(cat $iniFile | grep -n \\-product | cut -f 1 -d :)
-let "productLineNumber = $productLineNumber + 1"
-productName=$(sed -n ${productLineNumber}p $iniFile)
-
-#install test framework
-java -jar plugins/org.eclipse.equinox.launcher_*.jar \
--application org.eclipse.equinox.p2.director \
--repository http://download.eclipse.org/technology/swtbot/helios/dev-build/update-sit...
-http://download.jboss.org/jbosstools/builds/staging/jbosstools-4.0_trunk.component--tests/all/repo/ \
--installIU org.jboss.tools.tests.installation \
--installIU org.eclipse.swtbot.eclipse.test.junit4.feature.group \
--consoleLog
-
-while (($#)); do
- if [ -f "$1" ]; then
- for repoUrl in $(cat "$1"); do
- install_url "$repoUrl"
- done
- else
- install_url "$1"
- fi
- shift
-done
-popd
-exit 0
11 years, 7 months