From dc624f3cf9b4bd4e892ce65ab90b87354190cde5 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 8 Apr 2009 08:18:09 +0000
Subject: [PATCH] LMS-821 bug fixed
SVN: 10624
---
.../systemsx/cisd/etlserver/DefaultStorageProcessor.java | 2 +-
.../cisd/etlserver/DefaultStorageProcessorTest.java | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
index 636a239f89f..f2d4b32b854 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
@@ -62,7 +62,7 @@ public class DefaultStorageProcessor extends AbstractStorageProcessor
throw new EnvironmentFailureException(String.format(NO_RENAME,
incomingDataSetDirectory, targetFile));
}
- return targetFile;
+ return rootDir;
}
public final void unstoreData(final File incomingDataSetDirectory,
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java
index 80324dfd3fb..040a485f702 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java
@@ -81,9 +81,9 @@ public final class DefaultStorageProcessorTest extends AbstractFileSystemTestCas
incomingDataSetDirectory, rootDir);
assertEquals(false, incomingDataSetDirectory.exists());
assertEquals(true, storeData.isDirectory());
- assertEquals(new File(workingDirectory, "root/" + DefaultStorageProcessor.ORIGINAL_DIR
- + "/incoming").getAbsolutePath(), storeData.getAbsolutePath());
- assertEquals("hello world", FileUtilities.loadToString(new File(storeData, "read.me")).trim());
+ assertEquals(rootDir.getAbsolutePath(), storeData.getAbsolutePath());
+ assertEquals("hello world", FileUtilities.loadToString(
+ new File(storeData, DefaultStorageProcessor.ORIGINAL_DIR + "/incoming/read.me")).trim());
}
@Test
@@ -116,7 +116,6 @@ public final class DefaultStorageProcessorTest extends AbstractFileSystemTestCas
assertEquals(true, storeData.exists());
assertEquals(false, incomingDataSetDirectory.exists());
storageProcessor.unstoreData(incomingDataSetDirectory, root);
- assertEquals(false, storeData.exists());
assertEquals(true, incomingDataSetDirectory.exists());
assertEquals("hi", FileUtilities.loadToString(readMeFile).trim());
}
--
GitLab