From 09efd3d96c77823ef4fa7a45b6c97dc264171f6a Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 11 Sep 2012 14:02:17 +0000
Subject: [PATCH] BIS-183 tests in RsyncArchiverTest fixed
SVN: 26595
---
.../plugins/standard/RsyncArchiverTest.java | 35 +------------------
1 file changed, 1 insertion(+), 34 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiverTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiverTest.java
index ffa09311d87..14b1668bdc7 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiverTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiverTest.java
@@ -339,15 +339,6 @@ public class RsyncArchiverTest extends AbstractFileSystemTestCase
one(configProvider).getDataStoreCode();
will(returnValue(DATA_STORE_CODE));
- one(service).listDataSets();
- SimpleDataSetInformationDTO dataSet = new SimpleDataSetInformationDTO();
- dataSet.setDataSetCode("ds1");
- dataSet.setDataStoreCode(DATA_STORE_CODE);
- dataSet.setDataSetShareId("1");
- dataSet.setDataSetLocation(LOCATION);
- dataSet.setDataSetSize(11L);
- will(returnValue(Arrays.asList(dataSet)));
-
one(shareIdManager).getShareId("ds1");
will(returnValue("2"));
@@ -401,7 +392,7 @@ public class RsyncArchiverTest extends AbstractFileSystemTestCase
archiverTaskContext.setUnarchivingPreparation(unarchivingPreparation);
final DatasetDescription ds1 =
new DatasetDescriptionBuilder("ds1").databaseInstance("db").experiment("exp1")
- .location("loc1").project("p1").sample("s1").space("space").size(11l)
+ .location("loc1").project("p1").sample("s1").space("space")
.type("my-type").getDatasetDescription();
context.checking(new Expectations()
{
@@ -409,15 +400,6 @@ public class RsyncArchiverTest extends AbstractFileSystemTestCase
one(configProvider).getDataStoreCode();
will(returnValue(DATA_STORE_CODE));
- one(service).listDataSets();
- SimpleDataSetInformationDTO dataSet = new SimpleDataSetInformationDTO();
- dataSet.setDataSetCode("ds1");
- dataSet.setDataStoreCode(DATA_STORE_CODE);
- dataSet.setDataSetShareId("1");
- dataSet.setDataSetLocation(LOCATION);
- dataSet.setDataSetSize(11L);
- will(returnValue(Arrays.asList(dataSet)));
-
one(statusUpdater).update(Arrays.asList("ds1"),
DataSetArchivingStatus.ARCHIVED, true);
}
@@ -443,21 +425,6 @@ public class RsyncArchiverTest extends AbstractFileSystemTestCase
one(configProvider).getDataStoreCode();
will(returnValue(DATA_STORE_CODE));
- one(service).listDataSets();
- SimpleDataSetInformationDTO dataSet1 = new SimpleDataSetInformationDTO();
- dataSet1.setDataSetCode("ds1");
- dataSet1.setDataStoreCode(DATA_STORE_CODE);
- dataSet1.setDataSetShareId("1");
- dataSet1.setDataSetLocation(LOCATION);
- dataSet1.setDataSetSize(11L);
- SimpleDataSetInformationDTO dataSet2 = new SimpleDataSetInformationDTO();
- dataSet2.setDataSetCode("ds2");
- dataSet2.setDataStoreCode(DATA_STORE_CODE);
- dataSet2.setDataSetShareId("1");
- dataSet2.setDataSetLocation(LOCATION);
- dataSet2.setDataSetSize(22L);
- will(returnValue(Arrays.asList(dataSet1, dataSet2)));
-
one(statusUpdater).update(Arrays.asList("ds1", "ds2"),
DataSetArchivingStatus.ARCHIVED, true);
}
--
GitLab