modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
| 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
| 17 +++++++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
| 3 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
| 7 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java
| 3 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
| 5 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
| 5 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
| 3 +
8 files changed, 33 insertions(+), 12 deletions(-)
New commits:
commit d7de3626f87972f5a4a3ec705a576face3a958ff
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Feb 1 11:21:02 2011 -0500
fix the scLocators so they are selenium-testable
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
index 3241cd5..21af1a6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
@@ -355,7 +355,7 @@ public class RemoteAgentInstallView extends LocatableVLayout {
}
private void buildInstallInfoCanvas(VLayout installInfo, AgentInstallInfo info) {
- DynamicForm infoForm = new DynamicForm();
+ DynamicForm infoForm = new
LocatableDynamicForm(extendLocatorId("infoForm"));
infoForm.setMargin(20);
infoForm.setWidth100();
infoForm.setHeight100();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
index 265167a..49b2484 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
@@ -44,9 +44,13 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
+import org.rhq.enterprise.gui.coregui.client.components.tab.NamedTab;
+import org.rhq.enterprise.gui.coregui.client.components.tab.NamedTabSet;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
+import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -95,15 +99,18 @@ public class AlertDetailsView extends LocatableVLayout implements
BookmarkableVi
}
private TabSet getDetailsTabSet(Record record) {
- TabSet tabset = new TabSet();
+ TabSet tabset = new NamedTabSet(extendLocatorId("detailsTabSet"));
- Tab generalTab = new Tab(MSG.view_alert_common_tab_general());
+ Tab generalTab = new NamedTab(extendLocatorId("general"), new
ViewName("general", MSG
+ .view_alert_common_tab_general()));
generalTab.setPane(getDetailsTableForAlert(record));
- Tab conditionsTab = new Tab(MSG.view_alert_common_tab_conditions());
+ Tab conditionsTab = new NamedTab(extendLocatorId("conditions"), new
ViewName("conditions", MSG
+ .view_alert_common_tab_conditions()));
conditionsTab.setPane(getConditionsForAlert(record));
- Tab notificationsTab = new Tab(MSG.view_alert_common_tab_notifications());
+ Tab notificationsTab = new NamedTab(extendLocatorId("notifications"),
new ViewName("notifications", MSG
+ .view_alert_common_tab_notifications()));
notificationsTab.setPane(getNotificationsForAlert(record));
tabset.addTab(generalTab);
@@ -114,7 +121,7 @@ public class AlertDetailsView extends LocatableVLayout implements
BookmarkableVi
}
private DynamicForm getDetailsTableForAlert(Record record) {
- DynamicForm form = new DynamicForm();
+ DynamicForm form = new
LocatableDynamicForm(extendLocatorId("detailsForm"));
form.setNumCols(4);
form.setHeight("15%");
form.setWrapItemTitles(false);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
index 5b0c30c..c4de0d7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
@@ -35,6 +35,7 @@ import
org.rhq.enterprise.gui.coregui.client.components.selector.AbstractSelecto
import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/**
* @author Jay Shaughnessy
@@ -48,7 +49,7 @@ public class BundleSelector extends AbstractSelector<Bundle> {
}
protected DynamicForm getAvailableFilterForm() {
- DynamicForm availableFilterForm = new DynamicForm();
+ DynamicForm availableFilterForm = new
LocatableDynamicForm(extendLocatorId("availableForm"));
availableFilterForm.setNumCols(4);
final TextItem search = new TextItem("search",
MSG.common_title_search());
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
index 3ed578a..c188a42 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
@@ -76,7 +76,12 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
radioItems.put(UPLOAD_OPTION, createUploadForm());
radioItems.put(RECIPE_OPTION, createRecipeForm());
- mainCanvasForm = new DynamicForm();
+ if (parent != null) {
+ mainCanvasForm = new
LocatableDynamicForm(parent.extendLocatorId("mainCanvasForm"));
+ } else {
+ mainCanvasForm = new LocatableDynamicForm("mainCanvasForm");
+ }
+
radioGroup = new
RadioGroupWithComponentsItem("bundleDistRadioGroup", MSG
.view_bundle_createWizard_bundleDistro(), radioItems, mainCanvasForm);
radioGroup.setShowTitle(false);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java
index b6c081b..4a7b5ac 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java
@@ -39,6 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class GetDestinationStep extends AbstractWizardStep {
@@ -46,7 +47,7 @@ public class GetDestinationStep extends AbstractWizardStep {
private final BundleGWTServiceAsync bundleServer =
GWTServiceLookup.getBundleService();
private final BundleDeployWizard wizard;
private VLayout form;
- DynamicForm valForm = new DynamicForm();
+ DynamicForm valForm = new
LocatableDynamicForm("GetDestinationStepValForm");
private SinglePlatformResourceGroupSelector selector;
private BundleDestination dest = new BundleDestination();
private boolean createInProgress = false;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
index c8abfb5..3d298c2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
@@ -38,6 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -126,7 +127,7 @@ public class ConfirmationStep extends AbstractWizardStep {
liveHeader.setWidth100();
layout.addMember(liveHeader);
- DynamicForm liveForm = new DynamicForm();
+ DynamicForm liveForm = new
LocatableDynamicForm(this.wizard.getView().extendLocatorId("liveForm"));
liveForm.setNumCols(2);
StaticTextItem liveNameItem = new StaticTextItem("liveName",
MSG.common_title_name());
@@ -162,7 +163,7 @@ public class ConfirmationStep extends AbstractWizardStep {
layout.addMember(prevHeader);
if (prev != null) {
- final DynamicForm prevForm = new DynamicForm();
+ final DynamicForm prevForm = new
LocatableDynamicForm(this.wizard.getView().extendLocatorId("previousForm"));
prevForm.setNumCols(2);
StaticTextItem prevNameItem = new StaticTextItem("prevName",
MSG.common_title_name());
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
index 7f7a77f..9833e80 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
@@ -15,6 +15,11 @@ public class NamedTab extends LocatableTab {
private ViewName viewName;
+ public NamedTab(String locatorId, ViewName viewName) {
+ super(locatorId, viewName.getTitle());
+ this.viewName = viewName;
+ }
+
public NamedTab(String locatorId, ViewName viewName, String icon) {
super(locatorId, viewName.getTitle(), icon);
this.viewName = viewName;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
index f90af80..ea01164 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
@@ -36,6 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -79,7 +80,7 @@ public class EventCompositeDetailsView extends LocatableVLayout
implements Bookm
removeChild(child);
}
- DynamicForm form = new DynamicForm();
+ DynamicForm form = new LocatableDynamicForm(extendLocatorId("form"));
form.setWidth100();
form.setHeight100();