diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
index c0e745aa45afb4e4c5736abbb7e378765cb125be..0f99741ae0f95bb302bc9b4e05fe96fb9dbc1603 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
@@ -183,6 +183,8 @@ public abstract class AbstractExternalDataGrid
return dataSetCodes;
}
+ public static final String SHOW_DETAILS_BUTTON_ID_SUFFIX = "_show-details-button";
+
/**
* @param displayOnlyDatasetProperties if false the grid columns will consist of all property
* types relevant anyhow to datasets, not only property types directly connected to
@@ -201,7 +203,7 @@ public abstract class AbstractExternalDataGrid
addEntityOperationsLabel();
addButton(createBrowseExternalDataButton());
addButton(createSelectedItemButton(viewContext.getMessage(Dict.BUTTON_SHOW_DETAILS),
- asShowEntityInvoker(false)));
+ browserId + SHOW_DETAILS_BUTTON_ID_SUFFIX, asShowEntityInvoker(false)));
addButton(createSelectedItemButton(viewContext.getMessage(Dict.BUTTON_EDIT),
asShowEntityInvoker(true)));
addButton(createSelectedItemsButton(viewContext.getMessage(Dict.BUTTON_DELETE),
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java
index a1bb808bcfe2579b7410904209b522c01989f956..a951994b87ce2947a352d7932f5e41cb9a91e423 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java
@@ -63,7 +63,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKin
public class ExperimentBrowserGrid extends
AbstractEntityBrowserGrid<Experiment, BaseEntityModel<Experiment>, ListExperimentsCriteria>
{
- public static final String ID_SUFFIX_EDIT_BUTTON = "_edit-button";
private static final String PREFIX = "experiment-browser";
@@ -71,6 +70,10 @@ public class ExperimentBrowserGrid extends
public static final String GRID_ID = BROWSER_ID + "_grid";
+ public static final String EDIT_BUTTON_ID = BROWSER_ID + "_edit-button";
+
+ public static final String SHOW_DETAILS_BUTTON_ID = BROWSER_ID + "_show-details-button";
+
/**
* Creates a grid without additional toolbar buttons. It can serve as a entity chooser.
*/
@@ -120,11 +123,12 @@ public class ExperimentBrowserGrid extends
String showDetailsTitle = viewContext.getMessage(Dict.BUTTON_SHOW_DETAILS);
Button showDetailsButton =
createSelectedItemButton(showDetailsTitle, asShowEntityInvoker(false));
+ showDetailsButton.setId(SHOW_DETAILS_BUTTON_ID);
addButton(showDetailsButton);
String editTitle = viewContext.getMessage(Dict.BUTTON_EDIT);
Button editButton = createSelectedItemButton(editTitle, asShowEntityInvoker(true));
- editButton.setId(GRID_ID + ID_SUFFIX_EDIT_BUTTON);
+ editButton.setId(EDIT_BUTTON_ID);
addButton(editButton);
addButton(createSelectedItemsButton(viewContext.getMessage(Dict.BUTTON_DELETE),
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
index f8608077ddb725888665c3bd7bfe204d285979ce..3800278c65599e996b38b99988f01b9277327f2e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
@@ -670,6 +670,18 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
return createSelectedItemButton(title, createNotImplementedInvoker());
}
+ /**
+ * @return like {@link #createSelectedItemButton(String, ISelectedEntityInvoker)} with button id
+ * set
+ */
+ protected final Button createSelectedItemButton(final String title, final String id,
+ final ISelectedEntityInvoker<M> invoker)
+ {
+ final Button button = createSelectedItemButton(title, invoker);
+ button.setId(id);
+ return button;
+ }
+
/**
* @return a button which is enabled only when one entity in the grid is selected. When button
* is pressed, the specified invoker action is performed.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
index 69ec626e4ba165da45e2288d45c2ae2b4ec4008a..0f78aae1e97210f6d161425e4dd1522bcb6fe3b1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
@@ -83,6 +83,10 @@ public class SampleBrowserGrid extends
public static final String GRID_ID = PREFIX + "_grid";
+ public static final String EDIT_BUTTON_ID = BROWSER_ID + "_edit-button";
+
+ public static final String SHOW_DETAILS_BUTTON_ID = BROWSER_ID + "_show-details-button";
+
/** Creates a grid without additional toolbar buttons. It can serve as a entity chooser. */
public static DisposableEntityChooser<Sample> createChooser(
final IViewContext<ICommonClientServiceAsync> viewContext, final boolean addShared,
@@ -233,10 +237,12 @@ public class SampleBrowserGrid extends
String showDetailsTitle = viewContext.getMessage(Dict.BUTTON_SHOW_DETAILS);
Button showDetailsButton =
createSelectedItemButton(showDetailsTitle, asShowEntityInvoker(false));
+ showDetailsButton.setId(SHOW_DETAILS_BUTTON_ID);
addButton(showDetailsButton);
String editTitle = viewContext.getMessage(Dict.BUTTON_EDIT);
Button editButton = createSelectedItemButton(editTitle, asShowEntityInvoker(true));
+ editButton.setId(EDIT_BUTTON_ID);
addButton(editButton);
addButton(createSelectedItemsButton(viewContext.getMessage(Dict.BUTTON_DELETE),
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java
index 22db62c0d2a8a6a6cbece35245d717be9737576e..4031a54baf964d018a75a68b6b94c4a6c47dad8a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java
@@ -69,7 +69,7 @@ public class VocabularyGrid extends AbstractSimpleBrowserGrid<Vocabulary>
public static final String GRID_ID = BROWSER_ID + "_grid";
- public static final String SHOW_DETAILS_BUTTON_ID = BROWSER_ID + "-show-details";
+ public static final String SHOW_DETAILS_BUTTON_ID = BROWSER_ID + "_show-details-button";
private IDelegatedAction postEditionCallback;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java
index 8c4377775a89568c5a7b84cb2147feca759d249d..0ac3de340956f12d450200a235c26daa2fe3e425 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java
@@ -65,7 +65,7 @@ public class VocabularyBrowserTest extends AbstractGWTTestCase
public static void showControlledVocabularyTerms(RemoteConsole remoteConsole,
String vocabularyCode, Integer expectedSize, String... expectedTerms)
{
- remoteConsole.prepare(new ClickOnVocabularyCmd(vocabularyCode));
+ remoteConsole.prepare(new ShowVocabularyTerms(vocabularyCode));
CheckTableCommand termsTable =
new CheckTableCommand(VocabularyTermGrid
.createGridId(TechId.createWildcardTechId()));
@@ -81,14 +81,14 @@ public class VocabularyBrowserTest extends AbstractGWTTestCase
termsTable.expectedColumn(VocabularyTermColDefKind.CODE.id(), code);
}
- public static class ClickOnVocabularyCmd extends AbstractDefaultTestCommand
+ public static class ShowVocabularyTerms extends AbstractDefaultTestCommand
{
- private final String code;
+ private final String vocabularyCode;
- public ClickOnVocabularyCmd(final String code)
+ public ShowVocabularyTerms(final String vocabularyCode)
{
addCallbackClass(VocabularyGrid.GRID_ID);
- this.code = code;
+ this.vocabularyCode = vocabularyCode;
}
@SuppressWarnings("unchecked")
@@ -97,7 +97,8 @@ public class VocabularyBrowserTest extends AbstractGWTTestCase
final Widget widget = GWTTestUtil.getWidgetWithID(VocabularyGrid.GRID_ID);
final Grid<BaseEntityModel<Vocabulary>> table =
(Grid<BaseEntityModel<Vocabulary>>) widget;
- GridTestUtils.fireSingleClick(table, VocabularyColDefKind.CODE.id(), code);
+ GridTestUtils.fireSelectRow(table, VocabularyColDefKind.CODE.id(), vocabularyCode);
+ GWTTestUtil.clickButtonWithID(VocabularyGrid.SHOW_DETAILS_BUTTON_ID);
}
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperiment.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperiment.java
index b50acb71093e79d2a992b6fc8cdbd7c7cf64bcbc..73c0a826b296bbe0ac7838913a2513dc33a01cbf 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperiment.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperiment.java
@@ -47,6 +47,7 @@ public class ShowExperiment extends AbstractDefaultTestCommand
final Widget widget = GWTTestUtil.getWidgetWithID(ExperimentBrowserGrid.GRID_ID);
assertTrue(widget instanceof Grid);
final Grid<BaseEntityModel<Experiment>> table = (Grid<BaseEntityModel<Experiment>>) widget;
- GridTestUtils.fireSingleClick(table, CommonExperimentColDefKind.CODE.id(), code);
+ GridTestUtils.fireSelectRow(table, CommonExperimentColDefKind.CODE.id(), code);
+ GWTTestUtil.clickButtonWithID(ExperimentBrowserGrid.SHOW_DETAILS_BUTTON_ID);
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/ShowSample.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/ShowSample.java
index 94d302757c2f998892334b01a5c6789d0c423abd..19a778fb83126f0b8f8dbfe5fa63a78c0dc9478e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/ShowSample.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/ShowSample.java
@@ -48,6 +48,7 @@ public final class ShowSample extends AbstractDefaultTestCommand
final Widget widget = GWTTestUtil.getWidgetWithID(SampleBrowserGrid.GRID_ID);
assertTrue(widget instanceof Grid);
final Grid<BaseEntityModel<Sample>> table = (Grid<BaseEntityModel<Sample>>) widget;
- GridTestUtils.fireSingleClick(table, CommonSampleColDefKind.CODE.id(), code);
+ GridTestUtils.fireSelectRow(table, CommonSampleColDefKind.CODE.id(), code);
+ GWTTestUtil.clickButtonWithID(SampleBrowserGrid.SHOW_DETAILS_BUTTON_ID);
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/TestUtil.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/TestUtil.java
index 9b0001c58c62aebbe76be74dc8adadbccff5cd80..a097809b3fcdd0d50616451faa744009e9526536 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/TestUtil.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/TestUtil.java
@@ -24,7 +24,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.testframework;
public class TestUtil
{
public static final String NULL = "<null>";
-
+
private TestUtil()
{
}
@@ -47,7 +47,8 @@ public class TestUtil
/**
* Returns the specified object as a normalised string. Normalization includes trimming,
- * conversion to lower case, stripping off <code><div></code> wrappers.
+ * conversion to lower case, stripping off <code><div></code> and <code><a></code>
+ * wrappers.
*
* @return {@link #NULL} if <code>objectOrNull == null</code>
*/
@@ -62,6 +63,10 @@ public class TestUtil
{
value = value.substring(value.indexOf('>') + 1, value.length() - "</div>".length());
}
+ if (value.startsWith("<a"))
+ {
+ value = value.substring(value.indexOf('>') + 1, value.length() - "</a>".length());
+ }
return value;
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java
index 9c03d02edada93b469f1634e379e1c1301a4b319..77fb15da98d1aaabc33fa28c81182a54aebcc007 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java
@@ -32,11 +32,11 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experim
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ShowExperiment;
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.shared.basic.TechId;
/**
* @author Tomasz Pylak
*/
+@SuppressWarnings("unused")
public class GenericExperimentAttachmentDownloadTest extends AbstractGWTTestCase
{
private static final String DEFAULT = "DEFAULT (CISD)";
@@ -53,33 +53,34 @@ public class GenericExperimentAttachmentDownloadTest extends AbstractGWTTestCase
remoteConsole.prepare(new ShowExperiment(experimentCode));
}
- public final void testDownloadAttachment()
- {
- prepareShowExperiment(DEFAULT, SIRNA_HCS, EXP_REUSE);
- //
- // Assumption: technicalId(CISD:/CISD/DEFAULT/EXP_REUSE) = 8
- //
- remoteConsole.prepare(new ClickDownloadAttachmentCmdTest("cellPlates.txt", new TechId(8L)));
-
- // this callback will be used when the attempt to open an URL will occur
- OpenedUrlCallback openedUrlCallback = new OpenedUrlCallback(client.tryToGetViewContext());
- UrlOpenedController controller = new UrlOpenedController(openedUrlCallback);
-
- remoteConsole.prepare(new CheckUrlContentCmdTest(openedUrlCallback, "3VCP1\n3VCP2\n3VCP3"));
-
- // wait for the command which fetches URL content to finish
- AbstractDefaultTestCommand waitForPrevCmd = new AbstractDefaultTestCommand()
- {
- public void execute()
- {
- }
- };
- waitForPrevCmd.addCallbackClass(CheckStringsEqualCallback.class);
- remoteConsole.prepare(waitForPrevCmd);
-
- remoteConsole.finish(20000);
- client.onModuleLoad(controller);
- }
+ // TODO 2009-06-24, Piotr Buczek: fix clicking on cell with anchor or add a download button
+ // public final void testDownloadAttachment()
+ // {
+ // prepareShowExperiment(DEFAULT, SIRNA_HCS, EXP_REUSE);
+ // //
+ // // Assumption: technicalId(CISD:/CISD/DEFAULT/EXP_REUSE) = 8
+ // //
+ // remoteConsole.prepare(new ClickDownloadAttachmentCmdTest("cellPlates.txt", new TechId(8L)));
+ //
+ // // this callback will be used when the attempt to open an URL will occur
+ // OpenedUrlCallback openedUrlCallback = new OpenedUrlCallback(client.tryToGetViewContext());
+ // UrlOpenedController controller = new UrlOpenedController(openedUrlCallback);
+ //
+ // remoteConsole.prepare(new CheckUrlContentCmdTest(openedUrlCallback, "3VCP1\n3VCP2\n3VCP3"));
+ //
+ // // wait for the command which fetches URL content to finish
+ // AbstractDefaultTestCommand waitForPrevCmd = new AbstractDefaultTestCommand()
+ // {
+ // public void execute()
+ // {
+ // }
+ // };
+ // waitForPrevCmd.addCallbackClass(CheckStringsEqualCallback.class);
+ // remoteConsole.prepare(waitForPrevCmd);
+ //
+ // remoteConsole.finish(20000);
+ // client.onModuleLoad(controller);
+ // }
// called automatically by the controller when any URL is contacted
private static class OpenedUrlCallback extends AbstractAsyncCallback<String>
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
index e2a3c09a5ef86792730301cf5d49bcb1cdc6c649..7fa72d24440b62a00cd9dd4de50e0eaa279404a4 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
@@ -129,8 +129,12 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
.getWidgetWithID(SampleDataSetBrowser.createGridId(wildcard));
assertTrue(widget instanceof Grid);
final Grid<?> table = (Grid<?>) widget;
- GridTestUtils.fireSingleClick(table, CommonExternalDataColDefKind.CODE.id(),
+ GridTestUtils.fireSelectRow(table, CommonExternalDataColDefKind.CODE.id(),
DATA_SET_CODE);
+ String showDetailsButtonId =
+ SampleDataSetBrowser.createBrowserId(wildcard)
+ + SampleDataSetBrowser.SHOW_DETAILS_BUTTON_ID_SUFFIX;
+ GWTTestUtil.clickButtonWithID(showDetailsButtonId);
}
});
remoteConsole.prepare(new BrowseDataSet(DATA_SET_CODE));