From f6f6f0f1f696095bb12fc7ab87d433fdd45726d7 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 26 Jan 2010 13:38:19 +0000
Subject: [PATCH] [LMS-1343] fixed system test problem with experiment browser;
turned off lazy rendering of grid rows
SVN: 14457
---
.../ui/data/DataSetReportGenerator.java | 2 +-
.../ProjectSelectionTreeGridContainer.java | 8 ++++++--
.../application/ui/grid/AbstractBrowserGrid.java | 6 ++++++
.../web/client/application/util/GWTUtils.java | 16 ----------------
.../cisd/openbis/generic/EditingTestSuite.java | 6 ++----
.../cisd/openbis/generic/ViewingTestSuite2.java | 2 --
.../application/ExperimentBrowserTest.java | 4 ----
.../GenericExperimentAttachmentDownloadTest.java | 3 ++-
.../experiment/GenericExperimentEditorTest.java | 4 ----
.../experiment/GenericExperimentViewerTest.java | 8 --------
10 files changed, 17 insertions(+), 42 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportGenerator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportGenerator.java
index 58163d1a78f..7cb93027935 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportGenerator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportGenerator.java
@@ -90,7 +90,7 @@ public class DataSetReportGenerator
public String getId()
{
- final String reportKey = service.getKey(); // TODO escape?
+ final String reportKey = service.getKey();
return DataSetReporterGrid.createId(reportKey);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeGridContainer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeGridContainer.java
index 0a2bddc0dd7..c3f3747ec02 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeGridContainer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeGridContainer.java
@@ -125,6 +125,8 @@ public final class ProjectSelectionTreeGridContainer extends LayoutContainer imp
{
final TreeGrid<ModelData> treeGrid =
new TreeGrid<ModelData>(new TreeStore<ModelData>(), columnModel);
+ // WORKAROUND see comment in AbstractBrowserGrid constructor
+ treeGrid.setLazyRowRender(0);
treeGrid.setId(ID);
treeGrid.setBorders(true);
treeGrid.setAutoExpandColumn(ModelDataPropertyNames.CODE);
@@ -142,10 +144,11 @@ public final class ProjectSelectionTreeGridContainer extends LayoutContainer imp
@Override
public void selectionChanged(SelectionChangedEvent<ModelData> se)
{
- if (selectedProjectLinkOrNull != null)
+ if (selectedProjectOrNull != null)
{
selectedProjectLinkOrNull.setVisible(false);
selectedProjectLinkOrNull = null;
+ selectedProjectOrNull = null;
}
ModelData selected = se.getSelectedItem();
@@ -352,7 +355,7 @@ public final class ProjectSelectionTreeGridContainer extends LayoutContainer imp
private void clearTree()
{
projectLinks.clear();
- tree.getStore().removeAll();
+ tree.getTreeStore().removeAll();
}
/**
@@ -383,6 +386,7 @@ public final class ProjectSelectionTreeGridContainer extends LayoutContainer imp
}
}
}
+
}
/** @return a sorted set of groups of given <var>projects</var> */
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 7ac5d592a74..c63f24d5e7d 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
@@ -235,6 +235,12 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
this.customColumnsMetadataProvider = new CustomColumnsMetadataProvider();
this.grid = createGrid(pagingLoader, gridId);
+ // WORKAROUND
+ // Lazy loading of rows causes tests using experiment browser fail (selection of
+ // project in project tree grid doesn't work).
+ // Turning it off for all grids is the safest solution for our system tests framework
+ // and should improve GUI speed in development mode a bit.
+ grid.setLazyRowRender(0);
this.pagingToolbar =
new BrowserGridPagingToolBar(asActionInvoker(), viewContext, PAGE_SIZE, gridId);
pagingToolbar.bind(pagingLoader);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java
index 92e0e7b147c..6fb1f46da1d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java
@@ -24,7 +24,6 @@ import com.extjs.gxt.ui.client.store.ListStore;
import com.extjs.gxt.ui.client.widget.form.ComboBox;
import com.extjs.gxt.ui.client.widget.form.Field;
import com.extjs.gxt.ui.client.widget.treegrid.TreeGrid;
-import com.extjs.gxt.ui.client.widget.treepanel.TreePanel;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.ListBox;
@@ -128,22 +127,7 @@ public final class GWTUtils
public final static void setSelectedItem(final TreeGrid<ModelData> tree, final String property,
final String value)
{
- System.err.println("set selected " + property + "=" + value);
ModelData model = tryFindModel(tree.getTreeStore().getAllItems(), property, value);
- System.err.println(model);
- if (model != null)
- {
- tree.getSelectionModel().select(model, false);
- }
- }
-
- /**
- * Selects given <var>value</var> of given <var>tree</var>.
- */
- public final static void setSelectedItem(final TreePanel<ModelData> tree,
- final String property, final String value)
- {
- ModelData model = tryFindModel(tree.getStore().getAllItems(), property, value);
if (model != null)
{
tree.getSelectionModel().select(model, false);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite.java
index 304b9f9e056..2e986238b81 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite.java
@@ -16,11 +16,11 @@
package ch.systemsx.cisd.openbis.generic;
-import com.google.gwt.junit.tools.GWTTestSuite;
-
import junit.framework.Test;
import junit.framework.TestSuite;
+import com.google.gwt.junit.tools.GWTTestSuite;
+
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AuthenticationTest;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AuthorizationGroupsTest;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AuthorizationManagementConsolTest;
@@ -33,8 +33,6 @@ import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.exp
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleRegistrationTest;
/**
- *
- *
* @author Chandrasekhar Ramakrishnan
*/
public class EditingTestSuite extends GWTTestSuite
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java
index 299cd6508ec..b9a059f86b2 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java
@@ -35,8 +35,6 @@ import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.exp
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleViewerTest;
/**
- *
- *
* @author Chandrasekhar Ramakrishnan
*/
public class ViewingTestSuite2 extends GWTTestSuite
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java
index eea0c618132..358c8fa7284 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java
@@ -16,9 +16,6 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application;
-import com.google.gwt.junit.DoNotRunWith;
-import com.google.gwt.junit.Platform;
-
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.CheckExperimentTable;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ListExperiments;
@@ -31,7 +28,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType;
*
* @author Izabela Adamczyk
*/
-@DoNotRunWith(Platform.HtmlUnit)
public class ExperimentBrowserTest extends AbstractGWTTestCase
{
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 4c014d64e4a..05d3dc72717 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
@@ -40,6 +40,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
/**
* @author Tomasz Pylak
*/
+// FIXME
+@DoNotRunWith(Platform.HtmlUnit)
public class GenericExperimentAttachmentDownloadTest extends AbstractGWTTestCase
{
private static final String DEFAULT = "DEFAULT (CISD)";
@@ -56,7 +58,6 @@ public class GenericExperimentAttachmentDownloadTest extends AbstractGWTTestCase
remoteConsole.prepare(new ShowExperiment(experimentCode));
}
- @DoNotRunWith(Platform.HtmlUnit)
public final void testDownloadAttachment()
{
prepareShowExperiment(DEFAULT, SIRNA_HCS, EXP_REUSE);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java
index 34223ce130f..6360b42cb08 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java
@@ -18,9 +18,6 @@ package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.ex
import java.util.Date;
-import com.google.gwt.junit.DoNotRunWith;
-import com.google.gwt.junit.Platform;
-
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.CheckExperimentTable;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ListExperiments;
@@ -35,7 +32,6 @@ import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.Pro
*
* @author Izabela Adamczyk
*/
-@DoNotRunWith(Platform.HtmlUnit)
public class GenericExperimentEditorTest extends AbstractGWTTestCase
{
private static final String SIRNA_HCS = "SIRNA_HCS";
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
index 0222209e102..79ad3c64f45 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
@@ -16,9 +16,6 @@
package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment;
-import com.google.gwt.junit.DoNotRunWith;
-import com.google.gwt.junit.Platform;
-
import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
@@ -126,7 +123,6 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
launchTest();
}
- @DoNotRunWith(Platform.HtmlUnit)
public final void testShowExperimentDetails()
{
prepareShowExperiment(NEMO, SIRNA_HCS, EXP1);
@@ -147,7 +143,6 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
launchTest();
}
- @DoNotRunWith(Platform.HtmlUnit)
public final void testShowInvalidExperimentDetails()
{
prepareShowExperiment(DEFAULT, SIRNA_HCS, EXP_X);
@@ -171,7 +166,6 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
launchTest();
}
- @DoNotRunWith(Platform.HtmlUnit)
public final void testListOfAttachments()
{
prepareShowExperiment(DEFAULT, SIRNA_HCS, EXP_REUSE);
@@ -190,7 +184,6 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
launchTest();
}
- @DoNotRunWith(Platform.HtmlUnit)
public final void testListOfSamples()
{
prepareShowExperiment(DEFAULT, SIRNA_HCS, EXP_REUSE);
@@ -218,7 +211,6 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
launchTest();
}
- @DoNotRunWith(Platform.HtmlUnit)
public final void testListOfDataSets()
{
prepareShowExperiment(NEMO, SIRNA_HCS, EXP1);
--
GitLab