diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java
index 40ca5baa46ad85a7414a8e8dc7df92019ff56317..aab159f7e698c0e0295686b6de7f23eeb04ff72a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java
@@ -15,6 +15,7 @@ import com.extjs.gxt.ui.client.widget.layout.FillLayout;
import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplaySettingsManager.Modification;
@@ -27,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.
*/
public class SectionsPanel extends ContentPanel
{
- public static final String PART_OF_TOGGLE_BUTTON_ID = "_button_";
+ public static final String POSTFIX_BUTTON_ID = "_button";
List<SectionElement> elements = new ArrayList<SectionElement>();
@@ -158,6 +159,7 @@ public class SectionsPanel extends ContentPanel
removeAll();
for (SectionElement el : elements)
{
+ System.out.println("ADD SECTION PANEL: "+el.getButton().getText()+" "+el.getButton().isPressed());
if (el.getButton().isPressed())
{
internalAdd(el);
@@ -259,7 +261,7 @@ public class SectionsPanel extends ContentPanel
final String displayId)
{
final ToggleButton result = new ToggleButton(getHeading(heading, pressed));
- result.setId(displayId + PART_OF_TOGGLE_BUTTON_ID + heading);
+ result.setId(GenericConstants.ID_PREFIX + displayId + POSTFIX_BUTTON_ID);
initializePressedState(result, pressed);
// when user clicks toggle button we store changed settings
@@ -277,6 +279,7 @@ public class SectionsPanel extends ContentPanel
{
public void handleEvent(BaseEvent be)
{
+ System.out.println("TOGGLE:" + result.getId() + " "+result.isPressed());
result.setText(getHeading(heading, result.isPressed()));
}
});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
index 17e9195e60a728ae39ca7a2b1bed5ba4167b51fa..3d1337ad866f933a570d7b12439dd3686b140d44 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
@@ -57,7 +57,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.IGenericClientS
abstract public class GenericDataSetViewer extends AbstractViewer<ExternalData> implements
IDatabaseModificationObserver
{
- private static final String PREFIX = "generic-dataset-viewer_";
+ public static final String PREFIX = "generic-dataset-viewer_";
public static final String ID_PREFIX = GenericConstants.ID_PREFIX + PREFIX;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetChildrenAndParents.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetChildrenAndParents.java
new file mode 100644
index 0000000000000000000000000000000000000000..d0d8cd1556ea05fde4d52a8529e10abcd4933c38
--- /dev/null
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetChildrenAndParents.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data;
+
+import com.extjs.gxt.ui.client.event.Events;
+import com.extjs.gxt.ui.client.widget.button.ToggleButton;
+import com.google.gwt.user.client.ui.Widget;
+
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplayTypeIDGenerator;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.SectionsPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
+import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.GWTTestUtil;
+import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset.GenericDataSetViewer;
+
+/**
+ * A {@link AbstractDefaultTestCommand} extension for showing detail view of a data set with given
+ * code. View is displayed because of simulation of a click on show details button in a toolbar of a
+ * data set search results browser.
+ *
+ * @author Piotr Buczek
+ */
+public class ShowDataSetChildrenAndParents extends AbstractDefaultTestCommand
+{
+ private final String code;
+
+ public ShowDataSetChildrenAndParents(final String code)
+ {
+ this.code = code;
+ }
+
+ public void execute()
+ {
+ clickButton(DisplayTypeIDGenerator.DATA_SET_CHILDREN_SECTION);
+ clickButton(DisplayTypeIDGenerator.DATA_SET_PARENTS_SECTION);
+ }
+
+ private void clickButton(DisplayTypeIDGenerator idGenerator)
+ {
+ Widget widget = GWTTestUtil.getWidgetWithID(GenericConstants.ID_PREFIX
+ + idGenerator.createID(GenericDataSetViewer.PREFIX + code)
+ + SectionsPanel.POSTFIX_BUTTON_ID);
+ if (widget instanceof ToggleButton)
+ {
+ ToggleButton button = (ToggleButton) widget;
+ button.toggle(true);
+ button.fireEvent(Events.Select);
+ }
+ }
+}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/CheckDataSet.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/CheckDataSet.java
index 79a8e56be09b74b4edb0cecf77637f9bdb051f85..b969bda56f9854ac546d1b4035f956a2c18da91b 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/CheckDataSet.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/CheckDataSet.java
@@ -16,8 +16,12 @@
package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplayTypeIDGenerator;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.SectionsPanel;
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;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.IPropertyChecker;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.IValueAssertion;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.PropertyCheckingManager;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java
index 1ce2b884b7109f97d4453bf3d38cc9adef81a2e7..892d2a4c2d3a4a1c749b25827e546d1ab1dc3101 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java
@@ -19,6 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.da
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.MainTabPanel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.ShowDataSet;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.ShowDataSetChildrenAndParents;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.ShowDataSetEditor;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.columns.DataSetRow;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.search.FillSearchCriteria;
@@ -99,6 +100,7 @@ public class GenericDataSetEditorTest extends AbstractGWTTestCase
loginAndInvokeAction(ActionMenuKind.DATA_SET_MENU_SEARCH);
remoteConsole.prepare(FillSearchCriteria.searchForDataSetWithCode(dataSetCode));
remoteConsole.prepare(new ShowDataSet(dataSetCode));
+ remoteConsole.prepare(new ShowDataSetChildrenAndParents("HCS_IMAGE"));
remoteConsole.prepare(new ShowDataSetEditor());
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java
index 19b3a90f4fbe2b1804cb08fc074c244b50104685..b20a49a6830a7818df45a7639b1a66587916b71f 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.da
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.ShowDataSet;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.ShowDataSetChildrenAndParents;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.columns.DataSetRow;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.search.FillSearchCriteria;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractGWTTestCase;
@@ -120,6 +121,7 @@ public class GenericDataSetViewerTest extends AbstractGWTTestCase
loginAndInvokeAction(ActionMenuKind.DATA_SET_MENU_SEARCH);
remoteConsole.prepare(FillSearchCriteria.searchForDataSetWithCode(dataSetCode));
remoteConsole.prepare(new ShowDataSet(dataSetCode));
+ remoteConsole.prepare(new ShowDataSetChildrenAndParents("HCS_IMAGE"));
}
}