From eda14406375dc814bf4015992adf8a1538e6db9f Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Fri, 4 Jan 2008 13:18:59 +0000
Subject: [PATCH] remove: - Check for empty original data as we support it in
'HCS IMAGE' format.
SVN: 3267
---
.../systemsx/cisd/bds/DataStructureV1_0.java | 4 ----
.../cisd/bds/DataStructureV1_0Test.java | 18 ++----------------
2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java b/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
index b5979cbc388..2de6a27d161 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
@@ -273,10 +273,6 @@ public class DataStructureV1_0 extends AbstractDataStructure
public final void assertValid()
{
super.assertValid();
- if (getOriginalData().iterator().hasNext() == false)
- {
- throw new DataStructureException("Empty original data directory.");
- }
IDirectory metaDataDirectory = getMetaDataDirectory();
if (metaDataDirectory.tryGetNode(Format.FORMAT_DIR) == null && format == null)
{
diff --git a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
index 1157c62a055..f6dcfb90521 100644
--- a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
+++ b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
@@ -61,9 +61,9 @@ public final class DataStructureV1_0Test extends AbstractFileSystemTestCase
@Override
@BeforeMethod
- public final void setup() throws IOException
+ public final void setUp() throws IOException
{
- super.setup();
+ super.setUp();
storage = new FileStorage(workingDirectory);
dataStructure = new DataStructureV1_0(storage);
}
@@ -241,20 +241,6 @@ public final class DataStructureV1_0Test extends AbstractFileSystemTestCase
}
}
- @Test
- public void testCloseForEmptyData()
- {
- dataStructure.create();
- try
- {
- dataStructure.close();
- fail("DataStructureException expected.");
- } catch (DataStructureException e)
- {
- assertEquals("Empty original data directory.", e.getMessage());
- }
- }
-
@Test
public void testCloseIfNoFormat()
{
--
GitLab