jbosstools-commits December 2010

jbosstools-commits@lists.jboss.org

1 participants
799 discussions

JBoss Tools SVN: r27047 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2010-12-01 07:58:18 -0500 (Wed, 01 Dec 2010) New Revision: 27047 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java Log: [deltacloud] force the hardware default composite to have a minimum of 5 lines in it. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-12-01 12:43:16 UTC (rev 27046) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-12-01 12:58:18 UTC (rev 27047) @@ -359,6 +359,13 @@ groupLayout.marginWidth = 0; groupContainer.setLayout(groupLayout); hardware.setEnabled(false); + + // add invisible dummy widget to guarantee a min size + Label dummyLabel = new Label(groupContainer, SWT.NONE); + dummyLabel.setText("\n\n\n\n\n"); + FormData dummyData = UIUtils.createFormData(0,0,0,150,null,0,null,0); + dummyLabel.setLayoutData(dummyData); + dummyLabel.setVisible(false); keyManage = new Button(container, SWT.NULL); keyManage.setText(WizardMessages.getString(MANAGE_BUTTON_LABEL)); @@ -405,15 +412,10 @@ f = UIUtils.createFormData(imageLabel, 8+centering, null, 0, hardwareLabel, 5, 100, 0); arch.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(arch, 8 + centering); - f.left = new FormAttachment(0, 0); + f = UIUtils.createFormData(arch, 8+centering, null, 0, 0, 0, null, 0); realmLabel.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(arch, 8); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(100, 0); + f = UIUtils.createFormData(arch, 8, null, 0, hardwareLabel, 5, 100, 0); realmCombo.setLayoutData(f); Control control = realmCombo; @@ -423,9 +425,7 @@ keyText = new Text(container, SWT.BORDER | SWT.SINGLE); - f = new FormData(); - f.top = new FormAttachment(realmCombo, 8 + centering + centering2); - f.left = new FormAttachment(0, 0); + f = UIUtils.createFormData(realmCombo, 8+centering+centering2, null, 0, 0,0,null,0); keyLabel.setLayoutData(f); f = new FormData(); @@ -434,30 +434,18 @@ f.right = new FormAttachment(realmCombo, 0, SWT.RIGHT); keyManage.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(realmCombo, 8 + centering2); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(keyManage, -10); + f = UIUtils.createFormData(realmCombo, 8+centering2, null, 0, hardwareLabel, 5, keyManage, -10); keyText.setLayoutData(f); control = keyText; - f = new FormData(); - f.top = new FormAttachment(control, 8 + centering); - f.left = new FormAttachment(0, 0); + f = UIUtils.createFormData(control, 8+centering, null,0, 0,0, null,0); hardwareLabel.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(control, 8); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(100, 0); + f = UIUtils.createFormData(control,8, null,0, hardwareLabel,5, 100,0); hardware.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(hardware, 10); - f.left = new FormAttachment(0, 0); - f.right = new FormAttachment(100, 0); - f.bottom = new FormAttachment(100, 0); + f = UIUtils.createFormData(hardware,10, 100,0, 0,0, 100,0); groupContainer.setLayoutData(f); return container; }

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r27046 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools: internal/deltacloud/ui/wizards and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2010-12-01 07:43:16 -0500 (Wed, 01 Dec 2010) New Revision: 27046 Removed: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CreateInstanceHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java Log: JBIDE-7773 - unify the wizards Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CreateInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CreateInstanceHandler.java 2010-12-01 11:28:40 UTC (rev 27045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CreateInstanceHandler.java 2010-12-01 12:43:16 UTC (rev 27046) @@ -24,7 +24,7 @@ import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudImage; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; -import org.jboss.tools.internal.deltacloud.ui.wizards.NewInstanceWizard; +import org.jboss.tools.internal.deltacloud.ui.wizards.NewInstanceWizard2; /** * @author Andre Dietisheim @@ -45,7 +45,7 @@ private void createInstance(DeltaCloudImage deltaCloudImage, Shell shell) { if (deltaCloudImage != null) { DeltaCloud deltaCloud = deltaCloudImage.getDeltaCloud(); - IWizard wizard = new NewInstanceWizard(deltaCloud, deltaCloudImage); + IWizard wizard = new NewInstanceWizard2(deltaCloud, deltaCloudImage); WizardDialog dialog = new WizardDialog(shell, wizard); dialog.create(); dialog.open(); Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-12-01 11:28:40 UTC (rev 27045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-12-01 12:43:16 UTC (rev 27046) @@ -1,440 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat Inc.. - * All rights reserved. This program and the accompanying materials - * are 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 Incorporated - initial API and implementation - *******************************************************************************/ -package org.jboss.tools.internal.deltacloud.ui.wizards; - -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.runtime.preferences.InstanceScope; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.jboss.tools.deltacloud.core.DeltaCloud; -import org.jboss.tools.deltacloud.core.DeltaCloudException; -import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile; -import org.jboss.tools.deltacloud.core.DeltaCloudImage; -import org.jboss.tools.deltacloud.core.DeltaCloudRealm; -import org.jboss.tools.deltacloud.ui.Activator; -import org.jboss.tools.deltacloud.ui.ErrorUtils; -import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; -import org.jboss.tools.deltacloud.ui.SWTImagesFactory; -import org.osgi.service.prefs.Preferences; - -public class NewInstancePage extends WizardPage { - - private final static String NAME = "NewInstance.name"; //$NON-NLS-1$ - private final static String DESCRIPTION = "NewInstance.desc"; //$NON-NLS-1$ - private final static String TITLE = "NewInstance.title"; //$NON-NLS-1$ - - private static final String NAME_LABEL = "Name.label"; //$NON-NLS-1$ - private static final String IMAGE_LABEL = "Image.label"; //$NON-NLS-1$ - private static final String ARCH_LABEL = "Arch.label"; //$NON-NLS-1$ - private static final String HARDWARE_LABEL = "Profile.label"; //$NON-NLS-1$ - private static final String REALM_LABEL = "Realm.label"; //$NON-NLS-1$ - private static final String KEY_LABEL = "Key.label"; //$NON-NLS-1$ - private static final String MANAGE_BUTTON_LABEL = "ManageButton.label"; //$NON-NLS-1$ - private static final String PROPERTIES_LABEL = "Properties.label"; //$NON-NLS-1$ - - private static final String NONE_RESPONSE = "None.response"; //$NON-NLS-1$ - @SuppressWarnings("unused") - private static final String NAME_ALREADY_IN_USE = "ErrorNameInUse.text"; //$NON-NLS-1$ - - private DeltaCloud cloud; - private DeltaCloudImage image; - private ArrayList<DeltaCloudHardwareProfile> profiles; - - private Text nameText; - private Text keyText; - private Combo hardware; - private Button keyManage; - private Control realmCombo; - private String[] profileIds; - private ProfileComposite currPage; - private ProfileComposite[] profilePages; - private List<DeltaCloudRealm> realms; - - private ModifyListener textListener = new ModifyListener() { - - @Override - public void modifyText(ModifyEvent e) { - validate(); - } - }; - - private ModifyListener comboListener = new ModifyListener() { - - @Override - public void modifyText(ModifyEvent e) { - int index = hardware.getSelectionIndex(); - currPage.setVisible(false); - currPage = profilePages[index]; - currPage.setVisible(true); - } - }; - - private SelectionListener manageListener = new SelectionAdapter() { - - public void widgetSelected(SelectionEvent event) { - Shell shell = getShell(); - ManageKeysWizard wizard = new ManageKeysWizard(cloud, ".pem"); //$NON-NLS-1$ - WizardDialog dialog = new CustomWizardDialog(shell, wizard, - IDialogConstants.OK_LABEL); - dialog.create(); - dialog.open(); - String keyname = wizard.getKeyName(); - if (keyname != null) - keyText.setText(keyname); - } - - }; - - public NewInstancePage(DeltaCloud cloud, DeltaCloudImage image) { - super(WizardMessages.getString(NAME)); - this.cloud = cloud; - this.image = image; - getPossibleProfiles(); - setDescription(WizardMessages.getString(DESCRIPTION)); - setTitle(WizardMessages.getString(TITLE)); - setImageDescriptor(SWTImagesFactory.DESC_DELTA_LARGE); - setPageComplete(false); - } - - public String getHardwareProfile() { - return hardware.getText(); - } - - public String getRealmId() { - if (realmCombo instanceof Combo) { - int index = ((Combo) realmCombo).getSelectionIndex(); - return realms.get(index).getId(); - } else { - return null; - } - } - - public String getCpuProperty() { - return currPage.getCPU(); - } - - public String getStorageProperty() { - return currPage.getStorage(); - } - - public String getMemoryProperty() { - return currPage.getMemory(); - } - - public String getInstanceName() { - return nameText.getText(); - } - - public String getKeyName() { - if (keyText == null) { - return null; - } else { - return keyText.getText(); - } - } - - private void validate() { - boolean complete = true; - boolean errorFree = true; - - setMessage(null); - - String name = nameText.getText(); - if (name.length() == 0) { - complete = false; - } - - if (cloud.getType().equals(DeltaCloud.EC2_TYPE)) { - String keyname = keyText.getText(); - if (keyname.length() == 0) - complete = false; - else { - Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); - try { - prefs.put(IDeltaCloudPreferenceConstants.LAST_EC2_KEYNAME, keyname); - } catch (Exception e) { - // ignore - } - } - } - - if (errorFree) - setErrorMessage(null); - setPageComplete(complete & errorFree); - } - - private void getPossibleProfiles() { - profiles = new ArrayList<DeltaCloudHardwareProfile>(); - try { - DeltaCloudHardwareProfile[] allProfiles = cloud.getProfiles(); - for (DeltaCloudHardwareProfile p : allProfiles) { - if (p.getArchitecture() == null || image.getArchitecture().equals(p.getArchitecture())) { - profiles.add(p); - } - } - } catch (DeltaCloudException e) { - // TODO internationalize strings - ErrorUtils.handleError("Error", - MessageFormat.format("Could not get profiles from cloud {0}", cloud.getName()), e, getShell()); - } - } - - private String[] getProfileIds(Composite container) { - String[] ids = new String[profiles.size()]; - profilePages = new ProfileComposite[profiles.size()]; - for (int i = 0; i < profiles.size(); ++i) { - DeltaCloudHardwareProfile p = profiles.get(i); - ids[i] = p.getId(); - profilePages[i] = new ProfileComposite(p, container); - profilePages[i].setVisible(false); - } - currPage = profilePages[0]; - return ids; - } - - @Override - public void createControl(Composite parent) { - final Composite container = new Composite(parent, SWT.NULL); - FormLayout layout = new FormLayout(); - layout.marginHeight = 5; - layout.marginWidth = 5; - container.setLayout(layout); - - Label dummyLabel = new Label(container, SWT.NULL); - - Label imageLabel = new Label(container, SWT.NULL); - imageLabel.setText(WizardMessages.getString(IMAGE_LABEL)); - - Label imageId = new Label(container, SWT.NULL); - imageId.setText(image.getName()); - - Label archLabel = new Label(container, SWT.NULL); - archLabel.setText(WizardMessages.getString(ARCH_LABEL)); - - Label arch = new Label(container, SWT.NULL); - arch.setText(image.getArchitecture()); - - Label nameLabel = new Label(container, SWT.NULL); - nameLabel.setText(WizardMessages.getString(NAME_LABEL)); - - Label realmLabel = new Label(container, SWT.NULL); - realmLabel.setText(WizardMessages.getString(REALM_LABEL)); - - nameText = new Text(container, SWT.BORDER | SWT.SINGLE); - nameText.addModifyListener(textListener); - - realms = getRealms(); - createRealmsControl(container, getRealmNames(realms)); - - Label hardwareLabel = new Label(container, SWT.NULL); - hardwareLabel.setText(WizardMessages.getString(HARDWARE_LABEL)); - - hardware = new Combo(container, SWT.READ_ONLY); - Group groupContainer = new Group(container, SWT.BORDER); - groupContainer.setText(WizardMessages.getString(PROPERTIES_LABEL)); - FormLayout groupLayout = new FormLayout(); - groupLayout.marginHeight = 0; - groupLayout.marginWidth = 0; - groupContainer.setLayout(groupLayout); - - profileIds = getProfileIds(groupContainer); - - if (profileIds.length > 0) { - hardware.setItems(profileIds); - hardware.setText(profileIds[0]); - profilePages[0].setVisible(true); - hardware.addModifyListener(comboListener); - } - - Point p1 = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); - Point p2 = nameText.computeSize(SWT.DEFAULT, SWT.DEFAULT); - int centering = (p2.y - p1.y + 1) / 2; - - FormData f = new FormData(); - f.left = new FormAttachment(0, 0); - f.right = new FormAttachment(100, 0); - dummyLabel.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(dummyLabel, 8 + centering); - f.left = new FormAttachment(0, 0); - nameLabel.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(dummyLabel, 8); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(100, 0); - nameText.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(nameText, 8); - f.left = new FormAttachment(0, 0); - imageLabel.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(nameText, 8); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(100, 0); - imageId.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(imageLabel, 8); - f.left = new FormAttachment(0, 0); - archLabel.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(imageLabel, 8); - f.left = new FormAttachment(hardwareLabel, 5); - arch.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(arch, 8 + centering); - f.left = new FormAttachment(0, 0); - realmLabel.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(arch, 8); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(100, 0); - realmCombo.setLayoutData(f); - - Control control = realmCombo; - - if (cloud.getType().equals(DeltaCloud.EC2_TYPE)) { - Label keyLabel = new Label(container, SWT.NULL); - keyLabel.setText(WizardMessages.getString(KEY_LABEL)); - - keyText = new Text(container, SWT.BORDER | SWT.SINGLE); - Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); - String defaultKeyname = prefs.get(IDeltaCloudPreferenceConstants.LAST_EC2_KEYNAME, ""); - keyText.setText(defaultKeyname); - keyText.addModifyListener(textListener); - - keyManage = new Button(container, SWT.NULL); - keyManage.setText(WizardMessages.getString(MANAGE_BUTTON_LABEL)); - keyManage.addSelectionListener(manageListener); - Point p3 = keyManage.computeSize(SWT.DEFAULT, SWT.DEFAULT); - int centering2 = (p3.y - p2.y + 1) / 2; - - f = new FormData(); - f.top = new FormAttachment(realmCombo, 8 + centering + centering2); - f.left = new FormAttachment(0, 0); - keyLabel.setLayoutData(f); - - f = new FormData(); - int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); - Point minSize = keyManage.computeSize(SWT.DEFAULT, SWT.DEFAULT, true); - f.width = Math.max(widthHint, minSize.x); - f.top = new FormAttachment(realmCombo, 8); - f.right = new FormAttachment(realmCombo, 0, SWT.RIGHT); - keyManage.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(realmCombo, 8 + centering2); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(keyManage, -10); - keyText.setLayoutData(f); - - control = keyText; - } - - f = new FormData(); - f.top = new FormAttachment(control, 8 + centering); - f.left = new FormAttachment(0, 0); - hardwareLabel.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(control, 8); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(100, 0); - hardware.setLayoutData(f); - - f = new FormData(); - f.top = new FormAttachment(hardware, 10); - f.left = new FormAttachment(0, 0); - f.right = new FormAttachment(100, 0); - f.bottom = new FormAttachment(100, 0); - groupContainer.setLayoutData(f); - - setControl(container); - } - - private List<String> getRealmNames(List<DeltaCloudRealm> realms) { - List<String> realmNames = new ArrayList<String>(); - for (DeltaCloudRealm realm : realms) { - realmNames.add( - new StringBuilder() - .append(realm.getId()) - .append(" [") //$NON-NLS-1$ - .append(realm.getName()) - .append("]") //$NON-NLS-1$ - .toString()); - } - return realmNames; - } - - private List<DeltaCloudRealm> getRealms() { - List<DeltaCloudRealm> realms = new ArrayList<DeltaCloudRealm>(); - try { - realms = Arrays.asList(cloud.getRealms()); - } catch (DeltaCloudException e) { - ErrorUtils.handleError("Error", - MessageFormat.format("Could not get realms from cloud {0}", cloud.getName()), e, getShell()); - } - return realms; - } - - /** - * Creates the control that shall display the available realms. It creates - * either a combo, if there are realms available, or a label if none are - * available. - * - * @param parent - * the container - * @param realmNames - * the realm names - */ - private void createRealmsControl(final Composite parent, List<String> realmNames) { - if (realmNames.size() > 0) { - Combo combo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY); - combo.setItems(realmNames.toArray(new String[realmNames.size()])); - combo.setText(realmNames.get(0)); - realmCombo = combo; - } else { - Label label = new Label(parent, SWT.NULL); - label.setText(WizardMessages.getString(NONE_RESPONSE)); - realmCombo = label; - } - } -} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-12-01 11:28:40 UTC (rev 27045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-12-01 12:43:16 UTC (rev 27046) @@ -111,10 +111,14 @@ @Override public void modifyText(ModifyEvent e) { - String id = hardware.getItem(hardware.getSelectionIndex()); - currPage.setVisible(false); - currPage = profilePages.get(id); - currPage.setVisible(true); + int index = hardware.getSelectionIndex(); + String id = index > -1 ? hardware.getItem(hardware.getSelectionIndex()) : null; + if( currPage != null ) + currPage.setVisible(false); + if( id != null ) { + currPage = profilePages.get(id); + currPage.setVisible(true); + } } }; @@ -232,6 +236,9 @@ } public void filterProfiles() { + if( allProfiles == null ) + return; + ArrayList<DeltaCloudHardwareProfile> profiles = new ArrayList<DeltaCloudHardwareProfile>(); for (DeltaCloudHardwareProfile p : allProfiles) { if (p.getArchitecture() == null || image.getArchitecture().equals(p.getArchitecture())) { @@ -260,7 +267,6 @@ DataBindingContext dbc = new DataBindingContext(); WizardPageSupport.create(this, dbc); Composite container = createWidgets(parent); - //layoutWidgets(); bindWidgets(dbc); launchFetchRealms(); @@ -272,6 +278,12 @@ String defaultImage = cloud.getLastImageId(); model.setImageId(defaultImage); setControl(container); + + // lastly, if there's already an image set, use it + if( image != null ) { + imageText.setText(image.getId()); + filterProfiles(); + } } private void bindWidgets(DataBindingContext dbc) { @@ -456,6 +468,7 @@ profilePages.put(p.getId(), pc); pc.setVisible(false); } + groupContainer.layout(); } private void launchFetchRealms() { @@ -483,6 +496,7 @@ clearProfiles(); if( allProfiles.length > 0 ) hardware.setEnabled(true); + filterProfiles(); } }); } Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-12-01 11:28:40 UTC (rev 27045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-12-01 12:43:16 UTC (rev 27046) @@ -1,193 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat Inc.. - * All rights reserved. This program and the accompanying materials - * are 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 Incorporated - initial API and implementation - *******************************************************************************/ -package org.jboss.tools.internal.deltacloud.ui.wizards; - -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.core.runtime.preferences.InstanceScope; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.jface.dialogs.MessageDialogWithToggle; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.rse.core.model.IHost; -import org.jboss.tools.deltacloud.core.DeltaCloud; -import org.jboss.tools.deltacloud.core.DeltaCloudException; -import org.jboss.tools.deltacloud.core.DeltaCloudImage; -import org.jboss.tools.deltacloud.core.DeltaCloudInstance; -import org.jboss.tools.deltacloud.ui.Activator; -import org.jboss.tools.deltacloud.ui.ErrorUtils; -import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; -import org.jboss.tools.deltacloud.ui.RSEUtils; -import org.osgi.service.prefs.Preferences; - -/** - * @author Jeff Jonhston - */ -public class NewInstanceWizard extends Wizard { - - private final static String CREATE_INSTANCE_FAILURE_TITLE = "CreateInstanceError.title"; //$NON-NLS-1$ - private final static String CREATE_INSTANCE_FAILURE_MSG = "CreateInstanceError.msg"; //$NON-NLS-1$ - private final static String DEFAULT_REASON = "CreateInstanceErrorReason.msg"; //$NON-NLS-1$ - private final static String CONFIRM_CREATE_TITLE = "ConfirmCreate.title"; //$NON-NLS-1$ - private final static String CONFIRM_CREATE_MSG = "ConfirmCreate.msg"; //$NON-NLS-1$ - private final static String DONT_SHOW_THIS_AGAIN_MSG = "DontShowThisAgain.msg"; //$NON-NLS-1$ - private final static String STARTING_INSTANCE_MSG = "StartingInstance.msg"; //$NON-NLS-1$ - private final static String STARTING_INSTANCE_TITLE = "StartingInstance.title"; //$NON-NLS-1$ - - private NewInstancePage mainPage; - - private DeltaCloud cloud; - private DeltaCloudImage image; - private DeltaCloudInstance instance; - - public NewInstanceWizard(DeltaCloud cloud, DeltaCloudImage image) { - this.cloud = cloud; - this.image = image; - } - - @Override - public void addPages() { - mainPage = new NewInstancePage(cloud, image); - addPage(mainPage); - } - - @Override - public boolean canFinish() { - return mainPage.isPageComplete(); - } - - private class WatchCreateJob extends Job { - - private DeltaCloud cloud; - private String instanceId; - private String instanceName; - - public WatchCreateJob(String title, DeltaCloud cloud, - String instanceId, String instanceName) { - super(title); - this.cloud = cloud; - this.instanceId = instanceId; - this.instanceName = instanceName; - } - - public IStatus run(IProgressMonitor pm) { - if (!pm.isCanceled()) { - DeltaCloudInstance instance = null; - try { - pm.beginTask( - WizardMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] { instanceName }), - IProgressMonitor.UNKNOWN); - pm.worked(1); - cloud.registerInstanceJob(instanceId, this); - instance = cloud.waitWhilePending(instanceId, pm); - } catch (Exception e) { - // do nothing - } finally { - cloud.replaceInstance(instance); - cloud.removeInstanceJob(instanceId, this); - String hostname = RSEUtils.createHostName(instance); - Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); - boolean autoConnect = prefs.getBoolean(IDeltaCloudPreferenceConstants.AUTO_CONNECT_INSTANCE, true); - if (hostname != null && hostname.length() > 0 && autoConnect) { - try { - String connectionName = RSEUtils.createConnectionName(instance); - IHost host = RSEUtils.createHost(connectionName, - RSEUtils.createHostName(instance), - RSEUtils.getSSHOnlySystemType(), - RSEUtils.getSystemRegistry()); - RSEUtils.connect(connectionName, RSEUtils.getConnectorService(host)); - } catch (Exception e) { - ErrorUtils.handleError("Error", "Could not launch remote system explorer for instance \"" - + instance.getName() + "\"", e, getShell()); - return Status.OK_STATUS; - } - } - pm.done(); - } - return Status.OK_STATUS; - } else { - pm.done(); - return Status.CANCEL_STATUS; - } - }; - }; - - @Override - public boolean performFinish() { - String imageId = image.getId(); - String profileId = mainPage.getHardwareProfile(); - String realmId = mainPage.getRealmId(); - String memory = mainPage.getMemoryProperty(); - String storage = mainPage.getStorageProperty(); - String keyname = mainPage.getKeyName(); - String name = null; - try { - name = URLEncoder.encode(mainPage.getInstanceName(), "UTF-8"); //$NON-NLS-1$ - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - boolean result = false; - String errorMessage = WizardMessages.getString(DEFAULT_REASON); - try { - Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); - boolean dontShowDialog = prefs.getBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, - false); - if (!dontShowDialog) { - MessageDialogWithToggle dialog = - MessageDialogWithToggle.openOkCancelConfirm(getShell(), - WizardMessages.getString(CONFIRM_CREATE_TITLE), - WizardMessages.getString(CONFIRM_CREATE_MSG), - WizardMessages.getString(DONT_SHOW_THIS_AGAIN_MSG), - false, null, null); - int retCode = dialog.getReturnCode(); - boolean toggleState = dialog.getToggleState(); - if (retCode == Dialog.CANCEL) - return true; - // If warning turned off by user, set the preference for future - // usage - if (toggleState) { - prefs.putBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, true); - } - } - - instance = cloud.createInstance(name, imageId, realmId, profileId, keyname, memory, storage); - if (instance != null) - result = true; - if (instance != null && instance.getState().equals(DeltaCloudInstance.PENDING)) { - final String instanceId = instance.getId(); - final String instanceName = name; - Job job = new WatchCreateJob(WizardMessages.getString(STARTING_INSTANCE_TITLE), - cloud, instanceId, instanceName); - job.setUser(true); - job.schedule(); - } - } catch (DeltaCloudException e) { - errorMessage = e.getLocalizedMessage(); - } - if (!result) { - ErrorDialog.openError( - this.getShell(), - WizardMessages.getString(CREATE_INSTANCE_FAILURE_TITLE), - WizardMessages.getFormattedString(CREATE_INSTANCE_FAILURE_MSG, new String[] { name, imageId, - realmId, profileId }), - new Status(IStatus.ERROR, Activator.PLUGIN_ID, errorMessage)); - } - return result; - } - -} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java 2010-12-01 11:28:40 UTC (rev 27045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java 2010-12-01 12:43:16 UTC (rev 27046) @@ -25,6 +25,7 @@ import org.eclipse.rse.core.model.IHost; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudException; +import org.jboss.tools.deltacloud.core.DeltaCloudImage; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; import org.jboss.tools.deltacloud.core.DeltaCloudManager; import org.jboss.tools.deltacloud.ui.Activator; @@ -44,18 +45,28 @@ private final static String STARTING_INSTANCE_MSG = "StartingInstance.msg"; //$NON-NLS-1$ private final static String STARTING_INSTANCE_TITLE = "StartingInstance.title"; //$NON-NLS-1$ - private NewInstancePage2 mainPage; + protected NewInstancePage2 mainPage; + protected DeltaCloud cloud; + protected DeltaCloudInstance instance; + /** + * Initial image, may be null + */ + private DeltaCloudImage image; - private DeltaCloud cloud; - private DeltaCloudInstance instance; - public NewInstanceWizard2(DeltaCloud cloud) { this.cloud = cloud; } + public NewInstanceWizard2(DeltaCloud cloud, DeltaCloudImage image) { + this(cloud); + this.image = image; + } + @Override public void addPages() { mainPage = new NewInstancePage2(cloud); + if( image != null ) + mainPage.setImage(image); addPage(mainPage); } @@ -120,7 +131,7 @@ Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); boolean autoConnect = prefs.getBoolean(IDeltaCloudPreferenceConstants.AUTO_CONNECT_INSTANCE, true); return autoConnect; - }; + } }; @Override

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r27045 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools: internal/deltacloud/ui/utils and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2010-12-01 06:28:40 -0500 (Wed, 01 Dec 2010) New Revision: 27045 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties Log: JBIDE-7769 - launch instance wizard taking too long... delay important bits Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2010-12-01 10:31:18 UTC (rev 27044) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2010-12-01 11:28:40 UTC (rev 27045) @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.jboss.tools.common.log.StatusFactory; import org.jboss.tools.deltacloud.core.DeltaCloudMultiException; @@ -28,6 +29,23 @@ openErrorDialog(title, status, shell); return status; } + /** + * Launch the error dialog asynchronously on the display thread + * @param title + * @param message + * @param e + * @param shell + * @return + */ + public static IStatus handleErrorAsync(final String title, final String message, final Throwable e, final Shell shell) { + IStatus status = createStatus(e); + Display.getDefault().asyncExec(new Runnable(){ + public void run() { + handleError(title, message, e, shell); + } + }); + return status; + } private static IStatus createStatus(Throwable e) { if (e instanceof DeltaCloudMultiException) { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java 2010-12-01 10:31:18 UTC (rev 27044) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java 2010-12-01 11:28:40 UTC (rev 27045) @@ -29,6 +29,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Shell; @@ -334,4 +336,40 @@ getActivePage().showView(viewId); } + + /** + * This method has been stolen from AS-Tools' UIUtil class + * and is useful for creating FormData objects + */ + public static FormData createFormData( + Object topStart, int topOffset, + Object bottomStart, int bottomOffset, + Object leftStart, int leftOffset, + Object rightStart, int rightOffset) { + + FormData data = new FormData(); + + if( topStart != null ) { + data.top = topStart instanceof Control ? new FormAttachment((Control)topStart, topOffset) : + new FormAttachment(((Integer)topStart).intValue(), topOffset); + } + + if( bottomStart != null ) { + data.bottom = bottomStart instanceof Control ? new FormAttachment((Control)bottomStart, bottomOffset) : + new FormAttachment(((Integer)bottomStart).intValue(), bottomOffset); + } + + if( leftStart != null ) { + data.left = leftStart instanceof Control ? new FormAttachment((Control)leftStart, leftOffset) : + new FormAttachment(((Integer)leftStart).intValue(), leftOffset); + } + + if( rightStart != null ) { + data.right = rightStart instanceof Control ? new FormAttachment((Control)rightStart, rightOffset) : + new FormAttachment(((Integer)rightStart).intValue(), rightOffset); + } + return data; + } + + } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-12-01 10:31:18 UTC (rev 27044) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-12-01 11:28:40 UTC (rev 27045) @@ -45,6 +45,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; @@ -57,6 +58,7 @@ import org.jboss.tools.deltacloud.ui.ErrorUtils; import org.jboss.tools.deltacloud.ui.SWTImagesFactory; import org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.MandatoryStringValidator; +import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; /** * @author Jeff Jonston @@ -82,6 +84,7 @@ private static final String MUST_ENTER_A_KEYNAME = "ErrorMustProvideKeyName.text"; //$NON-NLS-1$ private static final String MUST_ENTER_IMAGE_ID = "ErrorMustProvideImageId.text"; //$NON-NLS-1$ private static final String NONE_RESPONSE = "None.response"; //$NON-NLS-1$ + private static final String LOADING_VALUE = "Loading.value"; //$NON-NLS-1$ private NewInstanceModel model; @@ -94,12 +97,16 @@ private Combo hardware; private Button keyManage; private Button findImage; - private Control realmCombo; + private Combo realmCombo; private ProfileComposite currPage; private Map<String, ProfileComposite> profilePages; private DeltaCloudHardwareProfile[] allProfiles; private List<DeltaCloudRealm> realms; + private Label dummyLabel, imageLabel, archLabel, nameLabel, realmLabel; + private Group groupContainer; + + private ModifyListener comboListener = new ModifyListener() { @Override @@ -146,8 +153,6 @@ public NewInstancePage2(DeltaCloud cloud) { super(WizardMessages.getString(NAME)); this.cloud = cloud; - profilePages = new HashMap<String, ProfileComposite>(); - allProfiles = getProfiles(); String defaultKeyname = cloud.getLastKeyname(); model = new NewInstanceModel("", //$NON-NLS-1$ "", //$NON-NLS-1$ @@ -248,83 +253,101 @@ hardware.addModifyListener(comboListener); } } - + + @Override public void createControl(Composite parent) { DataBindingContext dbc = new DataBindingContext(); WizardPageSupport.create(this, dbc); + Composite container = createWidgets(parent); + //layoutWidgets(); + bindWidgets(dbc); + launchFetchRealms(); + launchFetchProfiles(); + + // We have to set the image id here instead of in the constructor + // of the model because the image id triggers other items to fill + // in their values such as the architecture and hardware profiles. + String defaultImage = cloud.getLastImageId(); + model.setImageId(defaultImage); + setControl(container); + } + + private void bindWidgets(DataBindingContext dbc) { + bindText(dbc, nameText, NewInstanceModel.PROPERTY_NAME, MUST_ENTER_A_NAME); + dbc.bindValue( + WidgetProperties.text(SWT.Modify).observeDelayed(IMAGE_CHECK_DELAY, imageText), + BeanProperties.value(NewInstanceModel.class, NewInstanceModel.PROPERTY_IMAGE_ID) + .observe(model), + new UpdateValueStrategy().setAfterGetValidator(new MandatoryStringValidator( + WizardMessages.getString(MUST_ENTER_IMAGE_ID))), + null); + bindArchLabel(dbc, imageText, arch, this); + + IObservableValue realmObservable = WidgetProperties.text().observe(realmCombo); + dbc.bindValue( + realmObservable, + BeanProperties.value(NewInstanceModel.class, NewInstanceModel.PROPERTY_REALM).observe( + model)); + + IObservableValue hardwareObservable = WidgetProperties.text().observe(hardware); + dbc.bindValue( + hardwareObservable, + BeanProperties.value(NewInstanceModel.class, NewInstanceModel.PROPERTY_PROFILE).observe( + model)); + bindText(dbc, keyText, NewInstanceModel.PROPERTY_KEYNAME, MUST_ENTER_A_KEYNAME); + } + + private Composite createWidgets(Composite parent) { final Composite container = new Composite(parent, SWT.NULL); FormLayout layout = new FormLayout(); layout.marginHeight = 5; layout.marginWidth = 5; container.setLayout(layout); - Label dummyLabel = new Label(container, SWT.NULL); - - Label imageLabel = new Label(container, SWT.NULL); + dummyLabel = new Label(container, SWT.NULL); + imageLabel = new Label(container, SWT.NULL); imageLabel.setText(WizardMessages.getString(IMAGE_LABEL)); - Label archLabel = new Label(container, SWT.NULL); + archLabel = new Label(container, SWT.NULL); archLabel.setText(WizardMessages.getString(ARCH_LABEL)); - Label nameLabel = new Label(container, SWT.NULL); + nameLabel = new Label(container, SWT.NULL); nameLabel.setText(WizardMessages.getString(NAME_LABEL)); - Label realmLabel = new Label(container, SWT.NULL); + realmLabel = new Label(container, SWT.NULL); realmLabel.setText(WizardMessages.getString(REALM_LABEL)); nameText = new Text(container, SWT.BORDER | SWT.SINGLE); - bindText(dbc, nameText, NewInstanceModel.PROPERTY_NAME, MUST_ENTER_A_NAME); - realms = getRealms(); - createRealmsControl(container, getRealmNames(realms)); - + //createRealmsControl(container, getRealmNames(realms)); + createRealmsControl(container); + imageText = new Text(container, SWT.BORDER | SWT.SINGLE); - dbc.bindValue( - WidgetProperties.text(SWT.Modify).observeDelayed(IMAGE_CHECK_DELAY, imageText), - BeanProperties.value(NewInstanceModel.class, NewInstanceModel.PROPERTY_IMAGE_ID) - .observe(model), - new UpdateValueStrategy().setAfterGetValidator(new MandatoryStringValidator( - WizardMessages.getString(MUST_ENTER_IMAGE_ID))), - null); findImage = new Button(container, SWT.NULL); findImage.setText(WizardMessages.getString(FIND_BUTTON_LABEL)); findImage.addSelectionListener(findListener); arch = new Label(container, SWT.NULL); - bindArchLabel(dbc, imageText, arch, this); - IObservableValue realmObservable = WidgetProperties.text().observe(realmCombo); - dbc.bindValue( - realmObservable, - BeanProperties.value(NewInstanceModel.class, NewInstanceModel.PROPERTY_REALM).observe( - model)); - Label hardwareLabel = new Label(container, SWT.NULL); hardwareLabel.setText(WizardMessages.getString(HARDWARE_LABEL)); hardware = new Combo(container, SWT.READ_ONLY); - Group groupContainer = new Group(container, SWT.BORDER); + hardware.setEnabled(false); + hardware.setItems(new String[]{WizardMessages.getString(LOADING_VALUE)}); + hardware.select(0); + + groupContainer = new Group(container, SWT.BORDER); groupContainer.setText(WizardMessages.getString(PROPERTIES_LABEL)); FormLayout groupLayout = new FormLayout(); groupLayout.marginHeight = 0; groupLayout.marginWidth = 0; groupContainer.setLayout(groupLayout); hardware.setEnabled(false); - IObservableValue hardwareObservable = WidgetProperties.text().observe(hardware); - dbc.bindValue( - hardwareObservable, - BeanProperties.value(NewInstanceModel.class, NewInstanceModel.PROPERTY_PROFILE).observe( - model)); - for (DeltaCloudHardwareProfile p : allProfiles) { - ProfileComposite pc = new ProfileComposite(p, groupContainer); - profilePages.put(p.getId(), pc); - pc.setVisible(false); - } - keyManage = new Button(container, SWT.NULL); keyManage.setText(WizardMessages.getString(MANAGE_BUTTON_LABEL)); keyManage.addSelectionListener(manageListener); @@ -337,25 +360,16 @@ int centering = (p2.y - p1.y + 1) / 2; int centering2 = (p3.y - p2.y + 1) / 2; - FormData f = new FormData(); - f.left = new FormAttachment(0, 0); - f.right = new FormAttachment(100, 0); + FormData f = UIUtils.createFormData(null,0,null,0,0,0,100,0); dummyLabel.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(dummyLabel, 8 + centering); - f.left = new FormAttachment(0, 0); + f = UIUtils.createFormData(dummyLabel, 8+centering, null, 0, 0,0,null,0); nameLabel.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(dummyLabel, 8); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(100, 0); + f = UIUtils.createFormData(dummyLabel, 8, null, 0, hardwareLabel, 5, 100, 0); nameText.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(nameText, 8 + centering + centering2); - f.left = new FormAttachment(0, 0); + f = UIUtils.createFormData(nameText, 8+centering+centering2, null, 0, 0,0,null,0); imageLabel.setLayoutData(f); int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); @@ -365,26 +379,18 @@ buttonWidth = Math.max(buttonWidth, minSize2.x); f = new FormData(); - f.width = buttonWidth; f.top = new FormAttachment(nameText, 8); f.right = new FormAttachment(realmCombo, 0, SWT.RIGHT); + f.width = buttonWidth; findImage.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(nameText, 8 + centering2); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(findImage, -10); + f = UIUtils.createFormData(nameText, 8+centering2, null, 0, hardwareLabel, 5, findImage, -10); imageText.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(imageLabel, 8 + centering); - f.left = new FormAttachment(0, 0); + f = UIUtils.createFormData(imageLabel, 8+centering, null, 0, 0, 0, null, 0); archLabel.setLayoutData(f); - f = new FormData(); - f.top = new FormAttachment(imageLabel, 8 + centering); - f.left = new FormAttachment(hardwareLabel, 5); - f.right = new FormAttachment(100, 0); + f = UIUtils.createFormData(imageLabel, 8+centering, null, 0, hardwareLabel, 5, 100, 0); arch.setLayoutData(f); f = new FormData(); @@ -404,7 +410,6 @@ keyLabel.setText(WizardMessages.getString(KEY_LABEL)); keyText = new Text(container, SWT.BORDER | SWT.SINGLE); - bindText(dbc, keyText, NewInstanceModel.PROPERTY_KEYNAME, MUST_ENTER_A_KEYNAME); f = new FormData(); f.top = new FormAttachment(realmCombo, 8 + centering + centering2); @@ -442,16 +447,49 @@ f.right = new FormAttachment(100, 0); f.bottom = new FormAttachment(100, 0); groupContainer.setLayoutData(f); + return container; + } + + private void createProfileComposites() { + for (DeltaCloudHardwareProfile p : allProfiles) { + ProfileComposite pc = new ProfileComposite(p, groupContainer); + profilePages.put(p.getId(), pc); + pc.setVisible(false); + } + } - // We have to set the image id here instead of in the constructor - // of the model because the image id triggers other items to fill - // in their values such as the architecture and hardware profiles. - String defaultImage = cloud.getLastImageId(); - model.setImageId(defaultImage); - - setControl(container); + private void launchFetchRealms() { + Thread t = new Thread() { + public void run() { + realms = getRealms(); + Display.getDefault().asyncExec(new Runnable(){ + public void run() { + updateRealmCombo(); + } + }); + } + }; + t.start(); } - + + private void launchFetchProfiles() { + Thread t = new Thread() { + public void run() { + allProfiles = getProfiles(); + profilePages = new HashMap<String, ProfileComposite>(); + Display.getDefault().asyncExec(new Runnable() { + public void run() { + createProfileComposites(); + clearProfiles(); + if( allProfiles.length > 0 ) + hardware.setEnabled(true); + } + }); + } + }; + t.start(); + } + /** * Displays the arch in the given label if the given binding is valid. * @@ -557,7 +595,7 @@ try { realms = Arrays.asList(cloud.getRealms()); } catch (DeltaCloudException e) { - ErrorUtils.handleError("Error", + ErrorUtils.handleErrorAsync("Error", MessageFormat.format("Could not get realms from cloud {0}", cloud.getName()), e, getShell()); } return realms; @@ -573,16 +611,23 @@ * @param realmNames * the realm names */ - private void createRealmsControl(final Composite parent, List<String> realmNames) { - if (realmNames.size() > 0) { - Combo combo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY); - combo.setItems(realmNames.toArray(new String[realmNames.size()])); - combo.setText(realmNames.get(0)); - realmCombo = combo; + private void createRealmsControl(final Composite parent) { + Combo combo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY); + realmCombo = combo; + combo.setEnabled(false); + combo.setItems(new String[]{WizardMessages.getString(LOADING_VALUE)}); + combo.select(0); + } + + private void updateRealmCombo() { + List<String> names = getRealmNames(realms != null ? realms : new ArrayList<DeltaCloudRealm>()); + if( names.size() > 0 ) { + realmCombo.setItems(names.toArray(new String[names.size()])); + realmCombo.setEnabled(true); + realmCombo.select(0); } else { - Label label = new Label(parent, SWT.NULL); - label.setText(WizardMessages.getString(NONE_RESPONSE)); - realmCombo = label; + realmCombo.setItems(new String[]{WizardMessages.getString(NONE_RESPONSE)}); + realmCombo.select(0); } } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-12-01 10:31:18 UTC (rev 27044) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-12-01 11:28:40 UTC (rev 27045) @@ -59,6 +59,7 @@ None.response=None Defaulted=Defaulted +Loading.value=Loading... CreateInstanceError.title=Launch Instance Failure CreateInstanceError.msg=The attempt to launch instance: name={0}, image={1}, realm={2}, profile={3}

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r27044 - branches/jbosstools-3.2.0.Beta2/jsf/features/org.jboss.tools.richfaces.feature.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-12-01 05:31:18 -0500 (Wed, 01 Dec 2010) New Revision: 27044 Modified: branches/jbosstools-3.2.0.Beta2/jsf/features/org.jboss.tools.richfaces.feature/feature.properties Log: https://jira.jboss.org/browse/JBIDE-7766 Modified: branches/jbosstools-3.2.0.Beta2/jsf/features/org.jboss.tools.richfaces.feature/feature.properties =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/features/org.jboss.tools.richfaces.feature/feature.properties 2010-12-01 10:23:42 UTC (rev 27043) +++ branches/jbosstools-3.2.0.Beta2/jsf/features/org.jboss.tools.richfaces.feature/feature.properties 2010-12-01 10:31:18 UTC (rev 27044) @@ -28,7 +28,7 @@ # "description" property - description of the feature description=Visual editing -copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\ +copyright=Copyright (c) 2007 - 2011 Exadel, Inc and Red Hat, Inc.\n\ Distributed under license by Red Hat, Inc. All rights reserved.\n\ This program is made available under the terms of the\n\ Eclipse Public License v1.0 which accompanies this distribution,\n\

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r27043 - trunk/jsf/features/org.jboss.tools.richfaces.feature.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-12-01 05:23:42 -0500 (Wed, 01 Dec 2010) New Revision: 27043 Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.properties Log: https://jira.jboss.org/browse/JBIDE-7766 Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.properties =================================================================== --- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.properties 2010-12-01 10:03:00 UTC (rev 27042) +++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.properties 2010-12-01 10:23:42 UTC (rev 27043) @@ -28,7 +28,7 @@ # "description" property - description of the feature description=Visual editing -copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\ +copyright=Copyright (c) 2007 - 2011 Exadel, Inc and Red Hat, Inc.\n\ Distributed under license by Red Hat, Inc. All rights reserved.\n\ This program is made available under the terms of the\n\ Eclipse Public License v1.0 which accompanies this distribution,\n\

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r27042 - in trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse: console/test and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2010-12-01 05:03:00 -0500 (Wed, 01 Dec 2010) New Revision: 27042 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/criteriaeditor/ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditorTest.java Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/ConfigurableTestProject.java Log: https://jira.jboss.org/browse/JBIDE-7749 JUnit for code completion in Criteria Editor Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java 2010-12-01 01:29:25 UTC (rev 27041) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java 2010-12-01 10:03:00 UTC (rev 27042) @@ -8,6 +8,7 @@ import org.hibernate.eclipse.console.test.mappingproject.MappingTestsCore; import org.hibernate.eclipse.console.test.mappingproject.MappingTestsJpa; import org.hibernate.eclipse.console.views.test.QueryPageViewerTest; +import org.hibernate.eclipse.criteriaeditor.CriteriaEditorTest; import org.hibernate.eclipse.hqleditor.HQLEditorTest; import org.hibernate.eclipse.hqleditor.preferences.HQLEditorPreferencePageTest; import org.hibernate.eclipse.mapper.HBMInfoExtractorTest; @@ -25,6 +26,7 @@ suite.addTestSuite(JavaFormattingTest.class); suite.addTestSuite(RefactoringTest.class); suite.addTestSuite(HQLEditorTest.class); + suite.addTestSuite(CriteriaEditorTest.class); suite.addTestSuite(MappingTestsCore.class); suite.addTestSuite(MappingTestsJpa.class); Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/ConfigurableTestProject.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/ConfigurableTestProject.java 2010-12-01 01:29:25 UTC (rev 27041) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/ConfigurableTestProject.java 2010-12-01 10:03:00 UTC (rev 27042) @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaModelException; import org.hibernate.eclipse.console.test.mappingproject.Customization; @@ -80,6 +81,20 @@ FilesTransfer.copyFolder(srcFolder, (IFolder)sourcePackageFragment.getResource()); return true; } + + public IPackageFragment getCurrentPackage() throws JavaModelException{ + if (activePackage < foldersList.size()) { + final String pack = foldersList.get(activePackage).replaceAll("\\\\", "."); + IPackageFragment[] packageFragments = javaProject.getPackageFragments(); + for (IPackageFragment iPackageFragment : packageFragments) { + if (iPackageFragment.getKind() == IPackageFragmentRoot.K_SOURCE + && iPackageFragment.getElementName().equals(pack)){ + return iPackageFragment; + } + } + } + return null; + } public boolean createTestFoldersList(FileFilter filterFiles, FileFilter filterFolders) { activePackage = -1; Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditorTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditorTest.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditorTest.java 2010-12-01 10:03:00 UTC (rev 27042) @@ -0,0 +1,101 @@ +/******************************************************************************* + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.hibernate.eclipse.criteriaeditor; + +import java.io.File; +import java.io.IOException; + +import junit.framework.TestCase; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IPackageFragment; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.ui.IEditorPart; +import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.console.KnownConfigurations; +import org.hibernate.console.QueryInputModel; +import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.eclipse.console.test.project.ConfigurableTestProject; +import org.hibernate.eclipse.console.test.project.TestProject; +import org.hibernate.eclipse.console.test.utils.ConsoleConfigUtils; + +/** + * @author Dmitry Geraskov + * + */ +public class CriteriaEditorTest extends TestCase { + + private static final String PROJ_NAME = "CriteriaTest"; + private static final String CONSOLE_NAME = PROJ_NAME; + + private ConfigurableTestProject project = null; + + protected void setUp() throws Exception { + project = new ConfigurableTestProject(PROJ_NAME); + } + + protected void tearDown() throws Exception { + project.deleteIProject(); + project = null; + } + + public void testCriteriaEditorOpen(){ + IEditorPart editorPart = HibernateConsolePlugin.getDefault() + .openCriteriaEditor(null, ""); + assertNotNull("Criteria Editor was not opened", editorPart); + assertTrue("Opened editor is not CriteriaEditor", editorPart instanceof CriteriaEditor); + + CriteriaEditor editor = (CriteriaEditor)editorPart; + QueryInputModel model = editor.getQueryInputModel(); + assertNotNull("Model is NULL", model); + } + + public void testCriteriaCodeCompletion() throws CoreException, NoSuchFieldException, IllegalAccessException, IOException{ + //setup console configuration + IPath cfgFilePath = new Path(project.getIProject().getName() + File.separator + + TestProject.SRC_FOLDER + File.separator + ConsoleConfigUtils.CFG_FILE_NAME); + ConsoleConfigUtils.createConsoleConfig(PROJ_NAME, cfgFilePath, CONSOLE_NAME); + boolean createListRes = project.createTestFoldersList(); + assertTrue(createListRes); + project.setupNextTestFolder(); + + IPackageFragment packFragment = project.getCurrentPackage(); + assertNotNull(packFragment); + ConsoleConfigUtils.customizeCfgXmlForPack(packFragment); + project.fullBuild(); + + ConsoleConfiguration cc = KnownConfigurations.getInstance().find(CONSOLE_NAME); + assertNotNull("Console Configuration not found", cc); + + String query = "Object o = new Object();\n" + + "System.out.print(o.toString());"; + IEditorPart editorPart = HibernateConsolePlugin.getDefault() + .openCriteriaEditor(CONSOLE_NAME, query); + assertTrue("Opened editor is not CriteriaEditor", editorPart instanceof CriteriaEditor); + + CriteriaEditor editor = (CriteriaEditor)editorPart; + assertEquals(editor.getEditorText(), query); + + QueryInputModel model = editor.getQueryInputModel(); + assertTrue(model.getParameterCount() == 0); + + JavaCompletionProcessor processor = new JavaCompletionProcessor(editor); + + int position = query.indexOf("toString()"); + ICompletionProposal[] proposals = processor.computeCompletionProposals(null, position); + assertTrue("Class java.lang.Object has at least 9 methods. But " + proposals.length + + " code completion proposals where provided.", proposals.length >= 9); + cc.reset(); + } + +}

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r27041 - in branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test: META-INF and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-11-30 20:29:25 -0500 (Tue, 30 Nov 2010) New Revision: 27041 Modified: branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsNestedComponentTest.java branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsTilesComponentTest.java Log: https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared struts tests decoupled from vpe.ui.test Modified: branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) +++ branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF 2010-12-01 01:29:25 UTC (rev 27041) @@ -6,7 +6,7 @@ Bundle-Activator: org.jboss.tools.struts.vpe.struts.test.StrutsTestPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.vpe.ui.test;visibility:=reexport, + org.jboss.tools.vpe.base.test;visibility:=reexport, org.jboss.tools.common.text.ext, org.jboss.tools.common.model, org.jboss.tools.vpe.xulrunner, Modified: branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) +++ branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml 2010-12-01 01:29:25 UTC (rev 27041) @@ -2,7 +2,7 @@ <?eclipse version="3.3"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests description="Unit tests for Struts support in VPE" name="Struts Tests" Modified: branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) +++ branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java 2010-12-01 01:29:25 UTC (rev 27041) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.vpe.struts.test; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; import junit.framework.Test; import junit.framework.TestSuite; Modified: branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) +++ branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java 2010-12-01 01:29:25 UTC (rev 27041) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing bean struts components Modified: branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) +++ branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java 2010-12-01 01:29:25 UTC (rev 27041) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing form struts components Modified: branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) +++ branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java 2010-12-01 01:29:25 UTC (rev 27041) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing html struts components Modified: branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) +++ branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java 2010-12-01 01:29:25 UTC (rev 27041) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing logic struts components Modified: branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsNestedComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsNestedComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) +++ branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsNestedComponentTest.java 2010-12-01 01:29:25 UTC (rev 27041) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing nested struts components Modified: branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsTilesComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsTilesComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) +++ branches/jbosstools-3.2.0.Beta2/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsTilesComponentTest.java 2010-12-01 01:29:25 UTC (rev 27041) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing tiles struts components

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r27040 - in branches/jbosstools-3.2.0.Beta2: jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/META-INF and 59 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-11-30 20:19:37 -0500 (Tue, 30 Nov 2010) New Revision: 27040 Added: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.classpath branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.project branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/bin/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/build.properties branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/plugin.xml branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/pom.xml branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/schema/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/schema/vpe.ui.test.exsd branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/DOMComparisonException.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/OpenOnUtil.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ProjectsLoader.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VPEBaseTestPlugin.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTestSetup.java Removed: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DnD_JBIDE5042_JBIDE6229_Test.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.classpath branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.project branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/bin/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/build.properties branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/plugin.xml branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/pom.xml branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/schema/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/schema/vpe.ui.test.exsd branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/DOMComparisonException.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/OpenOnUtil.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ProjectsLoader.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VPEBaseTestPlugin.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTestSetup.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/schema/ Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentContentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/jbide/JBIDE3416Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/plugin.xml branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMComponentsTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JbpmVisualAllTests.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ChangeMessageBundleTest_JBIDE5818.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuDoubleInsertionTest_JBIDE3888.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuTestAbstract.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditFontFamilyTest_JBIDE5872.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditingSPecialSymbolsVPE_JBIDE3810.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ExceptionInVPEComments_JBIDE5143.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/FacetProcessingTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2297Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2354Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2550Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2828Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2979Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3144Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3197Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3247Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3376Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3396Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3473Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3482Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3519Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3617Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3734Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3969Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4037Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4179Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4337Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE5920Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1568Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MozDirtyTest_JBIDE5105.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NullPointerWithStyleProperty_JBIDE5193.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInsideJspRoot_JBIDE4852.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnJsf20Test_JBIDE5382.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SelectAllAndCut_JBIDE4853.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SelectWholeElement_JBIDE4713.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SourceDomUtilTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TaglibXMLUnformatedDTD_JBIDE5642.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestContextPathResolution.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestForUsingComponentsLibrariesWithDefaultNamespace.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestOpenOnForXhtmlFiles_JBIDE5577.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/UnclosedELExpressionTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VPERefreshTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ValidatorTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VisualRefreshComment_JBIDE6067.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VpeI18nTest_JBIDE4887.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/XulRunnerVpeUtilsTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlComponentContentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesComponentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesColumnsTemplateTestCase.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComboBoxTemplateTestCase.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesFileUploadTemplateTestCase.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesInplaceSelectTemplateTestCase.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesPickListTemplateTestCase.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1606Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1580Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1639Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/RichFacesJBIDE1169Test.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java branches/jbosstools-3.2.0.Beta2/jst/tests/org.jboss.tools.jst.css.test/plugin.xml branches/jbosstools-3.2.0.Beta2/vpe/plugins/pom.xml branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/JBIDE3280Test.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/plugin.xml branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/plugin.xml branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/editor/menu/VpePopupMenuTest.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VPETestPlugin.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java Log: https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared merge revision 27014 from trunk to jbosstools-3.2.0.Beta2 branch to decouple vpe and jsf tests to avoid cascade test skipping Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ org.eclipse.core.resources, org.eclipse.ui.ide, org.jboss.tools.common.model, - org.jboss.tools.vpe.ui.test, + org.jboss.tools.vpe.base.test, org.jboss.tools.jsf.vpe.facelets, org.jboss.tools.jsf.vpe.richfaces, org.jboss.tools.jsf.vpe.jsf, Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,6 +1,6 @@ <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests testSuite="org.jboss.tools.jsf.vpe.ajax4jsf.test.Ajax4JsfAllTests" name="Tests For Ajax For JSF Components"/> <testProject name="ajax4jsfTests" Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.ajax4jsf.test; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; import junit.framework.Test; import junit.framework.TestSuite; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.ajax4jsf.test; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; public class Ajax4JsfComponentContentTest extends ComponentContentTest { Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -12,7 +12,7 @@ org.eclipse.ui.ide, org.jboss.tools.common, org.jboss.tools.common.text.ext, - org.jboss.tools.vpe.ui.test, + org.jboss.tools.vpe.base.test, org.jboss.tools.jst.jsp, org.jboss.tools.jst.web, org.jboss.tools.vpe.xulrunner, Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests description="Facelets Tests" name="Facelets Tests" Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -14,7 +14,7 @@ import junit.framework.TestSuite; import org.jboss.tools.jsf.vpe.facelets.test.jbide.JBIDE3416Test; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; public class FaceletsAllTests { Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentContentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentContentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,6 +1,6 @@ package org.jboss.tools.jsf.vpe.facelets.test; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; public class FaceletsComponentContentTest extends ComponentContentTest { Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -19,9 +19,9 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/jbide/JBIDE3416Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/jbide/JBIDE3416Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/jbide/JBIDE3416Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.facelets.test.jbide; import org.jboss.tools.jsf.vpe.facelets.test.FaceletsAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; public class JBIDE3416Test extends ComponentContentTest { Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.jboss.tools.common, - org.jboss.tools.vpe.ui.test, + org.jboss.tools.vpe.base.test, org.junit, org.jboss.tools.jsf.vpe.ajax4jsf;bundle-version="3.1.0", org.jboss.tools.jsf.vpe.facelets;bundle-version="3.1.0", Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.4"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests name="JbpmVisualAllTests" testSuite="org.jboss.tools.jsf.vpe.jbpm.test.JbpmVisualAllTests"> Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMComponentsTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMComponentsTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMComponentsTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jbpm.test; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JbpmVisualAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JbpmVisualAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JbpmVisualAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -13,7 +13,7 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; /** * Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -16,7 +16,7 @@ org.jboss.tools.common.model, org.jboss.tools.vpe.xulrunner, org.mozilla.xpcom, - org.jboss.tools.vpe.ui.test;visibility:=reexport, + org.jboss.tools.vpe.base.test, org.eclipse.jface.text, org.jboss.tools.jsf.vpe.jsf, org.jboss.tools.jst.web, @@ -42,7 +42,8 @@ org.jboss.tools.jsf.text.ext.facelets, org.jboss.tools.jsf.text.ext.richfaces, org.jboss.tools.jst.text.ext, - org.eclipse.wst.validation + org.eclipse.wst.validation, + org.jboss.tools.tests;bundle-version="3.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.jboss.tools.jsf.vpe.jsf.test Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests name="JsfAllTests" testSuite="org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests"/> Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -19,8 +19,8 @@ import org.eclipse.core.resources.IFile; import org.jboss.tools.common.el.core.ELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,7 +15,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.jboss.tools.test.util.ResourcesUtils; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * Performs tests for JavaServer Faces 2.0 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,7 +15,6 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.ChangeMessageBundleTest_JBIDE5818; import org.jboss.tools.jsf.vpe.jsf.test.jbide.ContextMenuDoubleInsertionTest_JBIDE3888; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.DnD_JBIDE5042_JBIDE6229_Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.DocBookTemplatesTest; import org.jboss.tools.jsf.vpe.jsf.test.jbide.EditFontFamilyTest_JBIDE5872; import org.jboss.tools.jsf.vpe.jsf.test.jbide.ExceptionInVPEComments_JBIDE5143; @@ -104,7 +103,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.VisualRefreshComment_JBIDE6067; import org.jboss.tools.jsf.vpe.jsf.test.jbide.VpeI18nTest_JBIDE4887; import org.jboss.tools.jsf.vpe.jsf.test.jbide.XulRunnerVpeUtilsTest; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; /** * Class for testing all RichFaces components Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jsf.test; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * Class for testing all jsf components Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,8 +11,8 @@ package org.jboss.tools.jsf.vpe.jsf.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing all jsf components Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ChangeMessageBundleTest_JBIDE5818.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ChangeMessageBundleTest_JBIDE5818.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ChangeMessageBundleTest_JBIDE5818.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -22,8 +22,8 @@ import org.eclipse.ui.editors.text.TextEditor; import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author yradtsevich Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuDoubleInsertionTest_JBIDE3888.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuDoubleInsertionTest_JBIDE3888.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuDoubleInsertionTest_JBIDE3888.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,9 +10,9 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jsf.test.jbide; +import org.jboss.tools.vpe.base.test.TestUtil; import org.jboss.tools.vpe.editor.menu.InsertType; import org.jboss.tools.vpe.editor.menu.action.InsertAction2; -import org.jboss.tools.vpe.ui.test.TestUtil; /** Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuTestAbstract.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuTestAbstract.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuTestAbstract.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -17,8 +17,8 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ui.util.ModelUtilities; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * @author yradtsevich Deleted: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DnD_JBIDE5042_JBIDE6229_Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DnD_JBIDE5042_JBIDE6229_Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DnD_JBIDE5042_JBIDE6229_Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,246 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2009 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jsf.vpe.jsf.test.jbide; - -import java.io.IOException; -import java.lang.reflect.Field; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.swt.graphics.Point; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.dnd.VpeDnD; -import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.editor.VpeEditorPart; -import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; -import org.jboss.tools.vpe.editor.mozilla.MozillaEventAdapter; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; -import org.jmock.Expectations; -import org.jmock.Mockery; -import org.jmock.api.Invocation; -import org.jmock.lib.action.CustomAction; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMEventTarget; -import org.mozilla.interfaces.nsIDOMMouseEvent; -import org.mozilla.interfaces.nsIDOMNSUIEvent; -import org.mozilla.interfaces.nsIDOMNode; -import org.mozilla.interfaces.nsIDragService; -import org.mozilla.interfaces.nsIDragSession; -import org.mozilla.interfaces.nsIScriptableRegion; -import org.mozilla.interfaces.nsISupportsArray; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; -import org.w3c.dom.Text; - -/** - * Tests Drag&Drop functionality of the VPE. - * - * @see JIRA Issue JBIDE-5042 ( https://jira.jboss.org/jira/browse/JBIDE-5042 ): - * "Enhance DnD support in VPE" - * @see JIRA Issue JBIDE-6439 ( https://jira.jboss.org/jira/browse/JBIDE-6439 ): - * "Refactor and partially reimpement VpeDnD class" - * - * @deprecated This test is obsolete. These jMock tests for D&D require too - * many efforts and changes in non-test plug-ins to be in actual state. - * - * @author yradtsevich - */ -@SuppressWarnings("nls") -public class DnD_JBIDE5042_JBIDE6229_Test extends VpeTest { - private static final String DROP_CONTAINER_ID = "cell_01"; - private static final String DRAG_ICON_ID = "dragIcon"; - private static final String DRAGGABLE_BUTTON_ID = "draggableButton"; - private static final String DRAGGABLE_TEXT_CONTAINER_ID = "draggableTextContainer"; - private static final String TEST_PAGE_NAME = "JBIDE/5042_6229/JBIDE-5042-6229.html"; - private static final String DND_TEXT = "Text"; - private static final Point DRAG_POINT = new Point(0, 0); - /**Cells in the table are 100x100px. Thus this point means 'top of the second cell'*/ - private static final Point DROP_POINT = new Point(150, 10); - private Mockery context = new Mockery(); - - public DnD_JBIDE5042_JBIDE6229_Test(String name) { - super(name); - } - - /** - * Try to open two pages in VPE and refresh them n times. - */ - public void testElementDnDWithMocks() throws Throwable { - setException(null); - - JSPMultiPageEditor editor = openPageInVpe(TEST_PAGE_NAME); - final MozillaEditor visualEditor = ((VpeEditorPart) editor.getVisualEditor()) - .getVisualEditor(); - VpeController controller = TestUtil.getVpeController(editor); - TestUtil.waitForJobs(); - - Element draggable = findSourceElementById(controller, DRAGGABLE_BUTTON_ID); - IndexedRegion region = (IndexedRegion) draggable; - setSelectedRange(controller, region.getStartOffset(), - region.getEndOffset() - region.getStartOffset()); - TestUtil.waitForJobs(); - - executeSelectionDragAndDropToSecondCell(visualEditor, controller); - - draggable = findSourceElementById(controller, DRAGGABLE_BUTTON_ID); - assertEquals(DROP_CONTAINER_ID, ((Element)draggable.getParentNode()).getAttribute("id")); - - if (getException() != null) { - throw getException(); - } - } - - public void testTextDnDWithMocks() throws Throwable { - setException(null); - - JSPMultiPageEditor editor = openPageInVpe(TEST_PAGE_NAME); - final MozillaEditor visualEditor = ((VpeEditorPart) editor.getVisualEditor()) - .getVisualEditor(); - VpeController controller = TestUtil.getVpeController(editor); - TestUtil.waitForJobs(); - - Element draggableTextContainer = findSourceElementById(controller, DRAGGABLE_TEXT_CONTAINER_ID); - Text draggableTextNode = (Text) draggableTextContainer.getChildNodes().item(0); - IndexedRegion draggableTextRegion = (IndexedRegion)draggableTextNode; - setSelectedRange(controller, - draggableTextRegion.getEndOffset() - DND_TEXT.length(), DND_TEXT.length()); - TestUtil.waitForJobs(); - - executeSelectionDragAndDropToSecondCell(visualEditor, controller); - - Element dropContainer = findSourceElementById(controller, DROP_CONTAINER_ID); - NodeList dropContainerChildren = dropContainer.getChildNodes(); - assertTrue(dropContainerChildren.getLength() == 1); - assertTrue(dropContainerChildren.item(0) instanceof Text); - - String dropContainerContent = ((Text)dropContainerChildren.item(0)).getNodeValue(); - - assertEquals(DND_TEXT + "dddddd", dropContainerContent); - - if (getException() != null) { - throw getException(); - } - } - - private void executeSelectionDragAndDropToSecondCell( - final MozillaEditor visualEditor, VpeController controller) - throws Throwable { - final nsIDragService dragService = mock(nsIDragService.class); - final nsIDragSession dragSession = mock(nsIDragSession.class); - checking(new Expectations() {{ - allowing(dragService).getCurrentSession(); will(returnValue(dragSession)); - allowing(dragSession).getSourceDocument(); will(returnValue(visualEditor.getDomDocument())); - allowing(dragSession).setCanDrop(with(any(Boolean.TYPE))); - }}); - replaceDragService(controller.getVpeDnD(), dragService); - - final nsIDOMElement dragIcon = controller.getXulRunnerEditor() - .getDOMDocument().getElementById(DRAG_ICON_ID); - - final nsIDOMMouseEvent mouseDownEvent = createMockMouseEvent( - DRAG_POINT, "mousedown", dragIcon, "mouseDown"); - final nsIDOMMouseEvent dragOverMouseEvent = createMockMouseEvent( - DROP_POINT, "dragover", null, "dragover"); - final nsIDOMMouseEvent dragDropMouseEvent = createMockMouseEvent( - DROP_POINT, "dragdrop", null, "dragdrop"); - - final MozillaEventAdapter eventListener = visualEditor.getMozillaEventAdapter(); - checking(new Expectations() {{ - allowing(dragService).invokeDragSession( - with(any(nsIDOMNode.class)), with(any(nsISupportsArray.class)), - with(any(nsIScriptableRegion.class)), with(any(Long.TYPE))); - will(new CustomAction("invokeDragSession") { - public Object invoke(Invocation invocation) throws Throwable { - eventListener.handleEvent(dragOverMouseEvent); - TestUtil.waitForJobs(); - eventListener.handleEvent(dragDropMouseEvent); - TestUtil.waitForJobs(); - return null; - } - }); - }}); - - eventListener.handleEvent(mouseDownEvent); - TestUtil.waitForJobs(); - TestUtil.delay(100); - TestUtil.waitForJobs(); - } - - private nsIDOMMouseEvent createMockMouseEvent(final Point mousePos, - final String type, final nsIDOMElement targetElement, String name) { - final nsIDOMMouseEvent mouseEvent = mock(nsIDOMMouseEvent.class, name + "_nsIDOMMouseEvent"); - final nsIDOMEventTarget mouseEventTarget = mock(nsIDOMEventTarget.class, name + "_nsIDOMEventTarget"); - final nsIDOMNSUIEvent mouseNsUIEvent = mock(nsIDOMNSUIEvent.class, name + "_nsIDOMNSUIEvent"); - - checking(new Expectations() {{ - allowing(mouseEvent).getType(); will(returnValue(type)); - allowing(mouseEvent).getButton(); will(returnValue(VpeController.LEFT_BUTTON)); - allowing(mouseEvent).getTarget(); will(returnValue(mouseEventTarget)); - allowing(mouseEvent).queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); will(returnValue(mouseEvent)); - allowing(mouseEventTarget).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); will(returnValue(targetElement)); - allowing(mouseEvent).queryInterface(nsIDOMNSUIEvent.NS_IDOMNSUIEVENT_IID); will(returnValue(mouseNsUIEvent)); - allowing(mouseEvent).getClientX(); will(returnValue(mousePos.x)); - allowing(mouseEvent).getClientY(); will(returnValue(mousePos.y)); - allowing(mouseNsUIEvent).getPageX(); will(returnValue(mousePos.x)); - allowing(mouseNsUIEvent).getPageY(); will(returnValue(mousePos.y)); - allowing(mouseEvent).stopPropagation(); - allowing(mouseEvent).preventDefault(); - }}); - - return mouseEvent; - } - - private void replaceDragService(VpeDnD vpeDnD, nsIDragService dragService) throws Throwable { - Field dragServiceField = vpeDnD.getClass().getDeclaredField("dragService"); - dragServiceField.setAccessible(true); - dragServiceField.set(vpeDnD, dragService); - } - - private JSPMultiPageEditor openPageInVpe(final String pageName) throws CoreException, - PartInitException, IOException { - IFile elementPageFile = (IFile) TestUtil.getComponentPath( - pageName, JsfAllTests.IMPORT_PROJECT_NAME); - IEditorInput input = new FileEditorInput(elementPageFile); - - JSPMultiPageEditor editor = (JSPMultiPageEditor) PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage().openEditor(input, - EDITOR_ID, true); - - return editor; - } - - private void setSelectedRange(VpeController controller, int offset, int length) { - controller.getPageContext().getSourceBuilder().getStructuredTextViewer() - .setSelectedRange(offset, length); - } - - /** @see org.jmock.Mockery#mock(java.lang.Class, java.lang.String) */ - public <T> T mock(Class<T> typeToMock, String name) { - return context.mock(typeToMock, name); - } - - /** @see org.jmock.Mockery#mock(java.lang.Class) */ - public <T> T mock(Class<T> typeToMock) { - return context.mock(typeToMock); - } - - /** @see org.jmock.Mockery#checking(Expectations) */ - public void checking(Expectations expectations) { - context.checking(expectations); - } -} Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -4,8 +4,8 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Junit test class for https://jira.jboss.org/browse/JBIDE-6600 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditFontFamilyTest_JBIDE5872.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditFontFamilyTest_JBIDE5872.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditFontFamilyTest_JBIDE5872.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -17,9 +17,9 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * Test for JBIDE-5872: VPE throws java.lang.NullPointerException, Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditingSPecialSymbolsVPE_JBIDE3810.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditingSPecialSymbolsVPE_JBIDE3810.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditingSPecialSymbolsVPE_JBIDE3810.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,10 +10,10 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMAbstractView; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMDocumentEvent; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ExceptionInVPEComments_JBIDE5143.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ExceptionInVPEComments_JBIDE5143.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ExceptionInVPEComments_JBIDE5143.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -17,8 +17,8 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/FacetProcessingTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/FacetProcessingTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/FacetProcessingTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** *JUnit for https://jira.jboss.org/jira/browse/JBIDE-5768 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -16,8 +16,8 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * Test JBIDE-1460 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -21,8 +21,8 @@ import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author Max Areshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -21,8 +21,8 @@ import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,11 +20,11 @@ import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.template.VpeTemplate; import org.jboss.tools.vpe.editor.template.VpeTemplateManager; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.w3c.dom.Node; /** Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,9 +20,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,9 +20,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,9 +20,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,9 +15,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2010Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,8 +20,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.jboss.tools.jsf.vpe.jsf.test.CommonJBIDE2010Test; +import org.jboss.tools.vpe.base.test.TestUtil; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,9 +20,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -17,8 +17,8 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2297Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2297Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2297Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -13,8 +13,8 @@ import org.eclipse.core.resources.IFile; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Test case for Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2354Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2354Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2354Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -8,9 +8,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.TestUtil; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; -import org.jboss.tools.vpe.ui.test.TestUtil; public class JBIDE2354Test extends ComponentContentTest { Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,10 +15,10 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -16,9 +16,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsISelectionController; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -16,11 +16,11 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.SelectionUtil; import org.jboss.tools.vpe.editor.util.TextUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsISelection; import org.mozilla.interfaces.nsISelectionController; import org.w3c.dom.Document; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2550Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2550Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2550Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -30,12 +30,12 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.jboss.tools.jsf.vpe.jsf.test.CommonJBIDE2010Test; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.SelectionUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -16,12 +16,12 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; import org.jboss.tools.vpe.editor.template.VpeTemplate; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Node; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -25,11 +25,11 @@ import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceList; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -16,9 +16,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * Test class for JBIDE-2774 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2828Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2828Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2828Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -14,7 +14,7 @@ import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserFactory; import org.jboss.tools.common.el.core.parser.ELParserUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Test case for jbide-2828 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2979Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2979Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2979Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -18,8 +18,8 @@ import org.jboss.tools.common.el.core.ELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Test case for JBIDE-2979 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -21,9 +21,9 @@ import org.eclipse.ui.ide.IDE; import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeEditorPart; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * Test class for JBIDE-3030 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,10 +15,10 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * Test case for JBIDE-3127 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3144Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3144Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3144Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,8 +20,8 @@ import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; -import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.base.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.TestUtil; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,9 +15,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3197Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3197Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3197Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3247Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3247Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3247Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3376Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3376Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3376Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3396Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3396Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3396Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -17,9 +17,9 @@ import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * @author Max Areshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -22,9 +22,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3473Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3473Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3473Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,11 +11,11 @@ import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.VisualDomUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.jboss.tools.vpe.xulrunner.util.XulRunnerVpeUtils; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3482Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3482Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3482Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,8 +11,8 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.ComponentContentTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; import org.mozilla.interfaces.nsIDOMElement; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3519Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3519Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3519Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,9 +11,9 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.eclipse.swt.graphics.Point; +import org.jboss.tools.vpe.base.test.TestUtil; import org.jboss.tools.vpe.editor.menu.InsertType; import org.jboss.tools.vpe.editor.menu.action.InsertAction2; -import org.jboss.tools.vpe.ui.test.TestUtil; /** * Tests for JIRA issue JBIDE-3519: Ctrl+Z (Undo) doesn't work Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3617Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3617Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3617Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -18,9 +18,9 @@ import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * Test case for issue <a href='https://jira.jboss.org/jira/browse/JBIDE-3617'>JBIDE-3617</a>: Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,8 +15,8 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -17,10 +17,10 @@ import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.util.NodesManagingUtil; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.TextUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Element; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3734Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3734Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3734Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -21,10 +21,10 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNodeList; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3969Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3969Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3969Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,8 +15,8 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4037Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4037Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4037Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -5,9 +5,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMElement; /** Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4179Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4179Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4179Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -17,9 +17,9 @@ import org.jboss.tools.common.el.core.ELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.TestUtil; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; -import org.jboss.tools.vpe.ui.test.TestUtil; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -19,9 +19,9 @@ import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.ITaglibMapping; import org.jboss.tools.jst.web.tld.TaglibMapping; -import org.jboss.tools.vpe.ui.test.ProjectsLoader; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.ProjectsLoader; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author V.Kabanovich Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4337Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4337Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4337Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -12,9 +12,9 @@ import org.eclipse.swt.custom.StyledText; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -19,10 +19,10 @@ import org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl; import org.jboss.tools.common.model.impl.CustomizedObjectImpl; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.SelectionUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Node; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -29,9 +29,9 @@ import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.OpenOnUtil; -import org.jboss.tools.vpe.ui.test.ProjectsLoader; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.OpenOnUtil; +import org.jboss.tools.vpe.base.test.ProjectsLoader; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -24,9 +24,9 @@ import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.ProjectsLoader; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.ProjectsLoader; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMDocumentType; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -27,10 +27,10 @@ import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.TaglibMapping; +import org.jboss.tools.vpe.base.test.ProjectsLoader; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.ProjectsLoader; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE5920Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE5920Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE5920Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,9 +20,9 @@ import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.OpenOnUtil; -import org.jboss.tools.vpe.ui.test.ProjectsLoader; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.OpenOnUtil; +import org.jboss.tools.vpe.base.test.ProjectsLoader; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author V.I.Kabanovich Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -18,11 +18,11 @@ import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Node; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -30,8 +30,8 @@ import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author Max Areshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -19,11 +19,11 @@ import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,8 +11,8 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * JUnit test class for https://jira.jboss.org/browse/JBIDE-6965 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -21,9 +21,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNamedNodeMap; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -21,9 +21,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNamedNodeMap; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1568Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1568Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1568Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -12,8 +12,8 @@ import org.eclipse.core.resources.IFile; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * @author Max Areshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -21,9 +21,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNamedNodeMap; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -18,10 +18,10 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.DocTypeUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMDocumentType; import org.mozilla.interfaces.nsIDOMElement; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -28,12 +28,12 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; import org.jboss.tools.vpe.editor.util.SelectionUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -17,9 +17,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.TestUtil; import org.jboss.tools.vpe.editor.mozilla.MozillaPreview; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; -import org.jboss.tools.vpe.ui.test.TestUtil; import org.mozilla.interfaces.nsIDOMElement; /** Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MozDirtyTest_JBIDE5105.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MozDirtyTest_JBIDE5105.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MozDirtyTest_JBIDE5105.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,10 +11,10 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDOMNodeList; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NullPointerWithStyleProperty_JBIDE5193.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NullPointerWithStyleProperty_JBIDE5193.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NullPointerWithStyleProperty_JBIDE5193.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -7,9 +7,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; public class NullPointerWithStyleProperty_JBIDE5193 extends VpeTest { Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -18,11 +18,11 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.OpenOnUtil; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.OpenOnUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -25,9 +25,9 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.editors.text.EditorsUI; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.OpenOnUtil; -import org.jboss.tools.vpe.ui.test.ProjectsLoader; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.OpenOnUtil; +import org.jboss.tools.vpe.base.test.ProjectsLoader; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInsideJspRoot_JBIDE4852.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInsideJspRoot_JBIDE4852.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInsideJspRoot_JBIDE4852.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -18,10 +18,10 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.OpenOnUtil; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.OpenOnUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnJsf20Test_JBIDE5382.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnJsf20Test_JBIDE5382.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnJsf20Test_JBIDE5382.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,10 +15,10 @@ import org.jboss.tools.jsf.vpe.jsf.template.util.JSF; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.util.NodesManagingUtil; +import org.jboss.tools.vpe.base.test.OpenOnUtil; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.OpenOnUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -26,9 +26,9 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.editors.text.EditorsUI; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.OpenOnUtil; -import org.jboss.tools.vpe.ui.test.ProjectsLoader; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.OpenOnUtil; +import org.jboss.tools.vpe.base.test.ProjectsLoader; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,8 +15,8 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,8 +20,8 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * https://jira.jboss.org/jira/browse/JBIDE-5908 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SelectAllAndCut_JBIDE4853.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SelectAllAndCut_JBIDE4853.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SelectAllAndCut_JBIDE4853.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -12,9 +12,9 @@ import org.eclipse.swt.custom.StyledText; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; /** Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SelectWholeElement_JBIDE4713.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SelectWholeElement_JBIDE4713.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SelectWholeElement_JBIDE4713.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -16,11 +16,11 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.SelectionUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SourceDomUtilTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SourceDomUtilTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/SourceDomUtilTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -13,9 +13,9 @@ import java.text.MessageFormat; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.SourceDomUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TaglibXMLUnformatedDTD_JBIDE5642.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TaglibXMLUnformatedDTD_JBIDE5642.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TaglibXMLUnformatedDTD_JBIDE5642.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -19,8 +19,8 @@ import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; import org.jboss.tools.jst.web.ui.navigator.WebProjectsNavigator; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestContextPathResolution.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestContextPathResolution.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestContextPathResolution.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * https://jira.jboss.org/jira/browse/JBIDE-5985 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -26,10 +26,10 @@ import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.VpePlugin; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.w3c.dom.Element; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestForUsingComponentsLibrariesWithDefaultNamespace.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestForUsingComponentsLibrariesWithDefaultNamespace.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestForUsingComponentsLibrariesWithDefaultNamespace.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestOpenOnForXhtmlFiles_JBIDE5577.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestOpenOnForXhtmlFiles_JBIDE5577.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestOpenOnForXhtmlFiles_JBIDE5577.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,10 +20,10 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.SelectionUtil; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Node; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/UnclosedELExpressionTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/UnclosedELExpressionTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/UnclosedELExpressionTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * Junit test for https://jira.jboss.org/jira/browse/JBIDE-6064 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VPERefreshTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VPERefreshTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VPERefreshTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -20,9 +20,9 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMElement; /** Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ValidatorTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ValidatorTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ValidatorTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,10 +11,10 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.wst.validation.ValidationFramework; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.ProjectsLoader; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.VpeDebugUtil; -import org.jboss.tools.vpe.ui.test.ProjectsLoader; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VisualRefreshComment_JBIDE6067.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VisualRefreshComment_JBIDE6067.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VisualRefreshComment_JBIDE6067.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -18,8 +18,8 @@ import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDOMNodeList; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VpeI18nTest_JBIDE4887.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VpeI18nTest_JBIDE4887.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VpeI18nTest_JBIDE4887.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * Tests for JIRA issue JBIDE-4887: Internationalization does not work in VPE Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/XulRunnerVpeUtilsTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/XulRunnerVpeUtilsTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/XulRunnerVpeUtilsTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -14,8 +14,8 @@ import org.eclipse.swt.graphics.Rectangle; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.jboss.tools.vpe.xulrunner.util.XulRunnerVpeUtils; import org.mozilla.interfaces.nsIDOMElement; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -14,6 +14,6 @@ org.jboss.tools.vpe.jsp;bundle-version="3.1.0" Bundle-ActivationPolicy: lazy Import-Package: org.jboss.tools.tests, - org.jboss.tools.vpe.ui.test + org.jboss.tools.vpe.base.test Export-Package: org.jboss.tools.jsf.vpe.jstl.test Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,6 +1,6 @@ <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests testSuite="org.jboss.tools.jsf.vpe.jstl.test.JstlAllTests" name="Tests For Jstl Components"/> <testProject name="jstlTests" Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -13,7 +13,7 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; public class JstlAllTests { Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlComponentContentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlComponentContentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,6 +1,6 @@ package org.jboss.tools.jsf.vpe.jstl.test; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; public class JstlComponentContentTest extends ComponentContentTest { Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -6,7 +6,7 @@ Bundle-Activator: org.jboss.tools.jsf.vpe.myfaces.test.MyFacesTestPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.vpe.ui.test, + org.jboss.tools.vpe.base.test, org.eclipse.core.resources, org.junit, org.jboss.tools.jsf.vpe.jsf;bundle-version="3.1.0", Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests name="MyFaces Tests" testSuite="org.jboss.tools.jsf.vpe.myfaces.test.MyFacesAllTests"> Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -3,7 +3,7 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; /** * The Class MyFacesAllTests. Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,8 +2,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.PartInitException; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; public class MyFacesComponentTest extends VpeTest { Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ org.eclipse.ui.ide, org.jboss.tools.jst.jsp, org.mozilla.xpcom, - org.jboss.tools.vpe.ui.test, + org.jboss.tools.vpe.base.test, org.jboss.tools.common.el.core;bundle-version="2.0.0", org.jboss.tools.jsf.vpe.richfaces, org.jboss.tools.jsf.vpe.ajax4jsf, Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests testSuite="org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests" name="Tests For Rich Faces Components"/> Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -23,7 +23,7 @@ import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1639Test; import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1682Test; import org.jboss.tools.jsf.vpe.richfaces.test.jbide.RichFacesJBIDE1169Test; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; /** * Class for testing all RichFaces components Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesColumnsTemplateTestCase.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesColumnsTemplateTestCase.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesColumnsTemplateTestCase.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -13,7 +13,7 @@ package org.jboss.tools.jsf.vpe.richfaces.test; -import static org.jboss.tools.vpe.ui.test.TestUtil.performTestForRichFacesComponent; +import static org.jboss.tools.vpe.base.test.TestUtil.performTestForRichFacesComponent; import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; import java.util.ArrayList; @@ -21,9 +21,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComboBoxTemplateTestCase.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComboBoxTemplateTestCase.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComboBoxTemplateTestCase.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -19,9 +19,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.PartInitException; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.richfaces.test; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * Class for testing all richfaces components Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -12,8 +12,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.PartInitException; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing all RichFaces components Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesFileUploadTemplateTestCase.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesFileUploadTemplateTestCase.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesFileUploadTemplateTestCase.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -5,8 +5,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.PartInitException; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesInplaceSelectTemplateTestCase.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesInplaceSelectTemplateTestCase.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesInplaceSelectTemplateTestCase.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -16,8 +16,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.PartInitException; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesPickListTemplateTestCase.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesPickListTemplateTestCase.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesPickListTemplateTestCase.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -19,10 +19,10 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,10 +10,10 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1606Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1606Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1606Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -19,9 +19,9 @@ import org.eclipse.core.resources.IFile; import org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,9 +10,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -19,9 +19,9 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -21,9 +21,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1580Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1580Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1580Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -22,10 +22,10 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -23,9 +23,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1639Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1639Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1639Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -21,10 +21,10 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNamedNodeMap; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -13,10 +13,10 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/RichFacesJBIDE1169Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/RichFacesJBIDE1169Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/RichFacesJBIDE1169Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -14,9 +14,9 @@ import org.jboss.tools.common.el.core.ELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.util.ElService; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; /** * @author mareshkau Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ org.eclipse.core.resources, org.eclipse.ui.ide, org.jboss.tools.common, - org.jboss.tools.vpe.ui.test, + org.jboss.tools.vpe.base.test, org.jboss.tools.jst.jsp, org.jboss.tools.vpe.xulrunner, org.mozilla.xpcom, Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests name="Vpe test's for seam ui components" testSuite="org.jboss.tools.jsf.vpe.seam.test.SeamAllTests"/> Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.seam.test; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; import junit.framework.Test; import junit.framework.TestSuite; Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,6 +1,6 @@ package org.jboss.tools.jsf.vpe.seam.test; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; public class SeamComponentContentTest extends ComponentContentTest { Modified: branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,8 +11,8 @@ package org.jboss.tools.jsf.vpe.seam.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing all Seam components Modified: branches/jbosstools-3.2.0.Beta2/jst/tests/org.jboss.tools.jst.css.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/jst/tests/org.jboss.tools.jst.css.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/jst/tests/org.jboss.tools.jst.css.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests name="CSS Views test " testSuite="org.jboss.tools.jst.css.test.CSSAllTests"> Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test) Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.classpath =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/.classpath 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.classpath 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.classpath (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/.classpath) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.classpath (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.classpath 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.project =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/.project 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.project 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.jboss.tools.vpe.base.test</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.project (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/.project) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.project (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/.project 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.vpe.base.test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF) Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,28 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: VPE Base Classes for tests -Bundle-SymbolicName: org.jboss.tools.vpe.base.test;singleton:=true -Bundle-Version: 1.0.0.qualifier -Bundle-Vendor: JBoss by RedHat -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", - org.junit, - org.eclipse.core.runtime;bundle-version="3.6.0", - org.jboss.tools.common;bundle-version="3.2.0", - org.eclipse.core.resources;bundle-version="3.6.0", - org.jboss.tools.tests;bundle-version="3.1.0", - org.eclipse.jface.text;bundle-version="3.6.0", - org.eclipse.wst.sse.core;bundle-version="1.1.500", - org.eclipse.wst.sse.ui;bundle-version="1.2.0", - org.jboss.tools.vpe;bundle-version="3.2.0", - org.eclipse.ui.ide;bundle-version="3.6.0", - org.jboss.tools.jst.jsp;bundle-version="3.2.0", - org.eclipse.wst.xml.xpath.core;bundle-version="1.1.1", - org.mozilla.xpcom;bundle-version="1.9.1", - org.jboss.tools.vpe.xulrunner;bundle-version="3.2.0", - org.jboss.tools.common.text.ext;bundle-version="3.2.0", - org.jboss.tools.common.model.ui;bundle-version="3.2.0", - org.jboss.tools.jst.css;bundle-version="3.2.0" -Export-Package: org.jboss.tools.vpe.base.test -Bundle-Activator: org.jboss.tools.vpe.base.test.VPEBaseTestPlugin -Bundle-ActivationPolicy: lazy Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,29 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: VPE Base Classes for tests +Bundle-SymbolicName: org.jboss.tools.vpe.base.test;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: JBoss by RedHat +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", + org.junit, + org.eclipse.core.runtime;bundle-version="3.6.0", + org.jboss.tools.common;bundle-version="3.2.0", + org.eclipse.core.resources;bundle-version="3.6.0", + org.jboss.tools.tests;bundle-version="3.1.0", + org.eclipse.jface.text;bundle-version="3.6.0", + org.eclipse.wst.sse.core;bundle-version="1.1.500", + org.eclipse.wst.sse.ui;bundle-version="1.2.0", + org.jboss.tools.vpe;bundle-version="3.2.0", + org.eclipse.ui.ide;bundle-version="3.6.0", + org.jboss.tools.jst.jsp;bundle-version="3.2.0", + org.eclipse.wst.xml.xpath.core;bundle-version="1.1.1", + org.mozilla.xpcom;bundle-version="1.9.1", + org.jboss.tools.vpe.xulrunner;bundle-version="3.2.0", + org.jboss.tools.common.text.ext;bundle-version="3.2.0", + org.jboss.tools.common.model.ui;bundle-version="3.2.0", + org.jboss.tools.jst.css;bundle-version="3.2.0", + org.eclipse.wst.validation;bundle-version="1.2.200" +Export-Package: org.jboss.tools.vpe.base.test +Bundle-Activator: org.jboss.tools.vpe.base.test.VPEBaseTestPlugin +Bundle-ActivationPolicy: lazy Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/bin (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/bin) Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/build.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/build.properties 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/build.properties 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/build.properties (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/build.properties) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/build.properties (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/build.properties 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/plugin.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/plugin.xml 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.4"?> -<plugin> - <extension-point id="org.jboss.tools.vpe.ui.test" name="Visual Page Editor Junit Test" schema="schema/vpe.ui.test.exsd"/> -</plugin> Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/plugin.xml (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/plugin.xml) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/plugin.xml (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension-point id="org.jboss.tools.vpe.ui.test" name="Visual Page Editor Junit Test" schema="schema/vpe.ui.test.exsd"/> +</plugin> Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/pom.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/pom.xml 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/pom.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,14 +0,0 @@ -<project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools.vpe.tests</groupId> - <artifactId>org.jboss.tools.vpe.base.test</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> - -</project> Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/pom.xml (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/pom.xml) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/pom.xml (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/pom.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,14 @@ +<project +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.vpe.tests</groupId> + <artifactId>org.jboss.tools.vpe.base.test</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/schema (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/schema) Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/schema/vpe.ui.test.exsd =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/schema/vpe.ui.test.exsd 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/schema/vpe.ui.test.exsd 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,146 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<schema targetNamespace="org.jboss.tools.vpe.base.test" xmlns="http://www.w3.org/2001/XMLSchema"> -<annotation> - <appinfo> - <meta.schema plugin="org.jboss.tools.vpe.base.test" id="vpe.ui.test" name="Visual Editor Tests"/> - </appinfo> - <documentation> - [Enter description of this extension point.] - </documentation> - </annotation> - - <element name="extension"> - <annotation> - <appinfo> - <meta.element /> - </appinfo> - </annotation> - <complexType> - <sequence> - <element ref="tests"/> - <element ref="testProject" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appinfo> - <meta.attribute translatable="true"/> - </appinfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="tests"> - <complexType> - <attribute name="testSuite" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - <appinfo> - <meta.attribute kind="java"/> - </appinfo> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="description" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="testProject"> - <annotation> - <documentation> - Project to be loaded to perform the tests. -Example of using: -<testProject name="jsfTest" path="resources/jsfTest"/> - </documentation> - </annotation> - <complexType> - <attribute name="name" type="string" use="required"> - <annotation> - <documentation> - Name of the project. - </documentation> - </annotation> - </attribute> - <attribute name="path" type="string" use="required"> - <annotation> - <documentation> - Path to the project within the plugin. - </documentation> - <appinfo> - <meta.attribute kind="resource"/> - </appinfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appinfo> - <meta.section type="since"/> - </appinfo> - <documentation> - [Enter the first release in which this extension point appears.] - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="examples"/> - </appinfo> - <documentation> - [Enter extension point usage example here.] - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="apiInfo"/> - </appinfo> - <documentation> - [Enter API information here.] - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="implementation"/> - </appinfo> - <documentation> - [Enter information about supplied implementation of this extension point.] - </documentation> - </annotation> - - -</schema> Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/schema/vpe.ui.test.exsd (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/schema/vpe.ui.test.exsd) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/schema/vpe.ui.test.exsd (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/schema/vpe.ui.test.exsd 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,146 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<schema targetNamespace="org.jboss.tools.vpe.base.test" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appinfo> + <meta.schema plugin="org.jboss.tools.vpe.base.test" id="vpe.ui.test" name="Visual Editor Tests"/> + </appinfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appinfo> + <meta.element /> + </appinfo> + </annotation> + <complexType> + <sequence> + <element ref="tests"/> + <element ref="testProject" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appinfo> + <meta.attribute translatable="true"/> + </appinfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="tests"> + <complexType> + <attribute name="testSuite" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + <appinfo> + <meta.attribute kind="java"/> + </appinfo> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="description" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + </complexType> + </element> + + <element name="testProject"> + <annotation> + <documentation> + Project to be loaded to perform the tests. +Example of using: +<testProject name="jsfTest" path="resources/jsfTest"/> + </documentation> + </annotation> + <complexType> + <attribute name="name" type="string" use="required"> + <annotation> + <documentation> + Name of the project. + </documentation> + </annotation> + </attribute> + <attribute name="path" type="string" use="required"> + <annotation> + <documentation> + Path to the project within the plugin. + </documentation> + <appinfo> + <meta.attribute kind="resource"/> + </appinfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appinfo> + <meta.section type="since"/> + </appinfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="examples"/> + </appinfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="apiInfo"/> + </appinfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="implementation"/> + </appinfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + +</schema> Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src) Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org) Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss) Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools) Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe) Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base) Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test) Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,373 +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.tools.vpe.base.test; - -import java.io.File; -import java.io.FileNotFoundException; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.test.util.WorkbenchUtils; -import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; -import org.jboss.tools.vpe.editor.util.SourceDomUtil; -import org.jboss.tools.vpe.base.test.VpeTest; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNode; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * @author Sergey Dzmitrovich - * - */ -public abstract class ComponentContentTest extends VpeTest { - - public static final String XML_FILE_EXTENSION = ".xml"; //$NON-NLS-1$ - - public ComponentContentTest(String name) { - super(name); - } - - /** - * - * there are several conditions: - * - * 1) xml file which contain tests must be named 'name of test page' + - * '.xml' - * - * Example: test.jsp and test.jsp.xml - * - * 2) a tag <test> in xml file and required element in test page must have - * the same attribute "id" - * - * Example: <tests>... <test id="testId" > ...<tests> - in xml file and - * - * <html>... <x:testElement id="testId" > ... </html> - in test page - * - * @param elementPagePath - * - path to test page - * @throws Throwable - */ - protected void performContentTest(String elementPagePath) throws Throwable { - performContentTestByFullPath(TestUtil.COMPONENTS_PATH + elementPagePath); - } - - protected void performContentTestByFullPath(String elementPagePath) throws Throwable { - setException(null); - IFile elementPageFile = (IFile) TestUtil.getComponentFileByFullPath( - elementPagePath, getTestProjectName()); - TestUtil.waitForIdle(); - /* - * Test that test file was found and exists - */ - assertNotNull("Could not find component file '"+elementPagePath+"'", elementPageFile); //$NON-NLS-1$ //$NON-NLS-2$ - - IEditorPart editor = WorkbenchUtils.openEditor(elementPageFile,getEditorID()); - assertNotNull("Editor should be opened.", editor); //$NON-NLS-1$ - VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor); - /* - * Get xml test file - */ - File xmlTestFile = TestUtil.getComponentFileByFullPath( - elementPagePath + XML_FILE_EXTENSION, getTestProjectName()) - .getLocation().toFile(); - /* - * Test that XML test file was found and exists - */ - assertNotNull("Could not find XML component file '"+elementPagePath + XML_FILE_EXTENSION+"'", elementPageFile); //$NON-NLS-1$ //$NON-NLS-2$ - /* - * Get document - */ - compareContent(controller, xmlTestFile); - if (getException() != null) { - throw getException(); - } - } - - protected void compareContent(VpeController controller, File xmlTestFile) - throws FileNotFoundException { - Document xmlTestDocument = TestDomUtil.getDocument(xmlTestFile); - assertNotNull("Can't get test file, possibly file not exists "+xmlTestFile,xmlTestDocument); //$NON-NLS-1$ - - List<String> ids = TestDomUtil.getTestIds(xmlTestDocument); - - for (String id : ids) { - try{ - compareElements(controller, xmlTestDocument, id, id); - } catch (DOMComparisonException e) { - String xPathToNode = SourceDomUtil.getXPath(e.getNode()); - String testFileName = xmlTestFile.getPath(); - String message = e.getMessage(); - fail(String.format("%s[%s]:\n%s", testFileName, xPathToNode, message)); //$NON-NLS-1$ - } - } - } - - /** - * - * @param controller - * @param xmlTestDocument - * @param elementId - * @param xmlTestId - * @return - * @throws DOMComparisonException - */ - private void compareElements(VpeController controller, - Document xmlTestDocument, String elementId, String xmlTestId) - throws DOMComparisonException { - // get element by id - nsIDOMElement vpeElement = findElementById(controller, elementId); - assertNotNull("Cann't find element with id="+elementId,vpeElement); //$NON-NLS-1$ - - // DOMTreeDumper dumper = new DOMTreeDumper( - // VpeDebug.VISUAL_DUMP_PRINT_HASH); - // dumper.dumpToStream(System.out, vpeElement); - - // get test element by id - get <test id="..." > element and get his - // first child - Element xmlModelElement = TestDomUtil.getFirstChildElement(TestDomUtil - .getElemenById(xmlTestDocument, xmlTestId)); - - assertNotNull(xmlModelElement); - - TestDomUtil.compareNodes(vpeElement, xmlModelElement); - } - - /** - * test for invisible tags - * - * @param elementPagePath - * - path to test page - * @param elementId - * - id of element on page - * @throws Throwable - */ - protected void performInvisibleTagTest(String elementPagePath, - String elementId) throws Throwable { - performInvisibleTagTestByFullPath(TestUtil.COMPONENTS_PATH - + elementPagePath, elementId); - } - - /** - * test for invisible tags - * - * @param elementPagePath - * - path to test page - * @param elementId - * - id of element on page - * @throws Throwable - */ - protected void performInvisibleTagTestByFullPath(String elementPagePath, - String elementId) throws Throwable { - setException(null); - - IFile elementPageFile = (IFile) TestUtil.getComponentFileByFullPath( - elementPagePath, getTestProjectName()); - /* - * Test that test file was found and exists - */ - assertNotNull("Could not find component file '"+elementPagePath+"'", elementPageFile); //$NON-NLS-1$ //$NON-NLS-2$ - /* - * Open the editor - */ - IEditorInput input = new FileEditorInput(elementPageFile); - TestUtil.waitForJobs(); - IEditorPart editor = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage().openEditor(input, - getEditorID(), true); - assertNotNull("Editor should be opened.", editor); //$NON-NLS-1$ - TestUtil.waitForJobs(); - /* - * Get the controller - */ - VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor); - /* - * Find source element and check if it is not null - */ - Element sourceElement = findSourceElementById(controller, elementId); - assertNotNull("Source node with id '" + elementId + "' was not found.", sourceElement); //$NON-NLS-1$ //$NON-NLS-2$ - /* - * Find visual element and check if it is null - */ - nsIDOMElement visualElement = findElementById(controller, elementId); - assertNull("Source node with id '" + elementId + "' has visual representation.", visualElement); //$NON-NLS-1$ //$NON-NLS-2$ - - /* - * Set show invisible tag's flag to true - */ - controller.getVisualBuilder().setShowInvisibleTags(true); - controller.visualRefresh(); - - /* - * Find visual element and check if it is not null - */ - visualElement = findElementById(controller, elementId,TestUtil.MAX_IDLE); - assertNotNull(visualElement); - - /* - * Generate text for invisible tag - */ - String modelInvisibleTagText = generateInvisibleTagText(sourceElement - .getNodeName()); - - /* - * Generate dom document and get root element - */ - Element modelElement = TestDomUtil.getDocument(modelInvisibleTagText) - .getDocumentElement(); - assertNotNull(modelElement); - - TestDomUtil.compareNodes(visualElement, modelElement); - - if (getException() != null) { - throw getException(); - } - - } - - /** - * test for invisible tags which can have visible children - * - * @param elementPagePath - * - path to test page - * @param elementId - * - id of element on page - * @throws Throwable - */ - protected void performInvisibleWrapperTagTest(String elementPagePath, - String elementId) throws Throwable { - setException(null); - - IFile elementPageFile = (IFile) TestUtil.getComponentPath( - elementPagePath, getTestProjectName()); - - IEditorInput input = new FileEditorInput(elementPageFile); - - TestUtil.waitForJobs(); - - IEditorPart editor = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage().openEditor(input, - getEditorID(), true); - - assertNotNull(editor); - - TestUtil.waitForJobs(); - - VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor); - - // find source element and check if it is not null - Element sourceELement = findSourceElementById(controller, elementId); - assertNotNull(sourceELement); - - // find visual element and check if it is null - nsIDOMElement visualElement = findElementById(controller, elementId); - assertNull(visualElement); - - // check children of non-visual - NodeList children = sourceELement.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) { - Node child = children.item(i); - assertNotNull(findNode(controller, child)); - } - - // set show invisible tag's flag to true - controller.getVisualBuilder().setShowInvisibleTags(true); - controller.visualRefresh(); - - TestUtil.waitForIdle(); - - // find visual element and check if it is not null - visualElement = findElementById(controller, elementId); - assertNotNull(visualElement); - - // generate text for invisible tag - String modelInvisibleTagText = generateInvisibleTagText(sourceELement - .getNodeName()); - - // generate dom document and get root element - Element modelElement = TestDomUtil.getDocument(modelInvisibleTagText) - .getDocumentElement(); - assertNotNull(modelElement); - - // compare elements - TestDomUtil.compareNodes(visualElement, modelElement); - - if (getException() != null) { - throw getException(); - } - - } - - /** - * - * @param tagName - * @return - */ - private String generateInvisibleTagText(String tagName) { - return "" //$NON-NLS-1$ - + tagName + ""; //$NON-NLS-1$ - } - - /** - * find visual element by "id" entered in source part of vpe - * - * @param controller - * @param elementId - * @param idle try element for some time period, for example when we need - * to wait for refresh job - * @return - */ - protected nsIDOMElement findElementById(VpeController controller, - String elementId, long idle) { - long start = System.currentTimeMillis(); - nsIDOMElement result = null; - while (result==null) { - result = findElementById(controller, elementId); - TestUtil.delay(50); - if (result==null && ((System.currentTimeMillis()-start) > idle) ) - throw new RuntimeException("A long running task detected"); //$NON-NLS-1$ - } - return result; - } - /** - * find visual element by "id" entered in source part of vpe - * - * @param controller - * @param elementId - * @return - */ - protected nsIDOMNode findNode(VpeController controller, Node node) { - - VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping( - node); - - if (nodeMapping == null) - return null; - - return nodeMapping.getVisualNode(); - } - - /** - * - * @return - */ - abstract protected String getTestProjectName(); - -} Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,373 @@ +/******************************************************************************* + * 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.tools.vpe.base.test; + +import java.io.File; +import java.io.FileNotFoundException; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.test.util.WorkbenchUtils; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; +import org.jboss.tools.vpe.editor.util.SourceDomUtil; +import org.jboss.tools.vpe.base.test.VpeTest; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * @author Sergey Dzmitrovich + * + */ +public abstract class ComponentContentTest extends VpeTest { + + public static final String XML_FILE_EXTENSION = ".xml"; //$NON-NLS-1$ + + public ComponentContentTest(String name) { + super(name); + } + + /** + * + * there are several conditions: + * + * 1) xml file which contain tests must be named 'name of test page' + + * '.xml' + * + * Example: test.jsp and test.jsp.xml + * + * 2) a tag <test> in xml file and required element in test page must have + * the same attribute "id" + * + * Example: <tests>... <test id="testId" > ...<tests> - in xml file and + * + * <html>... <x:testElement id="testId" > ... </html> - in test page + * + * @param elementPagePath + * - path to test page + * @throws Throwable + */ + protected void performContentTest(String elementPagePath) throws Throwable { + performContentTestByFullPath(TestUtil.COMPONENTS_PATH + elementPagePath); + } + + protected void performContentTestByFullPath(String elementPagePath) throws Throwable { + setException(null); + IFile elementPageFile = (IFile) TestUtil.getComponentFileByFullPath( + elementPagePath, getTestProjectName()); + TestUtil.waitForIdle(); + /* + * Test that test file was found and exists + */ + assertNotNull("Could not find component file '"+elementPagePath+"'", elementPageFile); //$NON-NLS-1$ //$NON-NLS-2$ + + IEditorPart editor = WorkbenchUtils.openEditor(elementPageFile,getEditorID()); + assertNotNull("Editor should be opened.", editor); //$NON-NLS-1$ + VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor); + /* + * Get xml test file + */ + File xmlTestFile = TestUtil.getComponentFileByFullPath( + elementPagePath + XML_FILE_EXTENSION, getTestProjectName()) + .getLocation().toFile(); + /* + * Test that XML test file was found and exists + */ + assertNotNull("Could not find XML component file '"+elementPagePath + XML_FILE_EXTENSION+"'", elementPageFile); //$NON-NLS-1$ //$NON-NLS-2$ + /* + * Get document + */ + compareContent(controller, xmlTestFile); + if (getException() != null) { + throw getException(); + } + } + + protected void compareContent(VpeController controller, File xmlTestFile) + throws FileNotFoundException { + Document xmlTestDocument = TestDomUtil.getDocument(xmlTestFile); + assertNotNull("Can't get test file, possibly file not exists "+xmlTestFile,xmlTestDocument); //$NON-NLS-1$ + + List<String> ids = TestDomUtil.getTestIds(xmlTestDocument); + + for (String id : ids) { + try{ + compareElements(controller, xmlTestDocument, id, id); + } catch (DOMComparisonException e) { + String xPathToNode = SourceDomUtil.getXPath(e.getNode()); + String testFileName = xmlTestFile.getPath(); + String message = e.getMessage(); + fail(String.format("%s[%s]:\n%s", testFileName, xPathToNode, message)); //$NON-NLS-1$ + } + } + } + + /** + * + * @param controller + * @param xmlTestDocument + * @param elementId + * @param xmlTestId + * @return + * @throws DOMComparisonException + */ + private void compareElements(VpeController controller, + Document xmlTestDocument, String elementId, String xmlTestId) + throws DOMComparisonException { + // get element by id + nsIDOMElement vpeElement = findElementById(controller, elementId); + assertNotNull("Cann't find element with id="+elementId,vpeElement); //$NON-NLS-1$ + + // DOMTreeDumper dumper = new DOMTreeDumper( + // VpeDebug.VISUAL_DUMP_PRINT_HASH); + // dumper.dumpToStream(System.out, vpeElement); + + // get test element by id - get <test id="..." > element and get his + // first child + Element xmlModelElement = TestDomUtil.getFirstChildElement(TestDomUtil + .getElemenById(xmlTestDocument, xmlTestId)); + + assertNotNull(xmlModelElement); + + TestDomUtil.compareNodes(vpeElement, xmlModelElement); + } + + /** + * test for invisible tags + * + * @param elementPagePath + * - path to test page + * @param elementId + * - id of element on page + * @throws Throwable + */ + protected void performInvisibleTagTest(String elementPagePath, + String elementId) throws Throwable { + performInvisibleTagTestByFullPath(TestUtil.COMPONENTS_PATH + + elementPagePath, elementId); + } + + /** + * test for invisible tags + * + * @param elementPagePath + * - path to test page + * @param elementId + * - id of element on page + * @throws Throwable + */ + protected void performInvisibleTagTestByFullPath(String elementPagePath, + String elementId) throws Throwable { + setException(null); + + IFile elementPageFile = (IFile) TestUtil.getComponentFileByFullPath( + elementPagePath, getTestProjectName()); + /* + * Test that test file was found and exists + */ + assertNotNull("Could not find component file '"+elementPagePath+"'", elementPageFile); //$NON-NLS-1$ //$NON-NLS-2$ + /* + * Open the editor + */ + IEditorInput input = new FileEditorInput(elementPageFile); + TestUtil.waitForJobs(); + IEditorPart editor = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage().openEditor(input, + getEditorID(), true); + assertNotNull("Editor should be opened.", editor); //$NON-NLS-1$ + TestUtil.waitForJobs(); + /* + * Get the controller + */ + VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor); + /* + * Find source element and check if it is not null + */ + Element sourceElement = findSourceElementById(controller, elementId); + assertNotNull("Source node with id '" + elementId + "' was not found.", sourceElement); //$NON-NLS-1$ //$NON-NLS-2$ + /* + * Find visual element and check if it is null + */ + nsIDOMElement visualElement = findElementById(controller, elementId); + assertNull("Source node with id '" + elementId + "' has visual representation.", visualElement); //$NON-NLS-1$ //$NON-NLS-2$ + + /* + * Set show invisible tag's flag to true + */ + controller.getVisualBuilder().setShowInvisibleTags(true); + controller.visualRefresh(); + + /* + * Find visual element and check if it is not null + */ + visualElement = findElementById(controller, elementId,TestUtil.MAX_IDLE); + assertNotNull(visualElement); + + /* + * Generate text for invisible tag + */ + String modelInvisibleTagText = generateInvisibleTagText(sourceElement + .getNodeName()); + + /* + * Generate dom document and get root element + */ + Element modelElement = TestDomUtil.getDocument(modelInvisibleTagText) + .getDocumentElement(); + assertNotNull(modelElement); + + TestDomUtil.compareNodes(visualElement, modelElement); + + if (getException() != null) { + throw getException(); + } + + } + + /** + * test for invisible tags which can have visible children + * + * @param elementPagePath + * - path to test page + * @param elementId + * - id of element on page + * @throws Throwable + */ + protected void performInvisibleWrapperTagTest(String elementPagePath, + String elementId) throws Throwable { + setException(null); + + IFile elementPageFile = (IFile) TestUtil.getComponentPath( + elementPagePath, getTestProjectName()); + + IEditorInput input = new FileEditorInput(elementPageFile); + + TestUtil.waitForJobs(); + + IEditorPart editor = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage().openEditor(input, + getEditorID(), true); + + assertNotNull(editor); + + TestUtil.waitForJobs(); + + VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor); + + // find source element and check if it is not null + Element sourceELement = findSourceElementById(controller, elementId); + assertNotNull(sourceELement); + + // find visual element and check if it is null + nsIDOMElement visualElement = findElementById(controller, elementId); + assertNull(visualElement); + + // check children of non-visual + NodeList children = sourceELement.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) { + Node child = children.item(i); + assertNotNull(findNode(controller, child)); + } + + // set show invisible tag's flag to true + controller.getVisualBuilder().setShowInvisibleTags(true); + controller.visualRefresh(); + + TestUtil.waitForIdle(); + + // find visual element and check if it is not null + visualElement = findElementById(controller, elementId); + assertNotNull(visualElement); + + // generate text for invisible tag + String modelInvisibleTagText = generateInvisibleTagText(sourceELement + .getNodeName()); + + // generate dom document and get root element + Element modelElement = TestDomUtil.getDocument(modelInvisibleTagText) + .getDocumentElement(); + assertNotNull(modelElement); + + // compare elements + TestDomUtil.compareNodes(visualElement, modelElement); + + if (getException() != null) { + throw getException(); + } + + } + + /** + * + * @param tagName + * @return + */ + private String generateInvisibleTagText(String tagName) { + return "" //$NON-NLS-1$ + + tagName + ""; //$NON-NLS-1$ + } + + /** + * find visual element by "id" entered in source part of vpe + * + * @param controller + * @param elementId + * @param idle try element for some time period, for example when we need + * to wait for refresh job + * @return + */ + protected nsIDOMElement findElementById(VpeController controller, + String elementId, long idle) { + long start = System.currentTimeMillis(); + nsIDOMElement result = null; + while (result==null) { + result = findElementById(controller, elementId); + TestUtil.delay(50); + if (result==null && ((System.currentTimeMillis()-start) > idle) ) + throw new RuntimeException("A long running task detected"); //$NON-NLS-1$ + } + return result; + } + /** + * find visual element by "id" entered in source part of vpe + * + * @param controller + * @param elementId + * @return + */ + protected nsIDOMNode findNode(VpeController controller, Node node) { + + VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping( + node); + + if (nodeMapping == null) + return null; + + return nodeMapping.getVisualNode(); + } + + /** + * + * @return + */ + abstract protected String getTestProjectName(); + +} Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/DOMComparisonException.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/DOMComparisonException.java 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/DOMComparisonException.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,32 +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.tools.vpe.base.test; - -import org.w3c.dom.Node; - -/** - * @author Sergey Dzmitrovich - * @author Yahor Radtsevich (yradtsevich) - * - */ -public class DOMComparisonException extends Exception { - private static final long serialVersionUID = 7127064462771778364L; - private Node node; - - public DOMComparisonException(String message, Node node) { - super(message); - this.node = node; - } - - public Node getNode() { - return node; - } -} Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/DOMComparisonException.java (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/DOMComparisonException.java) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/DOMComparisonException.java (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/DOMComparisonException.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,32 @@ +/******************************************************************************* + * 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.tools.vpe.base.test; + +import org.w3c.dom.Node; + +/** + * @author Sergey Dzmitrovich + * @author Yahor Radtsevich (yradtsevich) + * + */ +public class DOMComparisonException extends Exception { + private static final long serialVersionUID = 7127064462771778364L; + private Node node; + + public DOMComparisonException(String message, Node node) { + super(message); + this.node = node; + } + + public Node getNode() { + return node; + } +} Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/OpenOnUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/OpenOnUtil.java 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/OpenOnUtil.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,146 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2009 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.vpe.base.test; - -import java.lang.reflect.Method; -import static junit.framework.Assert.assertEquals; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; -import org.eclipse.jface.text.source.SourceViewerConfiguration; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.MultiPageEditorPart; -import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.wst.sse.ui.StructuredTextEditor; -import org.jboss.tools.common.model.ui.editor.EditorPartWrapper; -import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorStandAlone; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; - -/** - * @author Sergey Dzmitrovich - * - */ -public class OpenOnUtil { - - /** - * method does open on action in editor - * - * @param textEditor - * @param lineNumber - * @param lineOffset - * @throws Throwable - */ - public static final void performOpenOnAction( - StructuredTextEditor textEditor, int offset) throws Throwable { - - // hack to get hyperlinks detectors, no other was have been founded - Method method = AbstractTextEditor.class - .getDeclaredMethod("getSourceViewerConfiguration"); //$NON-NLS-1$ - method.setAccessible(true); - SourceViewerConfiguration sourceViewerConfiguration = (SourceViewerConfiguration) method - .invoke(textEditor); - IHyperlinkDetector[] hyperlinkDetectors = sourceViewerConfiguration - .getHyperlinkDetectors(textEditor.getTextViewer()); - - for (IHyperlinkDetector iHyperlinkDetector : hyperlinkDetectors) { - IHyperlink[] hyperLinks = iHyperlinkDetector.detectHyperlinks( - textEditor.getTextViewer(), new Region(offset, 0), false); - if (hyperLinks != null && hyperLinks.length > 0 - && hyperLinks[0] instanceof AbstractHyperlink) { - AbstractHyperlink abstractHyperlink = (AbstractHyperlink) hyperLinks[0]; - abstractHyperlink.open(); - break; - } - } - - } - - /** - * Function for checking openOn functionality - * - * @param editorInput - * @param editorId - * @param lineNumber - * @param lineOffset - * @param openedOnFileName - * @throws Throwable - * - * @author mareshkau - */ - - public static final void checkOpenOnInEditor(IEditorInput editorInput,String editorId,int lineNumber, int lineOffset, String openedOnFileName) throws Throwable { - StructuredTextEditor textEditor = getStructuredTextEditorPart(editorInput, editorId); - - int openOnPosition = TestUtil.getLinePositionOffcet(textEditor - .getTextViewer(),lineNumber, lineOffset); - // hack to get hyperlinks detectors, no other was have been founded - Method method = AbstractTextEditor.class - .getDeclaredMethod("getSourceViewerConfiguration"); //$NON-NLS-1$ - method.setAccessible(true); - SourceViewerConfiguration sourceViewerConfiguration = (SourceViewerConfiguration) method - .invoke(textEditor); - IHyperlinkDetector[] hyperlinkDetectors = sourceViewerConfiguration - .getHyperlinkDetectors(textEditor.getTextViewer()); - for (IHyperlinkDetector iHyperlinkDetector : hyperlinkDetectors) { - IHyperlink[] hyperLinks = iHyperlinkDetector.detectHyperlinks( - textEditor.getTextViewer(), new Region(openOnPosition, 0), - false); - if (hyperLinks != null && hyperLinks.length > 0 - && hyperLinks[0] instanceof AbstractHyperlink) { - AbstractHyperlink abstractHyperlink = (AbstractHyperlink) hyperLinks[0]; - abstractHyperlink.open(); - break; - } - } - IEditorPart activeEditor = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage().getActiveEditor(); - assertEquals( - "Active page should be ", openedOnFileName, activeEditor.getEditorInput().getName()); //$NON-NLS-1$ - } - - private static StructuredTextEditor getStructuredTextEditorPart(IEditorInput editorInput,String editorId) throws PartInitException{ - IEditorPart editorPart = PlatformUI - .getWorkbench().getActiveWorkbenchWindow().getActivePage() - .openEditor(editorInput, editorId); - StructuredTextEditor textEditor = null; - if(editorPart instanceof MultiPageEditorPart){ - StructuredTextEditor structuredTextEditor = findStructEditor((MultiPageEditorPart)editorPart, editorInput); - ((MultiPageEditorPart)editorPart).setActiveEditor(structuredTextEditor); - textEditor = structuredTextEditor; - } else if(editorPart instanceof JSPMultiPageEditor) { - textEditor = ((JSPMultiPageEditor)editorPart).getSourceEditor(); - } else if(editorPart instanceof EditorPartWrapper - &&(((EditorPartWrapper)editorPart).getEditor()) instanceof MultiPageEditorPart) { - StructuredTextEditor structuredTextEditor = findStructEditor((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor(), editorInput); - ((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor()).setActiveEditor(structuredTextEditor); - textEditor = structuredTextEditor; - } else if(editorPart instanceof EditorPartWrapper && - (((EditorPartWrapper)editorPart).getEditor()) instanceof StructuredTextEditor){ - textEditor = (StructuredTextEditor) (((EditorPartWrapper)editorPart).getEditor()); - } - return textEditor; - } - - private static StructuredTextEditor findStructEditor (MultiPageEditorPart part, IEditorInput input){ - IEditorPart[] editorParts = part.findEditors(input); - for (int i = 0; i < editorParts.length; i++) { - if (editorParts[i] instanceof StructuredTextEditor) { - return (StructuredTextEditor) editorParts[i]; - } - } - return null; - } - -} Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/OpenOnUtil.java (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/OpenOnUtil.java) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/OpenOnUtil.java (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/OpenOnUtil.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,146 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.base.test; + +import java.lang.reflect.Method; +import static junit.framework.Assert.assertEquals; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; +import org.eclipse.jface.text.source.SourceViewerConfiguration; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.MultiPageEditorPart; +import org.eclipse.ui.texteditor.AbstractTextEditor; +import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.common.model.ui.editor.EditorPartWrapper; +import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorStandAlone; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; + +/** + * @author Sergey Dzmitrovich + * + */ +public class OpenOnUtil { + + /** + * method does open on action in editor + * + * @param textEditor + * @param lineNumber + * @param lineOffset + * @throws Throwable + */ + public static final void performOpenOnAction( + StructuredTextEditor textEditor, int offset) throws Throwable { + + // hack to get hyperlinks detectors, no other was have been founded + Method method = AbstractTextEditor.class + .getDeclaredMethod("getSourceViewerConfiguration"); //$NON-NLS-1$ + method.setAccessible(true); + SourceViewerConfiguration sourceViewerConfiguration = (SourceViewerConfiguration) method + .invoke(textEditor); + IHyperlinkDetector[] hyperlinkDetectors = sourceViewerConfiguration + .getHyperlinkDetectors(textEditor.getTextViewer()); + + for (IHyperlinkDetector iHyperlinkDetector : hyperlinkDetectors) { + IHyperlink[] hyperLinks = iHyperlinkDetector.detectHyperlinks( + textEditor.getTextViewer(), new Region(offset, 0), false); + if (hyperLinks != null && hyperLinks.length > 0 + && hyperLinks[0] instanceof AbstractHyperlink) { + AbstractHyperlink abstractHyperlink = (AbstractHyperlink) hyperLinks[0]; + abstractHyperlink.open(); + break; + } + } + + } + + /** + * Function for checking openOn functionality + * + * @param editorInput + * @param editorId + * @param lineNumber + * @param lineOffset + * @param openedOnFileName + * @throws Throwable + * + * @author mareshkau + */ + + public static final void checkOpenOnInEditor(IEditorInput editorInput,String editorId,int lineNumber, int lineOffset, String openedOnFileName) throws Throwable { + StructuredTextEditor textEditor = getStructuredTextEditorPart(editorInput, editorId); + + int openOnPosition = TestUtil.getLinePositionOffcet(textEditor + .getTextViewer(),lineNumber, lineOffset); + // hack to get hyperlinks detectors, no other was have been founded + Method method = AbstractTextEditor.class + .getDeclaredMethod("getSourceViewerConfiguration"); //$NON-NLS-1$ + method.setAccessible(true); + SourceViewerConfiguration sourceViewerConfiguration = (SourceViewerConfiguration) method + .invoke(textEditor); + IHyperlinkDetector[] hyperlinkDetectors = sourceViewerConfiguration + .getHyperlinkDetectors(textEditor.getTextViewer()); + for (IHyperlinkDetector iHyperlinkDetector : hyperlinkDetectors) { + IHyperlink[] hyperLinks = iHyperlinkDetector.detectHyperlinks( + textEditor.getTextViewer(), new Region(openOnPosition, 0), + false); + if (hyperLinks != null && hyperLinks.length > 0 + && hyperLinks[0] instanceof AbstractHyperlink) { + AbstractHyperlink abstractHyperlink = (AbstractHyperlink) hyperLinks[0]; + abstractHyperlink.open(); + break; + } + } + IEditorPart activeEditor = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + assertEquals( + "Active page should be ", openedOnFileName, activeEditor.getEditorInput().getName()); //$NON-NLS-1$ + } + + private static StructuredTextEditor getStructuredTextEditorPart(IEditorInput editorInput,String editorId) throws PartInitException{ + IEditorPart editorPart = PlatformUI + .getWorkbench().getActiveWorkbenchWindow().getActivePage() + .openEditor(editorInput, editorId); + StructuredTextEditor textEditor = null; + if(editorPart instanceof MultiPageEditorPart){ + StructuredTextEditor structuredTextEditor = findStructEditor((MultiPageEditorPart)editorPart, editorInput); + ((MultiPageEditorPart)editorPart).setActiveEditor(structuredTextEditor); + textEditor = structuredTextEditor; + } else if(editorPart instanceof JSPMultiPageEditor) { + textEditor = ((JSPMultiPageEditor)editorPart).getSourceEditor(); + } else if(editorPart instanceof EditorPartWrapper + &&(((EditorPartWrapper)editorPart).getEditor()) instanceof MultiPageEditorPart) { + StructuredTextEditor structuredTextEditor = findStructEditor((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor(), editorInput); + ((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor()).setActiveEditor(structuredTextEditor); + textEditor = structuredTextEditor; + } else if(editorPart instanceof EditorPartWrapper && + (((EditorPartWrapper)editorPart).getEditor()) instanceof StructuredTextEditor){ + textEditor = (StructuredTextEditor) (((EditorPartWrapper)editorPart).getEditor()); + } + return textEditor; + } + + private static StructuredTextEditor findStructEditor (MultiPageEditorPart part, IEditorInput input){ + IEditorPart[] editorParts = part.findEditors(input); + for (int i = 0; i < editorParts.length; i++) { + if (editorParts[i] instanceof StructuredTextEditor) { + return (StructuredTextEditor) editorParts[i]; + } + } + return null; + } + +} Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ProjectsLoader.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ProjectsLoader.java 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ProjectsLoader.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,209 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.vpe.base.test; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import junit.framework.Assert; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Platform; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ResourcesUtils; -import org.osgi.framework.Bundle; - -/** - * Singleton class to operate on test projects. - * - * @see {@code org.jboss.tools.vpe.ui.tests} extension point - * @author Yahor Radtsevich (yradtsevich) - */ -public class ProjectsLoader { - private static final String TEST_PROJECT_ELEMENT = "testProject"; - private static final String TEST_PROJECT_PATH_ATTRIBUTE = "path"; - private static final String TEST_PROJECT_NAME_ATTRIBUTE = "name"; - private Map<String, ProjectLocation> projectNameToLocation; - private static ProjectsLoader instance = null; - - private ProjectsLoader() { - /* - * Load project names and paths to them from the extensions of - * {@link VpeAllTests#VPE_TEST_EXTENTION_POINT_ID}. And store - * loaded data in {@link #projectNameToLocation}. - */ - projectNameToLocation = new HashMap<String, ProjectLocation>(); - IExtension[] extensions = VPEBaseTestPlugin.getDefault().getVpeTestExtensions(); - for (IExtension extension : extensions) { - IConfigurationElement[] confElements = extension - .getConfigurationElements(); - for (IConfigurationElement configurationElement : confElements) { - if (TEST_PROJECT_ELEMENT.equals( - configurationElement.getName())) { - Bundle bundle = Platform.getBundle( - configurationElement.getNamespaceIdentifier()); - String name = configurationElement.getAttribute( - TEST_PROJECT_NAME_ATTRIBUTE); - String path = configurationElement.getAttribute( - TEST_PROJECT_PATH_ATTRIBUTE); - - projectNameToLocation.put(name, - new ProjectLocation(bundle, path)); - } - } - } - } - - /** - * Returns the instance of {@link ProjectsLoader} - */ - public static ProjectsLoader getInstance() { - if (instance == null) { - instance = new ProjectsLoader(); - } - - return instance; - } - - /** - * Returns instance of {@link IProject} by {@code projectName}. - * If the project does not exist in the workspace, imports it from the - * resources specified by extensions of {@code org.jboss.tools.vpe.ui.tests} - * extension point. - * - * This method has fail-fast behavior. It never returns {@code null}. - * It throws exceptions in the cases if the project is not defined, - * can not be opened, etc. - */ - public IProject getProject(String projectName) throws IOException { - IProject project = getExistingProject(projectName); - - if (project == null) { - ProjectLocation location = projectNameToLocation.get(projectName); - if (location == null) { - throw new RuntimeException( - "Project '" + project + "' is not defined."); - } - - try { - project = ResourcesUtils.importProject(location.getBundle(), location.getPath(), projectName, new NullProgressMonitor()); - } catch (CoreException e) { - throw new RuntimeException("Project by the path='" + location.getPath() - + "' cannot be imported.",e); - } catch (InvocationTargetException e) { - throw new RuntimeException("Project by the path='" + location.getPath() - + "' cannot be imported.",e); - } catch (InterruptedException e) { - throw new RuntimeException("Project by the path='" + location.getPath() - + "' cannot be imported.",e); - } - if (project == null) { - throw new RuntimeException("Project by the path='" + location.getPath() - + "' cannot be imported."); - } - } - - return project; - } - - /** - * Returns a workspace project by its {@code projectName}, or {@code null} - * if there is no project with this name in the workspace. - */ - public static IProject getExistingProject(String projectName) { - IProject project = ResourcesPlugin.getWorkspace().getRoot() - .getProject(projectName); - if (project.isAccessible()) { - return project; - } else { - return null; - } - } - - /** - * Removes the project with the {@code projectName} from the workspace. - * - * @param projectName the project name - * @throws CoreException the core exception - */ - static public void removeProject(String projectName) throws CoreException { - IProject project = ProjectsLoader.getExistingProject(projectName); - removeProject(project); - } - - /** - * Removes given {@code project} from the workspace - * - * @param project project to remove - * @throws CoreException - */ - private static void removeProject(IProject project) throws CoreException { - boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - try { - if (project != null) { - project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT, - new NullProgressMonitor()); - JobUtils.waitForIdle(); - } - } finally { - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - } - } - - /** - * Removes all projects from the workspace - * - * @throws CoreException - */ - static public void removeAllProjects() throws CoreException { - IProject[] projects = ResourcesPlugin.getWorkspace().getRoot() - .getProjects(); - for (IProject project: projects) { - removeProject(project); - } - } - - /** - * Stores the {@code path} to a project and the owning {@code bundle}. - * - * @author Yahor Radtsevich (yradtsevich) - */ - private class ProjectLocation { - private Bundle bundle; - private String path; - - public ProjectLocation(Bundle bundle, String path) { - this.bundle = bundle; - this.path = path; - } - public Bundle getBundle() { - return bundle; - } - public String getPath() { - return path; - } - - public String toString() { - return String.format("(%s, %s)", - bundle == null ? null : bundle.getLocation(), path); - } - } -} Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ProjectsLoader.java (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ProjectsLoader.java) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ProjectsLoader.java (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ProjectsLoader.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,209 @@ +/******************************************************************************* + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.base.test; + +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import junit.framework.Assert; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; +import org.osgi.framework.Bundle; + +/** + * Singleton class to operate on test projects. + * + * @see {@code org.jboss.tools.vpe.ui.tests} extension point + * @author Yahor Radtsevich (yradtsevich) + */ +public class ProjectsLoader { + private static final String TEST_PROJECT_ELEMENT = "testProject"; + private static final String TEST_PROJECT_PATH_ATTRIBUTE = "path"; + private static final String TEST_PROJECT_NAME_ATTRIBUTE = "name"; + private Map<String, ProjectLocation> projectNameToLocation; + private static ProjectsLoader instance = null; + + private ProjectsLoader() { + /* + * Load project names and paths to them from the extensions of + * {@link VpeAllTests#VPE_TEST_EXTENTION_POINT_ID}. And store + * loaded data in {@link #projectNameToLocation}. + */ + projectNameToLocation = new HashMap<String, ProjectLocation>(); + IExtension[] extensions = VPEBaseTestPlugin.getDefault().getVpeTestExtensions(); + for (IExtension extension : extensions) { + IConfigurationElement[] confElements = extension + .getConfigurationElements(); + for (IConfigurationElement configurationElement : confElements) { + if (TEST_PROJECT_ELEMENT.equals( + configurationElement.getName())) { + Bundle bundle = Platform.getBundle( + configurationElement.getNamespaceIdentifier()); + String name = configurationElement.getAttribute( + TEST_PROJECT_NAME_ATTRIBUTE); + String path = configurationElement.getAttribute( + TEST_PROJECT_PATH_ATTRIBUTE); + + projectNameToLocation.put(name, + new ProjectLocation(bundle, path)); + } + } + } + } + + /** + * Returns the instance of {@link ProjectsLoader} + */ + public static ProjectsLoader getInstance() { + if (instance == null) { + instance = new ProjectsLoader(); + } + + return instance; + } + + /** + * Returns instance of {@link IProject} by {@code projectName}. + * If the project does not exist in the workspace, imports it from the + * resources specified by extensions of {@code org.jboss.tools.vpe.ui.tests} + * extension point. + * + * This method has fail-fast behavior. It never returns {@code null}. + * It throws exceptions in the cases if the project is not defined, + * can not be opened, etc. + */ + public IProject getProject(String projectName) throws IOException { + IProject project = getExistingProject(projectName); + + if (project == null) { + ProjectLocation location = projectNameToLocation.get(projectName); + if (location == null) { + throw new RuntimeException( + "Project '" + project + "' is not defined."); + } + + try { + project = ResourcesUtils.importProject(location.getBundle(), location.getPath(), projectName, new NullProgressMonitor()); + } catch (CoreException e) { + throw new RuntimeException("Project by the path='" + location.getPath() + + "' cannot be imported.",e); + } catch (InvocationTargetException e) { + throw new RuntimeException("Project by the path='" + location.getPath() + + "' cannot be imported.",e); + } catch (InterruptedException e) { + throw new RuntimeException("Project by the path='" + location.getPath() + + "' cannot be imported.",e); + } + if (project == null) { + throw new RuntimeException("Project by the path='" + location.getPath() + + "' cannot be imported."); + } + } + + return project; + } + + /** + * Returns a workspace project by its {@code projectName}, or {@code null} + * if there is no project with this name in the workspace. + */ + public static IProject getExistingProject(String projectName) { + IProject project = ResourcesPlugin.getWorkspace().getRoot() + .getProject(projectName); + if (project.isAccessible()) { + return project; + } else { + return null; + } + } + + /** + * Removes the project with the {@code projectName} from the workspace. + * + * @param projectName the project name + * @throws CoreException the core exception + */ + static public void removeProject(String projectName) throws CoreException { + IProject project = ProjectsLoader.getExistingProject(projectName); + removeProject(project); + } + + /** + * Removes given {@code project} from the workspace + * + * @param project project to remove + * @throws CoreException + */ + private static void removeProject(IProject project) throws CoreException { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + try { + if (project != null) { + project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT, + new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + } finally { + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } + } + + /** + * Removes all projects from the workspace + * + * @throws CoreException + */ + static public void removeAllProjects() throws CoreException { + IProject[] projects = ResourcesPlugin.getWorkspace().getRoot() + .getProjects(); + for (IProject project: projects) { + removeProject(project); + } + } + + /** + * Stores the {@code path} to a project and the owning {@code bundle}. + * + * @author Yahor Radtsevich (yradtsevich) + */ + private class ProjectLocation { + private Bundle bundle; + private String path; + + public ProjectLocation(Bundle bundle, String path) { + this.bundle = bundle; + this.path = path; + } + public Bundle getBundle() { + return bundle; + } + public String getPath() { + return path; + } + + public String toString() { + return String.format("(%s, %s)", + bundle == null ? null : bundle.getLocation(), path); + } + } +} Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,381 +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.tools.vpe.base.test; - -import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.jboss.tools.common.model.util.XMLUtil; -import org.jboss.tools.jst.css.common.CSSStyleManager; -import org.jboss.tools.vpe.editor.util.Constants; -import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.editor.util.VpeStyleUtil; -import org.mozilla.interfaces.nsIDOMAttr; -import org.mozilla.interfaces.nsIDOMCSSStyleDeclaration; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNamedNodeMap; -import org.mozilla.interfaces.nsIDOMNode; -import org.mozilla.interfaces.nsIDOMNodeList; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.ElementCSSInlineStyle; - -/** - * @author Sergey Dzmitrovich - * - */ -public class TestDomUtil { - /** - * Attributes names that will be skipped in attribute comparison. - */ - public static final Set<String> skippedAtributes = new HashSet<String>(); - static { - // Add here all attributes names to be skipped (IN UPPER CASE!) - skippedAtributes.addAll(Arrays.asList("DIR"));//$NON-NLS-1$ - } - - final public static String ID_ATTRIBUTE = "id"; //$NON-NLS-1$ - - final public static String ILLEGAL_ATTRIBUTES = "illegalAttributes"; //$NON-NLS-1$ - - final public static String ILLEGAL_ATTRIBUTES_SEPARATOR = Constants.COMMA; - - final public static String START_REGEX = "/"; //$NON-NLS-1$ - - final public static String END_REGEX = "/"; //$NON-NLS-1$ - - public static Document getDocument(File file) throws FileNotFoundException { - // create reader - FileReader reader = new FileReader(file); - - // return document - return XMLUtil.getDocument(reader); - } - - public static Document getDocument(String content) - throws FileNotFoundException { - // create reader - StringReader reader = new StringReader(content); - - // return document - return XMLUtil.getDocument(reader); - } - - /** - * - * @param document - * @param elementId - * @return - */ - public static Element getElemenById(Document document, String elementId) { - - Element element = document.getDocumentElement(); - - NodeList children = element.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) { - Node child = children.item(i); - if ((child.getNodeType() == Node.ELEMENT_NODE) - && elementId.equals(((Element) child) - .getAttribute(ID_ATTRIBUTE))) - return (Element) child; - - } - - return null; - - } - - /** - * - * @param element - * @return - */ - public static Element getFirstChildElement(Element element) { - - if (element != null) { - NodeList children = element.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) { - Node child = children.item(i); - - if (child.getNodeType() == Node.ELEMENT_NODE) - return (Element) child; - - } - } - return null; - - } - - /** - * - * @param vpeNode - * @param schemeNode - * @return - * @throws DOMComparisonException - */ - public static void compareNodes(nsIDOMNode vpeNode, Node modelNode) - throws DOMComparisonException { - - if (!modelNode.getNodeName().equalsIgnoreCase(vpeNode.getNodeName())) { - throw new DOMComparisonException("name of tag is \"" //$NON-NLS-1$ - + vpeNode.getNodeName() + "\"but must be \"" //$NON-NLS-1$ - + modelNode.getNodeName() + "\"", modelNode); //$NON-NLS-1$ - } - if ((modelNode.getNodeValue() != null) - && (!modelNode.getNodeValue().trim().equalsIgnoreCase( - vpeNode.getNodeValue().trim()))) { - throw new DOMComparisonException("value of " + vpeNode.getNodeName() //$NON-NLS-1$ - + " is \"" + vpeNode.getNodeValue().trim() //$NON-NLS-1$ - + "\" but must be \"" + modelNode.getNodeValue().trim() //$NON-NLS-1$ - + "\"", modelNode); //$NON-NLS-1$ - } - - // compare node's attributes - if (modelNode.getNodeType() == Node.ELEMENT_NODE) { - compareAttributes(modelNode.getAttributes(), vpeNode - .getAttributes()); - } - - // compare children - nsIDOMNodeList vpeChildren = vpeNode.getChildNodes(); - NodeList schemeChildren = modelNode.getChildNodes(); - int realCount = 0; - for (int i = 0; i < schemeChildren.getLength(); i++) { - - Node schemeChild = schemeChildren.item(i); - - // leave out empty text nodes in test dom model - if ((schemeChild.getNodeType() == Node.TEXT_NODE) - && ((schemeChild.getNodeValue() == null) || (schemeChild - .getNodeValue().trim().length() == 0))) - continue; - - nsIDOMNode vpeChild = vpeChildren.item(realCount++); - - if (null == vpeChild) { - throw new DOMComparisonException( - "Child of node \"" //$NON-NLS-1$ - + vpeNode.getNodeName() - + "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\"",//$NON-NLS-1$ //$NON-NLS-2$ - schemeChild); - } - - // leave out empty text nodes in vpe dom model - while (((vpeChild.getNodeType() == Node.TEXT_NODE) && ((vpeChild - .getNodeValue() == null) || (vpeChild.getNodeValue().trim() - .length() == 0)))) { - vpeChild = vpeChildren.item(realCount++); - if (null == vpeChild) { - throw new DOMComparisonException( - "Child of node \"" //$NON-NLS-1$ - + vpeNode.getNodeName() - + "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\"",//$NON-NLS-1$ //$NON-NLS-2$ - schemeChild); - } - } - - compareNodes(vpeChild, schemeChild); - - } - - } - - /** - * get ids of tests - * - * @param testDocument - * @return - */ - public static List<String> getTestIds(Document testDocument) { - Element rootElement = testDocument.getDocumentElement(); - List<String> ids = new ArrayList<String>(); - NodeList children = rootElement.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) { - Node child = children.item(i); - if (child.getNodeType() == Node.ELEMENT_NODE) - ids.add(((Element) child).getAttribute(ID_ATTRIBUTE)); - - } - return ids; - } - - private static void compareAttributes(NamedNodeMap modelAttributes, - nsIDOMNamedNodeMap vpeAttributes) throws DOMComparisonException { - - for (int i = 0; i < modelAttributes.getLength(); i++) { - Attr modelAttr = (Attr) modelAttributes.item(i); - String name = modelAttr.getName(); - // if the attribute has to be skipped, then do it - if ( name != null - && skippedAtributes.contains(name.toUpperCase()) ) { - continue; - } - // if there are limitation of attributes - if (ILLEGAL_ATTRIBUTES.equals(name)) { - String[] illegalAttributes = modelAttr.getNodeValue().split( - ILLEGAL_ATTRIBUTES_SEPARATOR); - for (String illegalAttributeName : illegalAttributes) { - if (vpeAttributes.getNamedItem(illegalAttributeName.trim()) != null) - throw new DOMComparisonException("illegal attribute :" //$NON-NLS-1$ - + illegalAttributeName, modelAttr); - } - } else { - if (vpeAttributes.getNamedItem(name) == null) { - throw new DOMComparisonException("there is not : \"" + name //$NON-NLS-1$ - + "\" attribute", modelAttr); //$NON-NLS-1$ - } - nsIDOMAttr vpeAttr = queryInterface( - vpeAttributes.getNamedItem(name), nsIDOMAttr.class); - /* - * By default every attribute show pass through - * compareComplexStrings(..) method. - * For "style" attribute there is a separate comparison. - */ - boolean performComplexStringsComparison = true; - if (HTML.ATTR_STYLE.equalsIgnoreCase(name)) { - String xmlAttrValue = modelAttr.getNodeValue(); - /* - * Check if it is not a regular expression. - * Otherwise perform Complex Strings Comparison - * as usual. - */ - if (!(xmlAttrValue.startsWith(START_REGEX) - && xmlAttrValue.endsWith(END_REGEX))) { - performComplexStringsComparison = false; - /* - * Parse style attribute value - */ - Map<String, String> vpeStyle = CSSStyleManager - .getStyleAttributes(vpeAttr.getNodeValue()); - Map<String, String> xmlStyle = CSSStyleManager - .getStyleAttributes(xmlAttrValue); - /* - * Major condition is that - * all styles from the xml file should present - * in the style attribute of the vpe element. - */ - if (xmlStyle.size() > vpeStyle.size()) { - throw new DOMComparisonException( - "VPE element has less style parameters [" //$NON-NLS-1$ - + vpeStyle.size() - + "] than was specified [" //$NON-NLS-1$ - + xmlStyle.size() + "]." //$NON-NLS-1$ - + "\n Expected: " + xmlStyle //$NON-NLS-1$ - + "\n Was: " + vpeStyle, //$NON-NLS-1$ - modelAttr); - } else { - if ((xmlStyle.size() > 0) && (vpeStyle.size() > 0)) { - for (String key : xmlStyle.keySet()) { - if (vpeStyle.containsKey(key)) { - if (!xmlStyle.get(key).equalsIgnoreCase( - vpeStyle.get(key))) { - throw new DOMComparisonException( - "Style value for parameter [" //$NON-NLS-1$ - + key - + "] is different. Expected [" //$NON-NLS-1$ - + xmlStyle.get(key) - + "] but was [" //$NON-NLS-1$ - + vpeStyle.get(key) - + "]", modelAttr); //$NON-NLS-1$ - } - } else { - throw new DOMComparisonException( - "Style parameter [" //$NON-NLS-1$ - + key - + "] is missing in the VPE element", //$NON-NLS-1$ - modelAttr); - } - } - } - } - } - } - if (performComplexStringsComparison) { - compareComplexAttributes(modelAttr, vpeAttr); - } - } - } - } - - static private void compareComplexAttributes(Attr modelAttr, nsIDOMAttr vpeAttr) - throws DOMComparisonException { - String modelString = modelAttr.getNodeValue().trim(); - String vpeString = vpeAttr.getNodeValue().trim(); - - if (modelString.startsWith(START_REGEX) - && modelString.endsWith(END_REGEX)) { - String regex = modelString.substring(START_REGEX.length(), - modelString.length() - END_REGEX.length()); - int firstPos = regex.indexOf("url\$"); //$NON-NLS-1$ - if (firstPos > -1) { - String subString = regex.substring(firstPos + 5, firstPos + 5 + 2); - if (!"\"?".equalsIgnoreCase(subString)) { //$NON-NLS-1$ - String firstPart = regex.substring(0, firstPos + 5); - String secondPart = regex.substring(firstPos + 5, regex.length()); - int lastPos = secondPart.indexOf("\$"); //$NON-NLS-1$ - if (lastPos > -1) { - String subs = secondPart.substring(lastPos - 2, lastPos); - if (!"\"?".equalsIgnoreCase(subs)) { //$NON-NLS-1$ - String fpart = secondPart.substring(0, lastPos); - String spart = secondPart.substring(lastPos, secondPart.length()); - regex = firstPart + "\"?" + fpart + "\"?" + spart; //$NON-NLS-1$ //$NON-NLS-2$ - } - } - } - } - Matcher matcher = Pattern.compile(regex).matcher(vpeString); - if (!matcher.find()) { - throw new DOMComparisonException("string is\"" + vpeString //$NON-NLS-1$ - + "\" but pattern is \"" + regex + "\"", modelAttr); //$NON-NLS-1$ //$NON-NLS-2$ - } - } else if (!modelString.equals(vpeString)) { - throw new DOMComparisonException("string is\"" + vpeString //$NON-NLS-1$ - + "\" but must be \"" + modelString + "\"", modelAttr); //$NON-NLS-1$ //$NON-NLS-2$ - } - - } - - /** - * is created to be sure that attributes/parameters will be correctly - * compared ( ignore case ) - * - * @param list - * @param string - * @return - */ - static private boolean findIgnoreCase(String[] strings, - String requiredString) { - for (String string : strings) { - if (string.equalsIgnoreCase(requiredString)) - return true; - } - - return false; - } -} Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,381 @@ +/******************************************************************************* + * 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.tools.vpe.base.test; + +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.jboss.tools.common.model.util.XMLUtil; +import org.jboss.tools.jst.css.common.CSSStyleManager; +import org.jboss.tools.vpe.editor.util.Constants; +import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.VpeStyleUtil; +import org.mozilla.interfaces.nsIDOMAttr; +import org.mozilla.interfaces.nsIDOMCSSStyleDeclaration; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNamedNodeMap; +import org.mozilla.interfaces.nsIDOMNode; +import org.mozilla.interfaces.nsIDOMNodeList; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.css.CSSStyleDeclaration; +import org.w3c.dom.css.ElementCSSInlineStyle; + +/** + * @author Sergey Dzmitrovich + * + */ +public class TestDomUtil { + /** + * Attributes names that will be skipped in attribute comparison. + */ + public static final Set<String> skippedAtributes = new HashSet<String>(); + static { + // Add here all attributes names to be skipped (IN UPPER CASE!) + skippedAtributes.addAll(Arrays.asList("DIR"));//$NON-NLS-1$ + } + + final public static String ID_ATTRIBUTE = "id"; //$NON-NLS-1$ + + final public static String ILLEGAL_ATTRIBUTES = "illegalAttributes"; //$NON-NLS-1$ + + final public static String ILLEGAL_ATTRIBUTES_SEPARATOR = Constants.COMMA; + + final public static String START_REGEX = "/"; //$NON-NLS-1$ + + final public static String END_REGEX = "/"; //$NON-NLS-1$ + + public static Document getDocument(File file) throws FileNotFoundException { + // create reader + FileReader reader = new FileReader(file); + + // return document + return XMLUtil.getDocument(reader); + } + + public static Document getDocument(String content) + throws FileNotFoundException { + // create reader + StringReader reader = new StringReader(content); + + // return document + return XMLUtil.getDocument(reader); + } + + /** + * + * @param document + * @param elementId + * @return + */ + public static Element getElemenById(Document document, String elementId) { + + Element element = document.getDocumentElement(); + + NodeList children = element.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) { + Node child = children.item(i); + if ((child.getNodeType() == Node.ELEMENT_NODE) + && elementId.equals(((Element) child) + .getAttribute(ID_ATTRIBUTE))) + return (Element) child; + + } + + return null; + + } + + /** + * + * @param element + * @return + */ + public static Element getFirstChildElement(Element element) { + + if (element != null) { + NodeList children = element.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) { + Node child = children.item(i); + + if (child.getNodeType() == Node.ELEMENT_NODE) + return (Element) child; + + } + } + return null; + + } + + /** + * + * @param vpeNode + * @param schemeNode + * @return + * @throws DOMComparisonException + */ + public static void compareNodes(nsIDOMNode vpeNode, Node modelNode) + throws DOMComparisonException { + + if (!modelNode.getNodeName().equalsIgnoreCase(vpeNode.getNodeName())) { + throw new DOMComparisonException("name of tag is \"" //$NON-NLS-1$ + + vpeNode.getNodeName() + "\"but must be \"" //$NON-NLS-1$ + + modelNode.getNodeName() + "\"", modelNode); //$NON-NLS-1$ + } + if ((modelNode.getNodeValue() != null) + && (!modelNode.getNodeValue().trim().equalsIgnoreCase( + vpeNode.getNodeValue().trim()))) { + throw new DOMComparisonException("value of " + vpeNode.getNodeName() //$NON-NLS-1$ + + " is \"" + vpeNode.getNodeValue().trim() //$NON-NLS-1$ + + "\" but must be \"" + modelNode.getNodeValue().trim() //$NON-NLS-1$ + + "\"", modelNode); //$NON-NLS-1$ + } + + // compare node's attributes + if (modelNode.getNodeType() == Node.ELEMENT_NODE) { + compareAttributes(modelNode.getAttributes(), vpeNode + .getAttributes()); + } + + // compare children + nsIDOMNodeList vpeChildren = vpeNode.getChildNodes(); + NodeList schemeChildren = modelNode.getChildNodes(); + int realCount = 0; + for (int i = 0; i < schemeChildren.getLength(); i++) { + + Node schemeChild = schemeChildren.item(i); + + // leave out empty text nodes in test dom model + if ((schemeChild.getNodeType() == Node.TEXT_NODE) + && ((schemeChild.getNodeValue() == null) || (schemeChild + .getNodeValue().trim().length() == 0))) + continue; + + nsIDOMNode vpeChild = vpeChildren.item(realCount++); + + if (null == vpeChild) { + throw new DOMComparisonException( + "Child of node \"" //$NON-NLS-1$ + + vpeNode.getNodeName() + + "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\"",//$NON-NLS-1$ //$NON-NLS-2$ + schemeChild); + } + + // leave out empty text nodes in vpe dom model + while (((vpeChild.getNodeType() == Node.TEXT_NODE) && ((vpeChild + .getNodeValue() == null) || (vpeChild.getNodeValue().trim() + .length() == 0)))) { + vpeChild = vpeChildren.item(realCount++); + if (null == vpeChild) { + throw new DOMComparisonException( + "Child of node \"" //$NON-NLS-1$ + + vpeNode.getNodeName() + + "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\"",//$NON-NLS-1$ //$NON-NLS-2$ + schemeChild); + } + } + + compareNodes(vpeChild, schemeChild); + + } + + } + + /** + * get ids of tests + * + * @param testDocument + * @return + */ + public static List<String> getTestIds(Document testDocument) { + Element rootElement = testDocument.getDocumentElement(); + List<String> ids = new ArrayList<String>(); + NodeList children = rootElement.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) { + Node child = children.item(i); + if (child.getNodeType() == Node.ELEMENT_NODE) + ids.add(((Element) child).getAttribute(ID_ATTRIBUTE)); + + } + return ids; + } + + private static void compareAttributes(NamedNodeMap modelAttributes, + nsIDOMNamedNodeMap vpeAttributes) throws DOMComparisonException { + + for (int i = 0; i < modelAttributes.getLength(); i++) { + Attr modelAttr = (Attr) modelAttributes.item(i); + String name = modelAttr.getName(); + // if the attribute has to be skipped, then do it + if ( name != null + && skippedAtributes.contains(name.toUpperCase()) ) { + continue; + } + // if there are limitation of attributes + if (ILLEGAL_ATTRIBUTES.equals(name)) { + String[] illegalAttributes = modelAttr.getNodeValue().split( + ILLEGAL_ATTRIBUTES_SEPARATOR); + for (String illegalAttributeName : illegalAttributes) { + if (vpeAttributes.getNamedItem(illegalAttributeName.trim()) != null) + throw new DOMComparisonException("illegal attribute :" //$NON-NLS-1$ + + illegalAttributeName, modelAttr); + } + } else { + if (vpeAttributes.getNamedItem(name) == null) { + throw new DOMComparisonException("there is not : \"" + name //$NON-NLS-1$ + + "\" attribute", modelAttr); //$NON-NLS-1$ + } + nsIDOMAttr vpeAttr = queryInterface( + vpeAttributes.getNamedItem(name), nsIDOMAttr.class); + /* + * By default every attribute show pass through + * compareComplexStrings(..) method. + * For "style" attribute there is a separate comparison. + */ + boolean performComplexStringsComparison = true; + if (HTML.ATTR_STYLE.equalsIgnoreCase(name)) { + String xmlAttrValue = modelAttr.getNodeValue(); + /* + * Check if it is not a regular expression. + * Otherwise perform Complex Strings Comparison + * as usual. + */ + if (!(xmlAttrValue.startsWith(START_REGEX) + && xmlAttrValue.endsWith(END_REGEX))) { + performComplexStringsComparison = false; + /* + * Parse style attribute value + */ + Map<String, String> vpeStyle = CSSStyleManager + .getStyleAttributes(vpeAttr.getNodeValue()); + Map<String, String> xmlStyle = CSSStyleManager + .getStyleAttributes(xmlAttrValue); + /* + * Major condition is that + * all styles from the xml file should present + * in the style attribute of the vpe element. + */ + if (xmlStyle.size() > vpeStyle.size()) { + throw new DOMComparisonException( + "VPE element has less style parameters [" //$NON-NLS-1$ + + vpeStyle.size() + + "] than was specified [" //$NON-NLS-1$ + + xmlStyle.size() + "]." //$NON-NLS-1$ + + "\n Expected: " + xmlStyle //$NON-NLS-1$ + + "\n Was: " + vpeStyle, //$NON-NLS-1$ + modelAttr); + } else { + if ((xmlStyle.size() > 0) && (vpeStyle.size() > 0)) { + for (String key : xmlStyle.keySet()) { + if (vpeStyle.containsKey(key)) { + if (!xmlStyle.get(key).equalsIgnoreCase( + vpeStyle.get(key))) { + throw new DOMComparisonException( + "Style value for parameter [" //$NON-NLS-1$ + + key + + "] is different. Expected [" //$NON-NLS-1$ + + xmlStyle.get(key) + + "] but was [" //$NON-NLS-1$ + + vpeStyle.get(key) + + "]", modelAttr); //$NON-NLS-1$ + } + } else { + throw new DOMComparisonException( + "Style parameter [" //$NON-NLS-1$ + + key + + "] is missing in the VPE element", //$NON-NLS-1$ + modelAttr); + } + } + } + } + } + } + if (performComplexStringsComparison) { + compareComplexAttributes(modelAttr, vpeAttr); + } + } + } + } + + static private void compareComplexAttributes(Attr modelAttr, nsIDOMAttr vpeAttr) + throws DOMComparisonException { + String modelString = modelAttr.getNodeValue().trim(); + String vpeString = vpeAttr.getNodeValue().trim(); + + if (modelString.startsWith(START_REGEX) + && modelString.endsWith(END_REGEX)) { + String regex = modelString.substring(START_REGEX.length(), + modelString.length() - END_REGEX.length()); + int firstPos = regex.indexOf("url\$"); //$NON-NLS-1$ + if (firstPos > -1) { + String subString = regex.substring(firstPos + 5, firstPos + 5 + 2); + if (!"\"?".equalsIgnoreCase(subString)) { //$NON-NLS-1$ + String firstPart = regex.substring(0, firstPos + 5); + String secondPart = regex.substring(firstPos + 5, regex.length()); + int lastPos = secondPart.indexOf("\$"); //$NON-NLS-1$ + if (lastPos > -1) { + String subs = secondPart.substring(lastPos - 2, lastPos); + if (!"\"?".equalsIgnoreCase(subs)) { //$NON-NLS-1$ + String fpart = secondPart.substring(0, lastPos); + String spart = secondPart.substring(lastPos, secondPart.length()); + regex = firstPart + "\"?" + fpart + "\"?" + spart; //$NON-NLS-1$ //$NON-NLS-2$ + } + } + } + } + Matcher matcher = Pattern.compile(regex).matcher(vpeString); + if (!matcher.find()) { + throw new DOMComparisonException("string is\"" + vpeString //$NON-NLS-1$ + + "\" but pattern is \"" + regex + "\"", modelAttr); //$NON-NLS-1$ //$NON-NLS-2$ + } + } else if (!modelString.equals(vpeString)) { + throw new DOMComparisonException("string is\"" + vpeString //$NON-NLS-1$ + + "\" but must be \"" + modelString + "\"", modelAttr); //$NON-NLS-1$ //$NON-NLS-2$ + } + + } + + /** + * is created to be sure that attributes/parameters will be correctly + * compared ( ignore case ) + * + * @param list + * @param string + * @return + */ + static private boolean findIgnoreCase(String[] strings, + String requiredString) { + for (String string : strings) { + if (string.equalsIgnoreCase(requiredString)) + return true; + } + + return false; + } +} Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,398 +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.tools.vpe.base.test; - -import java.io.File; -import java.io.IOException; -import java.util.List; - -import junit.framework.Assert; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.editor.VpeEditorPart; -import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; -import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNode; -import org.mozilla.interfaces.nsIDOMNodeList; -import org.mozilla.xpcom.XPCOMException; -import org.w3c.dom.Node; - -/** - * Class for importing project from jar file. - * - * @author sdzmitrovich - */ -public class TestUtil { - - /** The Constant COMPONENTS_PATH. */ - public static final String COMPONENTS_PATH = "WebContent/pages/"; //$NON-NLS-1$ - - /** The Constant WEBCONTENT_PATH. */ - private static final String WEBCONTENT_PATH = "WebContent"; //$NON-NLS-1$ - - /** Editor in which we open visual page. */ - protected final static String EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$ - - /** The Constant MAX_IDLE. */ - public static final long MAX_IDLE = 15*1000L; - - /** - * Gets the component path. - * - * @param componentPage the component page - * @param projectName the project name - * - * @return the component path - * - * @throws CoreException the core exception - * @throws IOException - */ - public static IResource getComponentPath(String componentPage, - String projectName) throws CoreException, IOException { - IProject project = ProjectsLoader.getInstance().getProject(projectName); - if (project != null) { - return project.getFolder(COMPONENTS_PATH).findMember(componentPage); - } - return null; - } - - /** - * Gets the component path. - * - * @param componentPage the component page - * @param projectName the project name - * - * @return the component path - * - * @throws CoreException the core exception - * @throws IOException - */ - public static IResource getComponentFileByFullPath(String componentPage, - String projectName) throws CoreException, IOException { - IProject project = ProjectsLoader.getInstance().getProject(projectName); - if (project != null) { - return project.findMember(componentPage); - } - return null; - } - - - - public static IResource getResource(String path, - String projectName) throws CoreException, IOException { - IProject project = ProjectsLoader.getInstance().getProject(projectName); - if (project != null) { - return project.findMember(path); - } - - return null; - } - - /** - * Gets the web content path. - * - * @param componentPage the component page - * @param projectName the project name - * - * @return the web content path - * - * @throws CoreException the core exception - * @throws IOException - */ - public static IResource getWebContentPath(String componentPage, - String projectName) throws CoreException, IOException { - IProject project = ProjectsLoader.getInstance().getProject(projectName); - if (project != null) { - return project.getFolder(WEBCONTENT_PATH).findMember(componentPage); - } - - return null; - } - - - /** - * @param xmlScheme - * @param xmlSchemesRoot - * @return - */ - public static File getXmlTestFile(String xmlTestPath, String xmlTestsRoot) { - return new File(xmlTestsRoot + File.separator + xmlTestPath); - } - - /** - * Process UI input but do not return for the specified time interval. - * - * @param waitTimeMillis the number of milliseconds - */ - public static void delay(long waitTimeMillis) { - Display display = Display.getCurrent(); - if (display != null) { - long endTimeMillis = System.currentTimeMillis() + waitTimeMillis; - while (System.currentTimeMillis() < endTimeMillis) { - if (!display.readAndDispatch()) - display.sleep(); - } - display.update(); - } - // Otherwise, perform a simple sleep. - else { - try { - Thread.sleep(waitTimeMillis); - } catch (InterruptedException e) { - // Ignored. - } - } - } - - /** - * Wait until all background tasks are complete. - */ - public static void waitForJobs() { - //commented by Maksim Areshkau - //because this method wait only for jobs which has been runned in current thread, - //and don't wait for others. It can cause https://jira.jboss.org/jira/browse/JBIDE-5820 - //https://jira.jboss.org/jira/browse/JBIDE-5821 -// while (Job.getJobManager().currentJob() != null) -// delay(100); - waitForIdle(); - } - - /** - * Wait for idle. - */ - public static void waitForIdle(long maxIdle) { - long start = System.currentTimeMillis(); - while (!Job.getJobManager().isIdle()) { - delay(500); - if ( (System.currentTimeMillis()-start) > maxIdle ) { - Job[] jobs = Job.getJobManager().find(null); - StringBuffer jobsList = new StringBuffer("A long running task detected\n"); - - for (Job job : jobs) { - jobsList.append(job.getName()).append("\n"); - } - throw new RuntimeException(jobsList.toString()); //$NON-NLS-1$ - } - } - } - - public static void waitForIdle() { - waitForIdle(MAX_IDLE); - } - - /** - * find elements by name. - * - * @param node - - * current node - * @param name - - * name element - * @param elements - - * list of found elements - */ - static public void findElementsByName(nsIDOMNode node, - List<nsIDOMNode> elements, String name) { - /* - * Get children - */ - nsIDOMNodeList children = node.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) { - nsIDOMNode child = children.item(i); - /* - * if current child is required then add it to list - */ - if (name.equalsIgnoreCase((child.getNodeName()))) { - elements.add(child); - } else { - findElementsByName(child, elements, name); - } - } - - } - - /** - * find all elements by name. - * - * @param node - - * current node - * @param name - - * name element - * @param elements - - * list of found elements - */ - static public void findAllElementsByName(nsIDOMNode node, - List<nsIDOMNode> elements, String name) { - try { - nsIDOMNodeList list = node.getChildNodes(); - if (node.getNodeName().equalsIgnoreCase(name)) { - elements.add(node); - } - for (int i = 0; i < list.getLength(); i++) { - findAllElementsByName(list.item(i), elements, name); - } - } catch (XPCOMException e) { - // Ignore - return; - } - } - - /** - * Utility function which returns node mapping by source position(line and position in line). - * - * @param linePosition the line position - * @param lineIndex the line index - * @param itextViewer the itext viewer - * - * @return node for specified src position - */ - @SuppressWarnings("restriction") - public static Node getNodeMappingBySourcePosition(ITextViewer itextViewer, int lineIndex, int linePosition) { - int offset = getLinePositionOffcet(itextViewer, lineIndex, linePosition); - IndexedRegion treeNode = ContentAssistUtils.getNodeAt(itextViewer, offset); - return (Node) treeNode; - } - - /** - * Utility function which is used to calculate offcet in document by line number and character position. - * - * @param linePosition the line position - * @param textViewer the text viewer - * @param lineIndex the line index - * - * @return offcet in document - * - * @throws IllegalArgumentException */ - public static final int getLinePositionOffcet(ITextViewer textViewer, int lineIndex, int linePosition) { - - int resultOffcet = 0; - - if(textViewer==null) { - - throw new IllegalArgumentException("Text viewer shouldn't be a null"); //$NON-NLS-1$ - } - //lineIndex-1 becose calculating of line begibns in eclipse from one, but should be form zero - resultOffcet=textViewer.getTextWidget().getOffsetAtLine(lineIndex-1); - //here we get's tabs length - //for more example you can see code org.eclipse.ui.texteditor.AbstractTextEditor@getCursorPosition() and class $PositionLabelValue - int tabWidth = textViewer.getTextWidget().getTabs(); - int characterOffset=0; - String currentString = textViewer.getTextWidget().getLine(lineIndex-1); - int pos=1; - for (int i= 0; (i < currentString.length())&&(pos<linePosition); i++) { - if ('\t' == currentString.charAt(i)) { - - characterOffset += (tabWidth == 0 ? 0 : 1); - pos+=tabWidth; - }else{ - pos++; - characterOffset++; - } - } - resultOffcet+=characterOffset; - if(textViewer.getTextWidget().getLineAtOffset(resultOffcet)!=(lineIndex-1)) { - - throw new IllegalArgumentException("Incorrect character position in line"); //$NON-NLS-1$ - } - return resultOffcet; - } - - /** - * Gets visual page editor controller. - * - * @param part the part - * - * @return {@link VpeController} - */ - public static VpeController getVpeController(JSPMultiPageEditor part) { - - VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor(); - while(visualEditor.getController()==null) { - if (!Display.getCurrent().readAndDispatch()) { - Display.getCurrent().sleep(); - } - } - return visualEditor.getController(); - } - - /** - * get xulrunner source page. - * - * @param part - JSPMultiPageEditor - * - * @return nsIDOMDocument - */ - public static nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) { - - - VpeController vpeController = TestUtil.getVpeController(part); - - // get xulRunner editor - XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor(); - - // get dom document - nsIDOMDocument document = xulRunnerEditor.getDOMDocument(); - - return document; - } - - /** - * Perform test for rich faces component. - * - * @param componentPage the component page - * - * @return the ns IDOM element - * - * @throws Throwable the throwable - */ - public static nsIDOMElement performTestForRichFacesComponent(IFile componentPage) throws Throwable { - nsIDOMElement rst = null; - TestUtil.waitForJobs(); - - // IFile file = (IFile) - // TestUtil.getComponentPath(componentPage,getImportProjectName()); - IEditorInput input = new FileEditorInput(componentPage); - - TestUtil.waitForJobs(); - // - JSPMultiPageEditor editor = (JSPMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor( - input, EDITOR_ID, true); - - // get dom document - nsIDOMDocument document = getVpeVisualDocument(editor); - rst = document.getDocumentElement(); - // check that element is not null - Assert.assertNotNull(rst); - return rst; - } - - /** - * Fail. - * - * @param t the t - */ - public static void fail(Throwable t){ - Assert.fail("Test case was fail "+t.getMessage()+":"+t); - } -} Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,398 @@ +/******************************************************************************* + * 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.tools.vpe.base.test; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +import junit.framework.Assert; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; +import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.VpeEditorPart; +import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; +import org.mozilla.interfaces.nsIDOMNodeList; +import org.mozilla.xpcom.XPCOMException; +import org.w3c.dom.Node; + +/** + * Class for importing project from jar file. + * + * @author sdzmitrovich + */ +public class TestUtil { + + /** The Constant COMPONENTS_PATH. */ + public static final String COMPONENTS_PATH = "WebContent/pages/"; //$NON-NLS-1$ + + /** The Constant WEBCONTENT_PATH. */ + private static final String WEBCONTENT_PATH = "WebContent"; //$NON-NLS-1$ + + /** Editor in which we open visual page. */ + protected final static String EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$ + + /** The Constant MAX_IDLE. */ + public static final long MAX_IDLE = 15*1000L; + + /** + * Gets the component path. + * + * @param componentPage the component page + * @param projectName the project name + * + * @return the component path + * + * @throws CoreException the core exception + * @throws IOException + */ + public static IResource getComponentPath(String componentPage, + String projectName) throws CoreException, IOException { + IProject project = ProjectsLoader.getInstance().getProject(projectName); + if (project != null) { + return project.getFolder(COMPONENTS_PATH).findMember(componentPage); + } + return null; + } + + /** + * Gets the component path. + * + * @param componentPage the component page + * @param projectName the project name + * + * @return the component path + * + * @throws CoreException the core exception + * @throws IOException + */ + public static IResource getComponentFileByFullPath(String componentPage, + String projectName) throws CoreException, IOException { + IProject project = ProjectsLoader.getInstance().getProject(projectName); + if (project != null) { + return project.findMember(componentPage); + } + return null; + } + + + + public static IResource getResource(String path, + String projectName) throws CoreException, IOException { + IProject project = ProjectsLoader.getInstance().getProject(projectName); + if (project != null) { + return project.findMember(path); + } + + return null; + } + + /** + * Gets the web content path. + * + * @param componentPage the component page + * @param projectName the project name + * + * @return the web content path + * + * @throws CoreException the core exception + * @throws IOException + */ + public static IResource getWebContentPath(String componentPage, + String projectName) throws CoreException, IOException { + IProject project = ProjectsLoader.getInstance().getProject(projectName); + if (project != null) { + return project.getFolder(WEBCONTENT_PATH).findMember(componentPage); + } + + return null; + } + + + /** + * @param xmlScheme + * @param xmlSchemesRoot + * @return + */ + public static File getXmlTestFile(String xmlTestPath, String xmlTestsRoot) { + return new File(xmlTestsRoot + File.separator + xmlTestPath); + } + + /** + * Process UI input but do not return for the specified time interval. + * + * @param waitTimeMillis the number of milliseconds + */ + public static void delay(long waitTimeMillis) { + Display display = Display.getCurrent(); + if (display != null) { + long endTimeMillis = System.currentTimeMillis() + waitTimeMillis; + while (System.currentTimeMillis() < endTimeMillis) { + if (!display.readAndDispatch()) + display.sleep(); + } + display.update(); + } + // Otherwise, perform a simple sleep. + else { + try { + Thread.sleep(waitTimeMillis); + } catch (InterruptedException e) { + // Ignored. + } + } + } + + /** + * Wait until all background tasks are complete. + */ + public static void waitForJobs() { + //commented by Maksim Areshkau + //because this method wait only for jobs which has been runned in current thread, + //and don't wait for others. It can cause https://jira.jboss.org/jira/browse/JBIDE-5820 + //https://jira.jboss.org/jira/browse/JBIDE-5821 +// while (Job.getJobManager().currentJob() != null) +// delay(100); + waitForIdle(); + } + + /** + * Wait for idle. + */ + public static void waitForIdle(long maxIdle) { + long start = System.currentTimeMillis(); + while (!Job.getJobManager().isIdle()) { + delay(500); + if ( (System.currentTimeMillis()-start) > maxIdle ) { + Job[] jobs = Job.getJobManager().find(null); + StringBuffer jobsList = new StringBuffer("A long running task detected\n"); + + for (Job job : jobs) { + jobsList.append(job.getName()).append("\n"); + } + throw new RuntimeException(jobsList.toString()); //$NON-NLS-1$ + } + } + } + + public static void waitForIdle() { + waitForIdle(MAX_IDLE); + } + + /** + * find elements by name. + * + * @param node - + * current node + * @param name - + * name element + * @param elements - + * list of found elements + */ + static public void findElementsByName(nsIDOMNode node, + List<nsIDOMNode> elements, String name) { + /* + * Get children + */ + nsIDOMNodeList children = node.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) { + nsIDOMNode child = children.item(i); + /* + * if current child is required then add it to list + */ + if (name.equalsIgnoreCase((child.getNodeName()))) { + elements.add(child); + } else { + findElementsByName(child, elements, name); + } + } + + } + + /** + * find all elements by name. + * + * @param node - + * current node + * @param name - + * name element + * @param elements - + * list of found elements + */ + static public void findAllElementsByName(nsIDOMNode node, + List<nsIDOMNode> elements, String name) { + try { + nsIDOMNodeList list = node.getChildNodes(); + if (node.getNodeName().equalsIgnoreCase(name)) { + elements.add(node); + } + for (int i = 0; i < list.getLength(); i++) { + findAllElementsByName(list.item(i), elements, name); + } + } catch (XPCOMException e) { + // Ignore + return; + } + } + + /** + * Utility function which returns node mapping by source position(line and position in line). + * + * @param linePosition the line position + * @param lineIndex the line index + * @param itextViewer the itext viewer + * + * @return node for specified src position + */ + @SuppressWarnings("restriction") + public static Node getNodeMappingBySourcePosition(ITextViewer itextViewer, int lineIndex, int linePosition) { + int offset = getLinePositionOffcet(itextViewer, lineIndex, linePosition); + IndexedRegion treeNode = ContentAssistUtils.getNodeAt(itextViewer, offset); + return (Node) treeNode; + } + + /** + * Utility function which is used to calculate offcet in document by line number and character position. + * + * @param linePosition the line position + * @param textViewer the text viewer + * @param lineIndex the line index + * + * @return offcet in document + * + * @throws IllegalArgumentException */ + public static final int getLinePositionOffcet(ITextViewer textViewer, int lineIndex, int linePosition) { + + int resultOffcet = 0; + + if(textViewer==null) { + + throw new IllegalArgumentException("Text viewer shouldn't be a null"); //$NON-NLS-1$ + } + //lineIndex-1 becose calculating of line begibns in eclipse from one, but should be form zero + resultOffcet=textViewer.getTextWidget().getOffsetAtLine(lineIndex-1); + //here we get's tabs length + //for more example you can see code org.eclipse.ui.texteditor.AbstractTextEditor@getCursorPosition() and class $PositionLabelValue + int tabWidth = textViewer.getTextWidget().getTabs(); + int characterOffset=0; + String currentString = textViewer.getTextWidget().getLine(lineIndex-1); + int pos=1; + for (int i= 0; (i < currentString.length())&&(pos<linePosition); i++) { + if ('\t' == currentString.charAt(i)) { + + characterOffset += (tabWidth == 0 ? 0 : 1); + pos+=tabWidth; + }else{ + pos++; + characterOffset++; + } + } + resultOffcet+=characterOffset; + if(textViewer.getTextWidget().getLineAtOffset(resultOffcet)!=(lineIndex-1)) { + + throw new IllegalArgumentException("Incorrect character position in line"); //$NON-NLS-1$ + } + return resultOffcet; + } + + /** + * Gets visual page editor controller. + * + * @param part the part + * + * @return {@link VpeController} + */ + public static VpeController getVpeController(JSPMultiPageEditor part) { + + VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor(); + while(visualEditor.getController()==null) { + if (!Display.getCurrent().readAndDispatch()) { + Display.getCurrent().sleep(); + } + } + return visualEditor.getController(); + } + + /** + * get xulrunner source page. + * + * @param part - JSPMultiPageEditor + * + * @return nsIDOMDocument + */ + public static nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) { + + + VpeController vpeController = TestUtil.getVpeController(part); + + // get xulRunner editor + XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor(); + + // get dom document + nsIDOMDocument document = xulRunnerEditor.getDOMDocument(); + + return document; + } + + /** + * Perform test for rich faces component. + * + * @param componentPage the component page + * + * @return the ns IDOM element + * + * @throws Throwable the throwable + */ + public static nsIDOMElement performTestForRichFacesComponent(IFile componentPage) throws Throwable { + nsIDOMElement rst = null; + TestUtil.waitForJobs(); + + // IFile file = (IFile) + // TestUtil.getComponentPath(componentPage,getImportProjectName()); + IEditorInput input = new FileEditorInput(componentPage); + + TestUtil.waitForJobs(); + // + JSPMultiPageEditor editor = (JSPMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor( + input, EDITOR_ID, true); + + // get dom document + nsIDOMDocument document = getVpeVisualDocument(editor); + rst = document.getDocumentElement(); + // check that element is not null + Assert.assertNotNull(rst); + return rst; + } + + /** + * Fail. + * + * @param t the t + */ + public static void fail(Throwable t){ + Assert.fail("Test case was fail "+t.getMessage()+":"+t); + } +} Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VPEBaseTestPlugin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VPEBaseTestPlugin.java 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VPEBaseTestPlugin.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -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.tools.vpe.base.test; - -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.Platform; -import org.jboss.tools.common.log.BaseUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class VPEBaseTestPlugin extends BaseUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.vpe.base.test"; - - public static final String VPE_TEST_EXTENTION_POINT_ID = "org.jboss.tools.vpe.ui.test"; //$NON-NLS-1$ - - // The shared instance - private static VPEBaseTestPlugin plugin; - - /** - * The constructor - */ - public VPEBaseTestPlugin() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static VPEBaseTestPlugin getDefault() { - return plugin; - } - - /** - * Returns all extensions of {@value #VPE_TEST_EXTENTION_POINT_ID} - */ - public IExtension[] getVpeTestExtensions() { - IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - IExtensionPoint extensionPoint = extensionRegistry - .getExtensionPoint(VPE_TEST_EXTENTION_POINT_ID); - IExtension[] extensions = extensionPoint.getExtensions(); - return extensions; - } -} Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VPEBaseTestPlugin.java (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VPEBaseTestPlugin.java) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VPEBaseTestPlugin.java (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VPEBaseTestPlugin.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -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.tools.vpe.base.test; + +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.IExtensionRegistry; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.common.log.BaseUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class VPEBaseTestPlugin extends BaseUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.vpe.base.test"; + + public static final String VPE_TEST_EXTENTION_POINT_ID = "org.jboss.tools.vpe.ui.test"; //$NON-NLS-1$ + + // The shared instance + private static VPEBaseTestPlugin plugin; + + /** + * The constructor + */ + public VPEBaseTestPlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static VPEBaseTestPlugin getDefault() { + return plugin; + } + + /** + * Returns all extensions of {@value #VPE_TEST_EXTENTION_POINT_ID} + */ + public IExtension[] getVpeTestExtensions() { + IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); + IExtensionPoint extensionPoint = extensionRegistry + .getExtensionPoint(VPE_TEST_EXTENTION_POINT_ID); + IExtension[] extensions = extensionPoint.getExtensions(); + return extensions; + } +} Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,467 +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.tools.vpe.base.test; - -import java.io.IOException; -import java.util.Collection; -import java.util.Map; - -import junit.framework.TestCase; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.ILogListener; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.jboss.tools.common.model.util.ClassLoaderUtil; -import org.jboss.tools.jst.jsp.JspEditorPlugin; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; -import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; -import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; -import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; -import org.jboss.tools.vpe.editor.util.SelectionUtil; -import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNode; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -/** - * The Class VpeTest. - * - * @author Max Areshkau - * - * Base Class for VPE tests - */ -public class VpeTest extends TestCase implements ILogListener { - - /** Editor in which we open visual page. */ - protected final static String EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$ - - /** Collects exceptions. */ - private Throwable exception; - - /** check warning log. */ - private boolean checkWarning = false; - - // FIX for JBIDE-1628 - static { - ClassLoaderUtil.init(); - // wait for initialization - TestUtil.delay(3000); - JspEditorPlugin - .getDefault() - .getPreferenceStore() - .setValue( - IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, - false); - } - - /** - * The Constructor. - * - * @param importProjectName - * * @param name the name - */ - - public VpeTest(String name) { - super(name); - - } - - /** - * Perform pre-test initialization. - * - * @throws Exception - * the exception - * - * @see TestCase#setUp() - */ - @Override - protected void setUp() throws Exception { - super.setUp(); - Platform.addLogListener(this); - // String jbossPath = System.getProperty( - // "jbosstools.test.jboss.home.4.2", "C:\\java\\jboss-4.2.2.GA"); - // JBossASAdapterInitializer.initJBossAS(jbossPath, new - // NullProgressMonitor()); - closeEditors(); - } - - /** - * Perform post-test cleanup. - * - * @throws Exception - * the exception - * - * @see TestCase#tearDown() - */ - @Override - protected void tearDown() throws Exception { -//Has been commented by Maksim Areshkau, -//this lines was a fix for JBIDE-6197 and not needed under eclipse 3.6 -// boolean isJobsCheck = true; -// while (isJobsCheck) { -// isJobsCheck = false; -// Job[] jobs = Job.getJobManager().find(null); -// for (Job job : jobs) { -// if (job instanceof StructuredRegionProcessor) { -// TestUtil.delay(50); -// isJobsCheck = true; -// break; -// } -// } -// } - - closeEditors(); - - Platform.removeLogListener(this); - - if (getException() != null) { - throw new Exception(getException()); - } - - super.tearDown(); - - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime - * .IStatus, java.lang.String) - */ - /** - * Logging. - * - * @param status - * the status - * @param plugin - * the plugin - */ - public void logging(IStatus status, String plugin) { - switch (status.getSeverity()) { - case IStatus.ERROR: - setException(status.getException()); - break; - case IStatus.WARNING: - if (isCheckWarning()) - setException(status.getException()); - break; - default: - break; - } - - } - - /** - * close all opened editors. - */ - protected void closeEditors() { - - // wait - // TestUtil.waitForJobs(); - IWorkbenchPage page = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(); - IWorkbenchPart part = page.getActivePart(); - page.activate(part); - // close - page.closeAllEditors(false); - - } - - /** - * - * @return source document - */ - protected Document getSourceDocument(VpeController controller) { - - return controller.getSourceBuilder().getSourceDocument(); - - } - - /** - * Perfoms test for some page. - * - * @param componentPage - * the component page - * - * @throws Throwable - * the throwable - * @throws PartInitException - * the part init exception - */ - protected void performTestForVpeComponent(IFile componentPage) - throws PartInitException, Throwable { - TestUtil.waitForJobs(); - - setException(null); - - // IFile file = (IFile) - // TestUtil.getComponentPath(componentPage,getImportProjectName()); - IEditorInput input = new FileEditorInput(componentPage); - - TestUtil.waitForJobs(); - - IEditorPart editor = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage().openEditor(input, - getEditorID(), true); - // here we wait for inintialization VPE controller - TestUtil.getVpeController((JSPMultiPageEditor) editor); - - assertNotNull(editor); - - TestUtil.waitForJobs(); - // JBIDE-1628 - // TestUtil.delay(1000); - - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .closeAllEditors(true); - - if (getException() != null) { - throw getException(); - } - } - - /** - * Open JSPMultiPageEditor editor. - * - * @param input - * the input - * - * @return the JSP multi page editor - * - * @throws PartInitException - * the part init exception - */ - protected JSPMultiPageEditor openEditor(IEditorInput input) - throws PartInitException { - - // get editor - JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI - .getWorkbench().getActiveWorkbenchWindow().getActivePage() - .openEditor(input, getEditorID(), true); - - assertNotNull(part); - return part; - - } - - /** - * Open JSPMultiPageEditor editor. - * - * @param input - * the input - * - * @return the JSP multi page editor - * - * @throws PartInitException - * the part init exception - */ - protected JSPMultiPageEditor openEditor(IFile input) - throws PartInitException { - - // get editor - JSPMultiPageEditor part = (JSPMultiPageEditor) IDE.openEditor(PlatformUI - .getWorkbench().getActiveWorkbenchWindow().getActivePage(), - input); - - assertNotNull(part); - return part; - - } - - /** - * Gets the exception. - * - * @return the exception - */ - protected Throwable getException() { - return exception; - } - - /** - * Sets the exception. - * - * @param exception - * the exception to set - */ - protected void setException(Throwable exception) { - this.exception = exception; - } - - /** - * Checks if is check warning. - * - * @return the checkWarning - */ - protected boolean isCheckWarning() { - return checkWarning; - } - - /** - * Sets the check warning. - * - * @param checkWarning - * the checkWarning to set - */ - protected void setCheckWarning(boolean checkWarning) { - this.checkWarning = checkWarning; - } - - /** - * Compares source nodes selection and visual selection - * - * @param VPE - * Editor part - */ - protected void checkSourceSelection(JSPMultiPageEditor part) { - // get controller - VpeController controller = TestUtil.getVpeController(part); - assertNotNull(controller); - - // get dommapping - VpeDomMapping domMapping = controller.getDomMapping(); - - assertNotNull(domMapping); - - // get source map - Map<Node, VpeNodeMapping> sourceMap = domMapping.getSourceMap(); - assertNotNull(sourceMap); - - // get collection of VpeNodeMapping - Collection<VpeNodeMapping> mappings = sourceMap.values(); - assertNotNull(mappings); - - // get editor control - StyledText styledText = part.getSourceEditor().getTextViewer() - .getTextWidget(); - assertNotNull(styledText); - - // get xulrunner editor - XulRunnerEditor xulRunnerEditor = controller.getXulRunnerEditor(); - assertNotNull(xulRunnerEditor); - - for (VpeNodeMapping nodeMapping : mappings) { - - /** - * exclude out DomDocument ( it is added to mapping specially ) and - * nodes without visual representation - */ - if (!(nodeMapping.getSourceNode() instanceof IDOMDocument) - && (nodeMapping.getVisualNode() != null)) { - - SelectionUtil.setSourceSelection(controller.getPageContext(), - nodeMapping.getSourceNode(), 1, 0); - - TestUtil.delay(50); - - assertNotNull(xulRunnerEditor.getLastSelectedNode()); - - nsIDOMNode sample; - if (nodeMapping.getSourceNode().getNodeType() == Node.TEXT_NODE - && ((VpeElementMapping) nodeMapping).getElementData() != null) { - - sample = ((VpeElementMapping) nodeMapping).getElementData() - .getNodesData().get(0).getVisualNode(); - } else { - sample = nodeMapping.getVisualNode(); - } - - assertEquals(sample, xulRunnerEditor.getLastSelectedNode()); - } - } - } - - /** - * Opens specified file in the VPE editor. - * - * @param projectName - * the name of the project - * @param fileName - * the name of the file - * - * @return VpeController - * @throws CoreException - * @throws IOException - */ - protected VpeController openInVpe(String projectName, String fileName) - throws CoreException, IOException { - // get test page path - final IFile file = (IFile) TestUtil.getComponentPath(fileName, - projectName); - assertNotNull("Could not open specified file." //$NON-NLS-1$ - + " componentPage = " + fileName //$NON-NLS-1$ - + ";projectName = " + projectName, file); //$NON-NLS-1$ - - final IEditorInput input = new FileEditorInput(file); - assertNotNull("Editor input is null", input); //$NON-NLS-1$ - - // open and get the editor - final JSPMultiPageEditor part = openEditor(input); - - final VpeController vpeController = TestUtil.getVpeController(part); - return vpeController; - } - - /** - * find source element by "id" - * - * @param controller - * @param elementId - * @return - */ - protected Element findSourceElementById(VpeController controller, - String elementId) { - - return getSourceDocument(controller).getElementById(elementId); - } - - /** - * find visual element by "id" entered in source part of vpe - * - * @param controller - * @param elementId - * @return - */ - protected nsIDOMElement findElementById(VpeController controller, - String elementId) { - - Element sourceElement = findSourceElementById(controller, elementId); - - VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping( - sourceElement); - - if (nodeMapping == null) - return null; - - return (nsIDOMElement) nodeMapping.getVisualNode(); - } - - protected String getEditorID(){ - return EDITOR_ID; - } -} Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,467 @@ +/******************************************************************************* + * 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.tools.vpe.base.test; + +import java.io.IOException; +import java.util.Collection; +import java.util.Map; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.ILogListener; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.jboss.tools.common.model.util.ClassLoaderUtil; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; +import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; +import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; +import org.jboss.tools.vpe.editor.util.SelectionUtil; +import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * The Class VpeTest. + * + * @author Max Areshkau + * + * Base Class for VPE tests + */ +public class VpeTest extends TestCase implements ILogListener { + + /** Editor in which we open visual page. */ + protected final static String EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$ + + /** Collects exceptions. */ + private Throwable exception; + + /** check warning log. */ + private boolean checkWarning = false; + + // FIX for JBIDE-1628 + static { + ClassLoaderUtil.init(); + // wait for initialization + TestUtil.delay(3000); + JspEditorPlugin + .getDefault() + .getPreferenceStore() + .setValue( + IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, + false); + } + + /** + * The Constructor. + * + * @param importProjectName + * * @param name the name + */ + + public VpeTest(String name) { + super(name); + + } + + /** + * Perform pre-test initialization. + * + * @throws Exception + * the exception + * + * @see TestCase#setUp() + */ + @Override + protected void setUp() throws Exception { + super.setUp(); + Platform.addLogListener(this); + // String jbossPath = System.getProperty( + // "jbosstools.test.jboss.home.4.2", "C:\\java\\jboss-4.2.2.GA"); + // JBossASAdapterInitializer.initJBossAS(jbossPath, new + // NullProgressMonitor()); + closeEditors(); + } + + /** + * Perform post-test cleanup. + * + * @throws Exception + * the exception + * + * @see TestCase#tearDown() + */ + @Override + protected void tearDown() throws Exception { +//Has been commented by Maksim Areshkau, +//this lines was a fix for JBIDE-6197 and not needed under eclipse 3.6 +// boolean isJobsCheck = true; +// while (isJobsCheck) { +// isJobsCheck = false; +// Job[] jobs = Job.getJobManager().find(null); +// for (Job job : jobs) { +// if (job instanceof StructuredRegionProcessor) { +// TestUtil.delay(50); +// isJobsCheck = true; +// break; +// } +// } +// } + + closeEditors(); + + Platform.removeLogListener(this); + + if (getException() != null) { + throw new Exception(getException()); + } + + super.tearDown(); + + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime + * .IStatus, java.lang.String) + */ + /** + * Logging. + * + * @param status + * the status + * @param plugin + * the plugin + */ + public void logging(IStatus status, String plugin) { + switch (status.getSeverity()) { + case IStatus.ERROR: + setException(status.getException()); + break; + case IStatus.WARNING: + if (isCheckWarning()) + setException(status.getException()); + break; + default: + break; + } + + } + + /** + * close all opened editors. + */ + protected void closeEditors() { + + // wait + // TestUtil.waitForJobs(); + IWorkbenchPage page = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + IWorkbenchPart part = page.getActivePart(); + page.activate(part); + // close + page.closeAllEditors(false); + + } + + /** + * + * @return source document + */ + protected Document getSourceDocument(VpeController controller) { + + return controller.getSourceBuilder().getSourceDocument(); + + } + + /** + * Perfoms test for some page. + * + * @param componentPage + * the component page + * + * @throws Throwable + * the throwable + * @throws PartInitException + * the part init exception + */ + protected void performTestForVpeComponent(IFile componentPage) + throws PartInitException, Throwable { + TestUtil.waitForJobs(); + + setException(null); + + // IFile file = (IFile) + // TestUtil.getComponentPath(componentPage,getImportProjectName()); + IEditorInput input = new FileEditorInput(componentPage); + + TestUtil.waitForJobs(); + + IEditorPart editor = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage().openEditor(input, + getEditorID(), true); + // here we wait for inintialization VPE controller + TestUtil.getVpeController((JSPMultiPageEditor) editor); + + assertNotNull(editor); + + TestUtil.waitForJobs(); + // JBIDE-1628 + // TestUtil.delay(1000); + + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .closeAllEditors(true); + + if (getException() != null) { + throw getException(); + } + } + + /** + * Open JSPMultiPageEditor editor. + * + * @param input + * the input + * + * @return the JSP multi page editor + * + * @throws PartInitException + * the part init exception + */ + protected JSPMultiPageEditor openEditor(IEditorInput input) + throws PartInitException { + + // get editor + JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI + .getWorkbench().getActiveWorkbenchWindow().getActivePage() + .openEditor(input, getEditorID(), true); + + assertNotNull(part); + return part; + + } + + /** + * Open JSPMultiPageEditor editor. + * + * @param input + * the input + * + * @return the JSP multi page editor + * + * @throws PartInitException + * the part init exception + */ + protected JSPMultiPageEditor openEditor(IFile input) + throws PartInitException { + + // get editor + JSPMultiPageEditor part = (JSPMultiPageEditor) IDE.openEditor(PlatformUI + .getWorkbench().getActiveWorkbenchWindow().getActivePage(), + input); + + assertNotNull(part); + return part; + + } + + /** + * Gets the exception. + * + * @return the exception + */ + protected Throwable getException() { + return exception; + } + + /** + * Sets the exception. + * + * @param exception + * the exception to set + */ + protected void setException(Throwable exception) { + this.exception = exception; + } + + /** + * Checks if is check warning. + * + * @return the checkWarning + */ + protected boolean isCheckWarning() { + return checkWarning; + } + + /** + * Sets the check warning. + * + * @param checkWarning + * the checkWarning to set + */ + protected void setCheckWarning(boolean checkWarning) { + this.checkWarning = checkWarning; + } + + /** + * Compares source nodes selection and visual selection + * + * @param VPE + * Editor part + */ + protected void checkSourceSelection(JSPMultiPageEditor part) { + // get controller + VpeController controller = TestUtil.getVpeController(part); + assertNotNull(controller); + + // get dommapping + VpeDomMapping domMapping = controller.getDomMapping(); + + assertNotNull(domMapping); + + // get source map + Map<Node, VpeNodeMapping> sourceMap = domMapping.getSourceMap(); + assertNotNull(sourceMap); + + // get collection of VpeNodeMapping + Collection<VpeNodeMapping> mappings = sourceMap.values(); + assertNotNull(mappings); + + // get editor control + StyledText styledText = part.getSourceEditor().getTextViewer() + .getTextWidget(); + assertNotNull(styledText); + + // get xulrunner editor + XulRunnerEditor xulRunnerEditor = controller.getXulRunnerEditor(); + assertNotNull(xulRunnerEditor); + + for (VpeNodeMapping nodeMapping : mappings) { + + /** + * exclude out DomDocument ( it is added to mapping specially ) and + * nodes without visual representation + */ + if (!(nodeMapping.getSourceNode() instanceof IDOMDocument) + && (nodeMapping.getVisualNode() != null)) { + + SelectionUtil.setSourceSelection(controller.getPageContext(), + nodeMapping.getSourceNode(), 1, 0); + + TestUtil.delay(50); + + assertNotNull(xulRunnerEditor.getLastSelectedNode()); + + nsIDOMNode sample; + if (nodeMapping.getSourceNode().getNodeType() == Node.TEXT_NODE + && ((VpeElementMapping) nodeMapping).getElementData() != null) { + + sample = ((VpeElementMapping) nodeMapping).getElementData() + .getNodesData().get(0).getVisualNode(); + } else { + sample = nodeMapping.getVisualNode(); + } + + assertEquals(sample, xulRunnerEditor.getLastSelectedNode()); + } + } + } + + /** + * Opens specified file in the VPE editor. + * + * @param projectName + * the name of the project + * @param fileName + * the name of the file + * + * @return VpeController + * @throws CoreException + * @throws IOException + */ + protected VpeController openInVpe(String projectName, String fileName) + throws CoreException, IOException { + // get test page path + final IFile file = (IFile) TestUtil.getComponentPath(fileName, + projectName); + assertNotNull("Could not open specified file." //$NON-NLS-1$ + + " componentPage = " + fileName //$NON-NLS-1$ + + ";projectName = " + projectName, file); //$NON-NLS-1$ + + final IEditorInput input = new FileEditorInput(file); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ + + // open and get the editor + final JSPMultiPageEditor part = openEditor(input); + + final VpeController vpeController = TestUtil.getVpeController(part); + return vpeController; + } + + /** + * find source element by "id" + * + * @param controller + * @param elementId + * @return + */ + protected Element findSourceElementById(VpeController controller, + String elementId) { + + return getSourceDocument(controller).getElementById(elementId); + } + + /** + * find visual element by "id" entered in source part of vpe + * + * @param controller + * @param elementId + * @return + */ + protected nsIDOMElement findElementById(VpeController controller, + String elementId) { + + Element sourceElement = findSourceElementById(controller, elementId); + + VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping( + sourceElement); + + if (nodeMapping == null) + return null; + + return (nsIDOMElement) nodeMapping.getVisualNode(); + } + + protected String getEditorID(){ + return EDITOR_ID; + } +} Deleted: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTestSetup.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTestSetup.java 2010-11-30 01:19:37 UTC (rev 27014) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTestSetup.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,56 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2007-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.tools.vpe.base.test; - -import org.eclipse.ui.IViewReference; -import org.eclipse.ui.PlatformUI; -//import org.jboss.tools.vpe.ui.test.ProjectsLoader; - -import junit.extensions.TestSetup; -import junit.framework.TestSuite; - -/** - * @author Max Areshkau - * @author Yahor Radtsevich (yradtsevich) - * - * Class for tear down JUnit tests (remove projects from workspace) - * - */ -public class VpeTestSetup extends TestSetup { - private static final String CONTENT_OUTLINE_VIEW_ID = "org.eclipse.ui.views.ContentOutline"; - - public VpeTestSetup(TestSuite test) { - super(test); - } - - /* (non-Javadoc) - * @see junit.extensions.TestSetup#setUp() - */ - @Override - protected void setUp() throws Exception { - //added by Maksim Areshkau, Fix for https://jira.jboss.org/jira/browse/JBIDE-5820 https://jira.jboss.org/jira/browse/JBIDE-5821 - //remove this code when we will move on wtp 3.2 - IViewReference[] iviewReferences= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getViewReferences(); - for (IViewReference iViewReference : iviewReferences) { - if(VpeTestSetup.CONTENT_OUTLINE_VIEW_ID.equalsIgnoreCase(iViewReference.getId())){ - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().hideView(iViewReference); - } - } - } - - /* (non-Javadoc) - * @see junit.extensions.TestSetup#tearDown() - */ - @Override - protected void tearDown() throws Exception { - //ProjectsLoader.removeAllProjects(); - } -} Copied: branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTestSetup.java (from rev 27014, trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTestSetup.java) =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTestSetup.java (rev 0) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTestSetup.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -0,0 +1,56 @@ +/******************************************************************************* +* Copyright (c) 2007-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.tools.vpe.base.test; + +import org.eclipse.ui.IViewReference; +import org.eclipse.ui.PlatformUI; +//import org.jboss.tools.vpe.ui.test.ProjectsLoader; + +import junit.extensions.TestSetup; +import junit.framework.TestSuite; + +/** + * @author Max Areshkau + * @author Yahor Radtsevich (yradtsevich) + * + * Class for tear down JUnit tests (remove projects from workspace) + * + */ +public class VpeTestSetup extends TestSetup { + private static final String CONTENT_OUTLINE_VIEW_ID = "org.eclipse.ui.views.ContentOutline"; + + public VpeTestSetup(TestSuite test) { + super(test); + } + + /* (non-Javadoc) + * @see junit.extensions.TestSetup#setUp() + */ + @Override + protected void setUp() throws Exception { + //added by Maksim Areshkau, Fix for https://jira.jboss.org/jira/browse/JBIDE-5820 https://jira.jboss.org/jira/browse/JBIDE-5821 + //remove this code when we will move on wtp 3.2 + IViewReference[] iviewReferences= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getViewReferences(); + for (IViewReference iViewReference : iviewReferences) { + if(VpeTestSetup.CONTENT_OUTLINE_VIEW_ID.equalsIgnoreCase(iViewReference.getId())){ + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().hideView(iViewReference); + } + } + } + + /* (non-Javadoc) + * @see junit.extensions.TestSetup#tearDown() + */ + @Override + protected void tearDown() throws Exception { + //ProjectsLoader.removeAllProjects(); + } +} Modified: branches/jbosstools-3.2.0.Beta2/vpe/plugins/pom.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/plugins/pom.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/plugins/pom.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -14,6 +14,7 @@ <packaging>pom</packaging> <modules> <module>org.jboss.tools.vpe</module> + <module>org.jboss.tools.vpe.base.test</module> <module>org.jboss.tools.vpe.docbook</module> <module>org.jboss.tools.vpe.html</module> <module>org.jboss.tools.vpe.jsp</module> Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -17,7 +17,7 @@ org.jboss.tools.common.model, org.jboss.tools.vpe.xulrunner, org.mozilla.xpcom, - org.jboss.tools.vpe.ui.test, + org.jboss.tools.vpe.base.test, org.jboss.tools.vpe.html Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests description="Tests for Html templates" name="Tests for Html templates" Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -13,8 +13,8 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.jboss.tools.vpe.base.test.VpeTestSetup; import org.jboss.tools.vpe.html.test.jbide.JBIDE3280Test; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; /** Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.html.test; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * Class for testing all jsf components Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,8 +11,8 @@ package org.jboss.tools.vpe.html.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing all html components Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/JBIDE3280Test.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/JBIDE3280Test.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/JBIDE3280Test.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -17,12 +17,12 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.VpeDebug; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.html.test.HtmlAllTests; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.jboss.tools.vpe.xulrunner.util.DOMTreeDumper; import org.mozilla.interfaces.nsIDOMDocument; Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,11 +11,11 @@ org.eclipse.core.resources, org.eclipse.ui.ide, org.jboss.tools.common, - org.jboss.tools.vpe.ui.test, org.jboss.tools.jst.jsp, org.jboss.tools.vpe.xulrunner, org.mozilla.xpcom, - org.jboss.tools.vpe.jsp + org.jboss.tools.vpe.jsp, + org.jboss.tools.vpe.base.test;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.vpe.jsp.test Bundle-Vendor: %Bundle-Vendor.0 Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests description="JSP Tests" name="JSP Tests" Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.jsp.test; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; import junit.framework.Test; import junit.framework.TestSuite; Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,8 +11,8 @@ package org.jboss.tools.vpe.jsp.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -6,14 +6,14 @@ Bundle-Activator: org.jboss.tools.vpe.spring.test.SpringTestPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.vpe.ui.test, org.jboss.tools.common.text.ext, org.jboss.tools.common.model, org.jboss.tools.vpe.xulrunner, org.junit, org.jboss.tools.vpe.spring;bundle-version="3.1.0", org.jboss.tools.vpe.jsp;bundle-version="3.1.0", - org.jboss.tools.vpe.html;bundle-version="3.1.0" + org.jboss.tools.vpe.html;bundle-version="3.1.0", + org.jboss.tools.vpe.base.test;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.vpe.spring.test Bundle-Vendor: %Bundle-Vendor.0 Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.3"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests description="Unit tests for Spring support in VPE" name="Spring Tests" Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.spring.test; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; import junit.framework.Test; import junit.framework.TestSuite; Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.spring.test; -import org.jboss.tools.vpe.ui.test.ComponentContentTest; +import org.jboss.tools.vpe.base.test.ComponentContentTest; /** * Tests for the context that was generated by Spring templates Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,7 +11,7 @@ org.jboss.tools.vpe, org.jboss.tools.common.model.ui;bundle-version="2.0.0", org.eclipse.jface.text;bundle-version="3.4.0", - org.jboss.tools.vpe.ui.test;bundle-version="1.0.0" + org.jboss.tools.vpe.base.test;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.vpe.editor.template, org.jboss.tools.vpe.test Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -2,7 +2,7 @@ <?eclipse version="3.4"?> <plugin> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests testSuite="org.jboss.tools.vpe.test.VpeAllTests"> </tests> Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -14,8 +14,8 @@ import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jboss.tools.vpe.base.test.VpeTestSetup; import org.jboss.tools.vpe.editor.template.VpeTemplateManagerTest; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; /** * Class created for run tests for org.jboss.tools.vpe plugin. Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-12-01 01:19:37 UTC (rev 27040) @@ -21,7 +21,8 @@ org.jboss.tools.vpe.ui.palette;visibility:=reexport, org.jboss.tools.vpe.resref, javax.servlet;bundle-version="2.5.0", - org.eclipse.wst.xml.xpath.core + org.eclipse.wst.xml.xpath.core, + org.jboss.tools.vpe.base.test;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., lib/jmock-2.5.1/jmock-2.5.1.jar, Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml 2010-12-01 01:19:37 UTC (rev 27040) @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.2"?> <plugin> - <extension-point id="org.jboss.tools.vpe.ui.tests" name="Visual Page Editor Junit Test" schema="schema/vpe.tests.exsd"/> <extension - point="org.jboss.tools.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.test"> <tests description="UI tests of VPE components" name="UI tests of VPE" Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project 2010-12-01 01:19:37 UTC (rev 27040) @@ -15,17 +15,11 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.jboss.tools.common.verification.verifybuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.jboss.tools.jsf.jsfnature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature> </natures> </projectDescription> Deleted: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-12-01 01:19:37 UTC (rev 27040) @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Deleted: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-12-01 01:19:37 UTC (rev 27040) @@ -1 +0,0 @@ -Window \ No newline at end of file Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/editor/menu/VpePopupMenuTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/editor/menu/VpePopupMenuTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/editor/menu/VpePopupMenuTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -27,13 +27,13 @@ import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.messages.JstUIMessages; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; import org.jboss.tools.vpe.editor.util.SelectionUtil; import org.jboss.tools.vpe.messages.VpeUIMessages; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.jboss.tools.vpe.ui.test.VpeUiTests; import org.w3c.dom.Node; Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VPETestPlugin.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VPETestPlugin.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VPETestPlugin.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -25,7 +25,7 @@ // The plug-in ID public static final String PLUGIN_ID = "org.jboss.tools.vpe.ui.test"; - public static final String VPE_TEST_EXTENTION_POINT_ID = "org.jboss.tools.vpe.ui.tests"; //$NON-NLS-1$ + public static final String VPE_TEST_EXTENTION_POINT_ID = "org.jboss.tools.vpe.ui.test"; //$NON-NLS-1$ // The shared instance private static VPETestPlugin plugin; Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -12,6 +12,8 @@ import junit.framework.Test; import junit.framework.TestSuite; + +import org.jboss.tools.vpe.base.test.VpeTestSetup; import org.jboss.tools.vpe.ui.test.dialog.VpeEditAnyDialogTest; import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest; import org.jboss.tools.vpe.ui.test.editor.CustomSashFormTest; Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -11,11 +11,11 @@ import org.eclipse.jface.window.Window; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.template.VpeAnyData; import org.jboss.tools.vpe.editor.template.VpeEditAnyDialog; import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.vpe.editor.util.Constants; -import org.jboss.tools.vpe.ui.test.VpeTest; public class VpeEditAnyDialogTest extends VpeTest { Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -12,9 +12,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.window.Window; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.resref.core.VpeResourcesDialog; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.jboss.tools.vpe.ui.test.VpeUiTests; public class VpeResourcesDialogTest extends VpeTest { Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -7,9 +7,9 @@ import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.jst.jsp.editor.IVisualEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeEditorPart; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.jboss.tools.vpe.ui.test.VpeUiTests; public class CustomSashFormTest extends VpeTest { Modified: branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java 2010-12-01 00:29:23 UTC (rev 27039) +++ branches/jbosstools-3.2.0.Beta2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java 2010-12-01 01:19:37 UTC (rev 27040) @@ -34,6 +34,8 @@ import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart; import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; @@ -45,8 +47,6 @@ import org.jboss.tools.vpe.handlers.ShowBundleAsELHandler; import org.jboss.tools.vpe.handlers.ShowNonVisualTagsHandler; import org.jboss.tools.vpe.handlers.ShowTextFormattingHandler; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; import org.jboss.tools.vpe.ui.test.VpeUiTests; /**

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r27039 - in trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test: src/org/jboss/tools/struts/vpe/struts/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-11-30 19:29:23 -0500 (Tue, 30 Nov 2010) New Revision: 27039 Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsNestedComponentTest.java trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsTilesComponentTest.java Log: https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared this fix decouples struts from jsf.ui.tests and fixes the errors intoduced by revision #27014 Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF 2010-11-30 22:21:56 UTC (rev 27038) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/META-INF/MANIFEST.MF 2010-12-01 00:29:23 UTC (rev 27039) @@ -6,7 +6,7 @@ Bundle-Activator: org.jboss.tools.struts.vpe.struts.test.StrutsTestPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.vpe.ui.test;visibility:=reexport, + org.jboss.tools.vpe.base.test;visibility:=reexport, org.jboss.tools.common.text.ext, org.jboss.tools.common.model, org.jboss.tools.vpe.xulrunner, Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java 2010-11-30 22:21:56 UTC (rev 27038) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java 2010-12-01 00:29:23 UTC (rev 27039) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.vpe.struts.test; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.base.test.VpeTestSetup; import junit.framework.Test; import junit.framework.TestSuite; Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java 2010-11-30 22:21:56 UTC (rev 27038) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing bean struts components Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java 2010-11-30 22:21:56 UTC (rev 27038) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing form struts components Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java 2010-11-30 22:21:56 UTC (rev 27038) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing html struts components Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java 2010-11-30 22:21:56 UTC (rev 27038) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing logic struts components Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsNestedComponentTest.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsNestedComponentTest.java 2010-11-30 22:21:56 UTC (rev 27038) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsNestedComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing nested struts components Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsTilesComponentTest.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsTilesComponentTest.java 2010-11-30 22:21:56 UTC (rev 27038) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsTilesComponentTest.java 2010-12-01 00:29:23 UTC (rev 27039) @@ -11,8 +11,8 @@ package org.jboss.tools.struts.vpe.struts.test; import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; /** * Class for testing tiles struts components

13 years, 5 months

1
0
0 / 0

← Newer
1
...
77
78
79
80
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits December 2010