From aec6da3bab5ab14442290a0362c4b818d2b60a55 Mon Sep 17 00:00:00 2001
From: izabel <izabel>
Date: Wed, 16 Sep 2009 12:22:14 +0000
Subject: [PATCH] fix system tests
SVN: 12626
---
.../ui/filter/FilterSelectionWidget.java | 8 ++++++++
.../application/ui/widget/DropDownList.java | 19 +++++++++++++++++++
.../AuthorizationManagementConsolTest.java | 5 -----
.../application/FileFormatTypeGridTest.java | 2 --
.../ui/amc/OpenRoleAssignmentDialog.java | 2 --
.../ui/experiment/ListExperiments.java | 2 --
.../ui/material/ListMaterials.java | 2 --
7 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/filter/FilterSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/filter/FilterSelectionWidget.java
index 5b18089eb88..b642bc88fb6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/filter/FilterSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/filter/FilterSelectionWidget.java
@@ -39,6 +39,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKin
public final class FilterSelectionWidget extends DropDownList<FilterModel, Filter> implements
IDelegatedAction
{
+ private static final String LIST_ITEMS_CALLBACK = "ListItemsCallback";
+
public static final String SUFFIX = "filter";
private final IViewContext<?> viewContext;
@@ -56,6 +58,12 @@ public final class FilterSelectionWidget extends DropDownList<FilterModel, Filte
this.displayTypeIDProvider = displayTypeIDProvider;
this.withStandard = true;
setAutoSelectFirst(withStandard);
+ setCallbackId(createCallbackId());
+ }
+
+ public static String createCallbackId()
+ {
+ return FilterSelectionWidget.class + LIST_ITEMS_CALLBACK;
}
@Override
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java
index f030cfd7d7b..e2970aa818d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java
@@ -68,6 +68,8 @@ abstract public class DropDownList<M extends ModelData, E> extends ComboBox<M> i
private final IViewContext<?> viewContextOrNull;
+ public String callbackIdOrNull;
+
public DropDownList(final IViewContext<?> viewContext, String idSuffix, String labelDictCode,
String displayField, String chooseSuffix, String nothingFoundSuffix)
{
@@ -99,6 +101,11 @@ abstract public class DropDownList<M extends ModelData, E> extends ComboBox<M> i
setStore(new ListStore<M>());
}
+ protected void setCallbackId(String callbackId)
+ {
+ this.callbackIdOrNull = callbackId;
+ }
+
private static String createId(String idSuffix)
{
return ID + idSuffix;
@@ -182,6 +189,18 @@ abstract public class DropDownList<M extends ModelData, E> extends ComboBox<M> i
updateStore(convertedItems);
}
+ @Override
+ public String getCallbackId()
+ {
+ if (callbackIdOrNull != null)
+ {
+ return callbackIdOrNull;
+ } else
+ {
+ return super.getCallbackId();
+ }
+ }
+
}
protected final void updateStore(final List<M> models)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
index 3af4590bd0a..5dae7b713a4 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
@@ -29,7 +29,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.amc.Ope
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.amc.RoleAssignmentRow;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.GroupColDefKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.PersonColDefKind;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.filter.FilterSelectionWidget;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractGWTTestCase;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.FailureExpectation;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.Row;
@@ -54,8 +53,6 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
loginAndInvokeAction(ActionMenuKind.ADMINISTRATION_MENU_MANAGE_GROUPS);
CreateGroup createGroupCommand = new CreateGroup(groupCode);
- createGroupCommand.addCallbackClass(FilterSelectionWidget.ListItemsCallback.class);
- // fix?
remoteConsole.prepare(createGroupCommand);
final CheckGroupTable table = new CheckGroupTable();
table.addCallbackClass(AddGroupDialog.SaveDialogCallback.class);
@@ -72,7 +69,6 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
loginAndInvokeAction(ActionMenuKind.AUTHORIZATION_MENU_USERS);
CreatePerson command = new CreatePerson(userId);
- command.addCallbackClass(FilterSelectionWidget.ListItemsCallback.class);
remoteConsole.prepare(command);
final CheckPersonTable table = new CheckPersonTable();
table.addCallbackClass(AddPersonDialog.SaveDialogCallback.class);
@@ -121,7 +117,6 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
loginAndInvokeAction("o", "o", ActionMenuKind.AUTHORIZATION_MENU_USERS);
final String userId = "u";
CreatePerson command = new CreatePerson(userId);
- command.addCallbackClass(FilterSelectionWidget.ListItemsCallback.class);
remoteConsole.prepare(command);
FailureExpectation failureExpectation =
new FailureExpectation(AddPersonDialog.SaveDialogCallback.class)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.java
index 56c12173ca6..33187361dfd 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.java
@@ -25,7 +25,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMe
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.TypeColDefKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.FileFormatTypeGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.entity_type.AddTypeDialog;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.filter.FilterSelectionWidget;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractGWTTestCase;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.CheckTableCommand;
@@ -52,7 +51,6 @@ public class FileFormatTypeGridTest extends AbstractGWTTestCase
{
loginAndInvokeAction(ActionMenuKind.DATA_SET_MENU_FILE_FORMATS);
CheckTableCommand table = new CheckTableCommand(FileFormatTypeGrid.GRID_ID);
- table.addCallbackClass(FilterSelectionWidget.ListItemsCallback.class);
table.expectedSize(8);
remoteConsole.prepare(new PiggyBackCommand(table, addNewTypeCommand()));
table = new CheckTableCommand(FileFormatTypeGrid.GRID_ID);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenRoleAssignmentDialog.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenRoleAssignmentDialog.java
index 29457b51e90..09963646ea4 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenRoleAssignmentDialog.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenRoleAssignmentDialog.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.amc;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.MainTabPanel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.RoleAssignmentGrid;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.filter.FilterSelectionWidget;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.CheckTableCommand;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.GWTTestUtil;
@@ -34,7 +33,6 @@ public final class OpenRoleAssignmentDialog extends CheckTableCommand
public OpenRoleAssignmentDialog()
{
super(RoleAssignmentGrid.GRID_ID);
- addCallbackClass(FilterSelectionWidget.ListItemsCallback.class);
}
@Override
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ListExperiments.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ListExperiments.java
index 97257be8fc8..7c56bbbc3d7 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ListExperiments.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ListExperiments.java
@@ -21,7 +21,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ExperimentTypeModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.filter.FilterSelectionWidget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.GWTTestUtil;
@@ -56,7 +55,6 @@ public class ListExperiments extends AbstractDefaultTestCommand
addCallbackClass(ProjectSelectionTreeWidget.ListProjectsCallback.class);
addCallbackClass(ExperimentTypeSelectionWidget.ListItemsCallback.class);
}
- addCallbackClass(FilterSelectionWidget.ListItemsCallback.class);
}
//
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/ListMaterials.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/ListMaterials.java
index 4fb803f9bd4..9d28efd0df2 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/ListMaterials.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/ListMaterials.java
@@ -20,7 +20,6 @@ import com.extjs.gxt.ui.client.widget.form.ComboBox;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.MaterialTypeModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.filter.FilterSelectionWidget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.GWTTestUtil;
@@ -37,7 +36,6 @@ public class ListMaterials extends AbstractDefaultTestCommand
public ListMaterials(final String materialTypeNameOrNull)
{
this.materialTypeName = materialTypeNameOrNull;
- addCallbackClass(FilterSelectionWidget.ListItemsCallback.class);
addCallbackClass(MaterialTypeSelectionWidget.ListItemsCallback.class);
}
--
GitLab