From a6506cf3ae516afef7315f75996279b2fcc63c5c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 23 Feb 2010 08:00:14 +0000
Subject: [PATCH] tests fixed
SVN: 14875
---
deep_sequencing_unit/etc/service.properties | 1 +
.../ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java | 11 +++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/deep_sequencing_unit/etc/service.properties b/deep_sequencing_unit/etc/service.properties
index a3b84d2e3de..15b9e6b893a 100644
--- a/deep_sequencing_unit/etc/service.properties
+++ b/deep_sequencing_unit/etc/service.properties
@@ -127,6 +127,7 @@ flow-cell.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultStorag
flow-cell.storage-processor.flow-lane-drop-box-template = targets/playground/drop-box-{0}
flow-cell.storage-processor.entity-separator = ${data-set-file-name-entity-separator}
flow-cell.storage-processor.transfer.FMI = targets/playground/drop-box-fmi
+flow-cell.storage-processor.meta-data-file-prefix = PREFIX_FOR_TSV
# -------- Flow Lane 1 --------------------------------------
fl1.incoming-dir = targets/playground/drop-box-1
diff --git a/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java b/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java
index 490a11c60a2..b1fdb855931 100644
--- a/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java
+++ b/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java
@@ -57,6 +57,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFa
*/
public class FlowLaneFeederTest extends AbstractFileSystemTestCase
{
+ private static final String META_DATA_PREFIX = "meta-";
+
private static final String AFFILIATION = "fmi";
private static final String EXTERNAL_SAMPLE_NAME = "ext23";
@@ -265,7 +267,7 @@ public class FlowLaneFeederTest extends AbstractFileSystemTestCase
assertEquals(2, transferedFiles.length);
assertEquals("2.srf", transferedFiles[0].getName());
File metaFile = transferedFiles[1];
- assertEquals(SAMPLE_CODE + "_2" + FlowLaneFeeder.META_DATA_FILE_TYPE, metaFile.getName());
+ assertEquals(META_DATA_PREFIX + SAMPLE_CODE + "_2" + FlowLaneFeeder.META_DATA_FILE_TYPE, metaFile.getName());
assertHardLinkOnSameFile(originalFlowLane2, transferedFiles[0]);
context.assertIsSatisfied();
@@ -304,7 +306,7 @@ public class FlowLaneFeederTest extends AbstractFileSystemTestCase
assertEquals(2, transferedFiles.length);
assertEquals("2.srf", transferedFiles[0].getName());
File metaFile = transferedFiles[1];
- assertEquals(SAMPLE_CODE + "_2" + FlowLaneFeeder.META_DATA_FILE_TYPE, metaFile
+ assertEquals(META_DATA_PREFIX + SAMPLE_CODE + "_2" + FlowLaneFeeder.META_DATA_FILE_TYPE, metaFile
.getName());
List<String> metaData = FileUtilities.loadToStringList(metaFile);
String lastLine = metaData.remove(metaData.size() - 1);
@@ -452,8 +454,8 @@ public class FlowLaneFeederTest extends AbstractFileSystemTestCase
assertEquals(FileUtilities.loadToString(originalFlowLane), FileUtilities
.loadToString(flowLane));
assertHardLinkOnSameFile(originalFlowLane, flowLane);
- String metaDataFileName =
- (SAMPLE_CODE + "_" + FlowLaneFeeder.escapeSampleCode(flowLaneNumber)) + FlowLaneFeeder.META_DATA_FILE_TYPE;
+ String metaDataFileName = META_DATA_PREFIX
+ + (SAMPLE_CODE + "_" + FlowLaneFeeder.escapeSampleCode(flowLaneNumber)) + FlowLaneFeeder.META_DATA_FILE_TYPE;
assertEquals(true, new File(ds, FlowLaneFeeder.escapeSampleCode(metaDataFileName)).exists());
assertEquals(true, new File(dropBox, Constants.IS_FINISHED_PREFIX + FlowLaneFeeder.escapeSampleCode(fileName)).exists());
}
@@ -488,6 +490,7 @@ public class FlowLaneFeederTest extends AbstractFileSystemTestCase
properties.setProperty(FlowLaneFeeder.FLOW_LANE_DROP_BOX_TEMPLATE, new File(
workingDirectory, DROP_BOX_PREFIX).getAbsolutePath()
+ "{0}");
+ properties.setProperty(FlowLaneFeeder.META_DATA_FILE_PREFIX, META_DATA_PREFIX);
properties.setProperty(FlowLaneFeeder.TRANSFER_PREFIX + AFFILIATION, transferDropBox
.getAbsolutePath());
if (srfInfoScriptOrNull != null)
--
GitLab