From 38545175a7d4ce2b093e7be66b0745282a752df6 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 11 May 2010 07:21:02 +0000
Subject: [PATCH] SE-246 DatasetDescription refactored
SVN: 15883
---
.../AbstractFileTableReportingPluginTest.java | 10 ++++++++-
.../standard/DataSetCopierForUsersTest.java | 9 +++++++-
.../plugins/standard/DataSetCopierTest.java | 21 +++++++++++++++----
.../MergedColumnDataReportingPluginTest.java | 4 +++-
.../tasks/IterativeTableModelBuilderTest.java | 11 ++++++++--
.../tasks/PluginTaskParametersTest.java | 11 ++++++++--
6 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPluginTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPluginTest.java
index 541c32c1860..ce1f1f29af5 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPluginTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPluginTest.java
@@ -98,6 +98,14 @@ public class AbstractFileTableReportingPluginTest extends AssertJUnit
private DatasetDescription createDataSetDescription()
{
- return new DatasetDescription("Cod", "Loc", "Sam", "Spa", "Pro", "Exp", null, null, "Ins");
+ DatasetDescription description = new DatasetDescription();
+ description.setDatasetCode("Cod");
+ description.setDataSetLocation("Loc");
+ description.setSampleCode("Sam");
+ description.setGroupCode("Spa");
+ description.setProjectCode("Pro");
+ description.setExperimentCode("Exp");
+ description.setDatabaseInstanceCode("Ins");
+ return description;
}
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsersTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsersTest.java
index 8685391639a..b399f9365a7 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsersTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsersTest.java
@@ -98,7 +98,14 @@ public class DataSetCopierForUsersTest extends AbstractFileSystemTestCase
properties = new Properties();
properties.setProperty("ssh-executable", sshExecutableDummy.getPath());
properties.setProperty("rsync-executable", rsyncExecutableDummy.getPath());
- ds = new DatasetDescription("ds1", DS_LOCATION, "s", "g", "p", "e", null, null, "i");
+ ds = new DatasetDescription();
+ ds.setDatasetCode("ds1");
+ ds.setDataSetLocation(DS_LOCATION);
+ ds.setSampleCode("s");
+ ds.setGroupCode("g");
+ ds.setProjectCode("p");
+ ds.setExperimentCode("e");
+ ds.setDatabaseInstanceCode("i");
File ds1Folder = new File(storeRoot, DS_LOCATION + "/original");
ds1Folder.mkdirs();
dsData = new File(ds1Folder, "data.txt");
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierTest.java
index 8b5475b6623..dfdf264cf3b 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierTest.java
@@ -107,27 +107,40 @@ public class DataSetCopierTest extends AbstractFileSystemTestCase
properties = new Properties();
properties.setProperty("ssh-executable", sshExecutableDummy.getPath());
properties.setProperty("rsync-executable", rsyncExecutableDummy.getPath());
- ds1 = new DatasetDescription("ds1", DS1_LOCATION, "s", "g", "p", "e", null, null, "i");
+ ds1 = createDataSetDescription("ds1", DS1_LOCATION);
File ds1Folder = new File(storeRoot, DS1_LOCATION + "/original");
ds1Folder.mkdirs();
ds1Data = new File(ds1Folder, "data.txt");
ds1Data.createNewFile();
- ds2 = new DatasetDescription("ds2", DS2_LOCATION, "s", "g", "p", "e", null, null, "i");
+ ds2 = createDataSetDescription("ds2", DS2_LOCATION);
File ds2Folder = new File(storeRoot, DS2_LOCATION + "/original");
ds2Folder.mkdirs();
ds2Data = new File(ds2Folder, "images");
ds2Data.mkdirs();
- ds3 = new DatasetDescription("ds3", DS3_LOCATION, "s", "g", "p", "e", null, null, "i");
+ ds3 = createDataSetDescription("ds3", DS3_LOCATION);
File ds3Folder = new File(storeRoot, DS3_LOCATION + "/original");
ds3Folder.mkdirs();
ds3Data = new File(ds3Folder, "existing");
ds3Data.createNewFile();
- ds4 = new DatasetDescription("ds4", DS4_LOCATION, "s", "g", "p", "e", null, null, "i");
+ ds4 = createDataSetDescription("ds4", DS4_LOCATION);
File ds4Folder = new File(storeRoot, DS4_LOCATION + "/original");
ds4Folder.mkdirs();
ds4Data = new File(ds4Folder, "existing");
ds4Data.mkdirs();
}
+
+ private DatasetDescription createDataSetDescription(String dataSetCode, String location)
+ {
+ DatasetDescription description = new DatasetDescription();
+ description.setDatasetCode(dataSetCode);
+ description.setDataSetLocation(location);
+ description.setDatabaseInstanceCode("i");
+ description.setGroupCode("g");
+ description.setProjectCode("p");
+ description.setExperimentCode("e");
+ description.setSampleCode("s");
+ return description;
+ }
@AfterMethod
public void afterMethod()
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPluginTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPluginTest.java
index 2e5deace2a4..7c40729bfa7 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPluginTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPluginTest.java
@@ -95,7 +95,9 @@ public class MergedColumnDataReportingPluginTest extends AssertJUnit
private DatasetDescription createDatasetDescription(String location)
{
- return new DatasetDescription("", location, "", "", "", "", null, null, "");
+ DatasetDescription description = new DatasetDescription();
+ description.setDataSetLocation(location);
+ return description;
}
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilderTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilderTest.java
index c45f2a52195..085a64a89fe 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilderTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilderTest.java
@@ -100,8 +100,15 @@ public class IterativeTableModelBuilderTest
private DatasetDescription createDatasetDescription()
{
- return new DatasetDescription("code", "location", "sampleCode", "groupCode", "projCode",
- "expCode", null, null, "instance");
+ DatasetDescription description = new DatasetDescription();
+ description.setDatasetCode("code");
+ description.setDataSetLocation("location");
+ description.setSampleCode("sampleCode");
+ description.setGroupCode("groupCode");
+ description.setProjectCode("projCode");
+ description.setExperimentCode("expCode");
+ description.setDatabaseInstanceCode("instance");
+ return description;
}
@Test
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskParametersTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskParametersTest.java
index e7b7a2fe340..efc1ea08ce4 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskParametersTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskParametersTest.java
@@ -140,8 +140,15 @@ public class PluginTaskParametersTest extends AbstractFileSystemTestCase
private static List<DatasetDescription> createDatasetDescriptions()
{
- return Arrays.asList(new DatasetDescription(".", "3123123123-123", "sampleCode",
- "groupCode", "projCode", "expCode", null, null, "instance"));
+ DatasetDescription description = new DatasetDescription();
+ description.setDatasetCode(".");
+ description.setDataSetLocation("3123123123-123");
+ description.setSampleCode("sampleCode");
+ description.setGroupCode("groupCode");
+ description.setProjectCode("projCode");
+ description.setExperimentCode("expCode");
+ description.setDatabaseInstanceCode("instance");
+ return Arrays.asList(description);
}
private void putPluginProperties(Properties props, String pluginId, String pluginLabel,
--
GitLab