diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProviderTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProviderTest.java
index be6bba1a27708a2b397174d4dd973a00eedd29ba..793536a96800783d1e522144ad99fab8b55c0181 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProviderTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProviderTest.java
@@ -85,22 +85,22 @@ public class ExperimentProviderTest extends AbstractProviderTest
TypedTableModel<Experiment> tableModel =
new ExperimentProvider(server, SESSION_TOKEN, criteria).getTableModel(100);
assertEquals(
- "[CODE, EXPERIMENT_TYPE, EXPERIMENT_IDENTIFIER, SPACE, "
- + "PROJECT, REGISTRATOR, MODIFIER, REGISTRATION_DATE, MODIFICATION_DATE, IS_DELETED, PERM_ID, "
+ "[CODE, EXPERIMENT_TYPE, EXPERIMENT_IDENTIFIER, SPACE, PROJECT, PROJECT_IDENTIFIER, "
+ + "REGISTRATOR, MODIFIER, REGISTRATION_DATE, MODIFICATION_DATE, IS_DELETED, PERM_ID, "
+ "SHOW_DETAILS_LINK, METAPROJECTS, property-USER-NUMBER, property-USER-TEXT]",
getHeaderIDs(tableModel).toString());
assertEquals(
- "[null, VARCHAR, null, VARCHAR, VARCHAR, VARCHAR, VARCHAR, TIMESTAMP, "
+ "[null, VARCHAR, null, VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, TIMESTAMP, "
+ "TIMESTAMP, VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, MULTILINE_VARCHAR]",
getHeaderDataTypes(tableModel).toString());
assertEquals(
"[EXPERIMENT, null, EXPERIMENT, null, null, null, null, null, null, null, "
- + "null, null, null, null, null]", getHeaderEntityKinds(tableModel)
+ + "null, null, null, null, null, null]", getHeaderEntityKinds(tableModel)
.toString());
List<TableModelRowWithObject<Experiment>> rows = tableModel.getRows();
assertSame(e1.getExperiment(), rows.get(0).getObjectOrNull());
assertEquals(
- "[E1, 1, /A/B/E1, A, B, Einstein, Albert, , Mon Jan 12 14:48:43 CET 1970, "
+ "[E1, 1, /A/B/E1, A, B, , Einstein, Albert, , Mon Jan 12 14:48:43 CET 1970, "
+ "Mon Jan 12 14:48:44 CET 1970, yes, 123-45, , , 42, ]", rows.get(0)
.getValues().toString());
context.assertIsSatisfied();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProviderTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProviderTest.java
index 60652835b6b053e3542c9c4a2758536525a7cfbd..a9c25381d72475ce39da5b5a42a740997f6d9c7f 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProviderTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProviderTest.java
@@ -85,27 +85,27 @@ public class SampleProviderTest extends AbstractProviderTest
assertEquals(
"[CODE, SUBCODE, SPACE, SAMPLE_IDENTIFIER, SAMPLE_TYPE, "
+ "IS_INSTANCE_SAMPLE, IS_DELETED, REGISTRATOR, MODIFIER, REGISTRATION_DATE, "
- + "MODIFICATION_DATE, EXPERIMENT, EXPERIMENT_IDENTIFIER, PROJECT, "
+ + "MODIFICATION_DATE, EXPERIMENT, EXPERIMENT_IDENTIFIER, PROJECT, PROJECT_IDENTIFIER, "
+ "PERM_ID, SHOW_DETAILS_LINK, generatedFromParent, containerParent, METAPROJECTS, "
+ "property-USER-NUMBER, property-USER-TIMESTAMP, property-USER-NAME, property-USER-MY-MATERIAL, property-USER-TEXT]",
getHeaderIDs(tableModel).toString());
assertEquals(
"[null, null, VARCHAR, null, VARCHAR, "
- + "VARCHAR, VARCHAR, VARCHAR, VARCHAR, TIMESTAMP, TIMESTAMP, null, null, VARCHAR, "
+ + "VARCHAR, VARCHAR, VARCHAR, VARCHAR, TIMESTAMP, TIMESTAMP, null, null, null, null, "
+ "VARCHAR, VARCHAR, null, null, VARCHAR, REAL, TIMESTAMP, VARCHAR, MATERIAL, MULTILINE_VARCHAR]",
getHeaderDataTypes(tableModel).toString());
assertEquals("[SAMPLE, SAMPLE, null, SAMPLE, null, "
+ "null, null, null, null, null, null, null, null, "
- + "null, null, null, null, null, null, null, null, null, MATERIAL, null]",
+ + "null, null, null, null, null, null, null, null, null, null, MATERIAL, null]",
getHeaderEntityKinds(tableModel).toString());
List<TableModelRowWithObject<Sample>> rows = tableModel.getRows();
assertSame(s1.getSample(), rows.get(0).getObjectOrNull());
assertEquals(
- "[S1, S1, MY-SPACE, /MY-SPACE/S1, ALPHA, no, no, , , , , , , , 123-45, , , , , , , "
+ "[S1, S1, MY-SPACE, /MY-SPACE/S1, ALPHA, no, no, , , , , , , , , 123-45, , , , , , , "
+ "hello, WATER (FLUID), ]", rows.get(0).getValues().toString());
assertSame(s2.getSample(), rows.get(1).getObjectOrNull());
assertEquals(
- "[S2, S2, MY-SPACE, /MY-SPACE/S2, BETA, no, no, , , , , , , , 234-56, , , , , 2.5, Thu Jan 01 01:00:00 CET 1970, , , ]",
+ "[S2, S2, MY-SPACE, /MY-SPACE/S2, BETA, no, no, , , , , , , , , 234-56, , , , , 2.5, Thu Jan 01 01:00:00 CET 1970, , , ]",
rows.get(1).getValues().toString());
assertEquals(2, rows.size());
context.assertIsSatisfied();
@@ -141,28 +141,28 @@ public class SampleProviderTest extends AbstractProviderTest
assertEquals(
"[CODE, SUBCODE, SPACE, SAMPLE_IDENTIFIER, SAMPLE_TYPE, "
+ "IS_INSTANCE_SAMPLE, IS_DELETED, REGISTRATOR, MODIFIER, REGISTRATION_DATE, "
- + "MODIFICATION_DATE, EXPERIMENT, EXPERIMENT_IDENTIFIER, PROJECT, "
+ + "MODIFICATION_DATE, EXPERIMENT, EXPERIMENT_IDENTIFIER, PROJECT, PROJECT_IDENTIFIER, "
+ "PERM_ID, SHOW_DETAILS_LINK, generatedFromParent, containerParent, METAPROJECTS, "
+ "property-USER-NAME, property-USER-TIMESTAMP, property-USER-NUMBER, property-USER-TEXT]",
getHeaderIDs(tableModel).toString());
assertEquals(
"[null, null, VARCHAR, null, VARCHAR, "
- + "VARCHAR, VARCHAR, VARCHAR, VARCHAR, TIMESTAMP, TIMESTAMP, null, null, VARCHAR, "
+ + "VARCHAR, VARCHAR, VARCHAR, VARCHAR, TIMESTAMP, TIMESTAMP, null, null, VARCHAR, VARCHAR, "
+ "VARCHAR, VARCHAR, null, null, VARCHAR, VARCHAR, TIMESTAMP, REAL, MULTILINE_VARCHAR]",
getHeaderDataTypes(tableModel).toString());
assertEquals("[SAMPLE, SAMPLE, null, SAMPLE, null, "
+ "null, null, null, null, null, null, EXPERIMENT, EXPERIMENT, null, "
- + "null, null, SAMPLE, SAMPLE, null, null, null, null, null]",
+ + "null, null, null, SAMPLE, SAMPLE, null, null, null, null, null]",
getHeaderEntityKinds(tableModel).toString());
List<TableModelRowWithObject<Sample>> rows = tableModel.getRows();
assertSame(s1.getSample(), rows.get(0).getObjectOrNull());
assertEquals(
"[S1, S1, , /S1, ALPHA, yes, yes, Einstein, Albert, , "
- + "Thu Jan 01 01:00:04 CET 1970, Thu Jan 01 01:00:05 CET 1970, , , , 123-45, http, /AB/CD, , , hello, , , ]",
+ + "Thu Jan 01 01:00:04 CET 1970, Thu Jan 01 01:00:05 CET 1970, , , , , 123-45, http, /AB/CD, , , hello, , , ]",
rows.get(0).getValues().toString());
assertSame(s2.getSample(), rows.get(1).getObjectOrNull());
assertEquals("[S:2, 2, MY-SPACE, /MY-SPACE/S:2, BETA, no, no, , , , , EXP1, "
- + "/SPACE1/P1/EXP1, P1, 234-56, , /AB/CD\n/DE/FG\n, /A/B, , , , , ]",
+ + "/SPACE1/P1/EXP1, P1, , 234-56, , /AB/CD\n/DE/FG\n, /A/B, , , , , ]",
rows.get(1).getValues().toString());
assertEquals(2, rows.size());
context.assertIsSatisfied();