From 98b331387209fda7549f3bc6f02415824347ee75 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 23 Apr 2010 22:47:48 +0000
Subject: [PATCH] SE-236 fix test
SVN: 15614
---
.../genedata/FeatureStorageProcessorTest.java | 45 +++++++------------
1 file changed, 17 insertions(+), 28 deletions(-)
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/genedata/FeatureStorageProcessorTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/genedata/FeatureStorageProcessorTest.java
index f7e5e99f109..bb7c27fa395 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/genedata/FeatureStorageProcessorTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/genedata/FeatureStorageProcessorTest.java
@@ -28,24 +28,14 @@ import ch.systemsx.cisd.etlserver.IStorageProcessor;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
- *
- *
* @author Franz-Josef Elmer
*/
public class FeatureStorageProcessorTest extends AbstractFileSystemTestCase
{
- private static final String EXAMPLE1 = "barcode = Plate_042"
- + "\n\n<Layer=alpha>\n"
- + "\t1\t2\n"
- + "A\t4.5\t4.6\n"
- + "B\t3.5\t5.6\n"
- + "C\t3.3\t5.7\n"
- + "\n\n<Layer=beta>\n"
- + "\t1\t2\n"
- + "A\t14.5\t14.6\n"
- + "B\t13.5\t15.6\n"
- + "C\t13.3\t15.7\n"
- ;
+ private static final String EXAMPLE1 =
+ "barcode = Plate_042" + "\n\n<Layer=alpha>\n" + "\t1\t2\n" + "A\t4.5\t4.6\n"
+ + "B\t3.5\t5.6\n" + "C\t3.3\t5.7\n" + "\n\n<Layer=beta>\n" + "\t1\t2\n"
+ + "A\t14.5\t14.6\n" + "B\t13.5\t15.6\n" + "C\t13.3\t15.7\n";
@Test
public void test()
@@ -57,29 +47,28 @@ public class FeatureStorageProcessorTest extends AbstractFileSystemTestCase
File rootDir = new File(workingDirectory, "rootDir");
rootDir.mkdirs();
IStorageProcessor storageProcessor = new FeatureStorageProcessor(new Properties());
-
- storageProcessor.storeData(new DataSetInformation(), null,
- null, dataSetFile, rootDir);
-
+
+ storageProcessor.storeData(new DataSetInformation(), null, null, dataSetFile, rootDir);
+
assertEquals(0, incomingDir.listFiles().length);
assertEquals(1, rootDir.listFiles().length);
File original = new File(rootDir, "original");
assertEquals(true, original.isDirectory());
assertEquals(2, original.listFiles().length);
-
+
storageProcessor.commit();
-
+
assertEquals(1, original.listFiles().length);
File transformedDataSetFile = original.listFiles()[0];
assertEquals("Plate042.stat.txt", transformedDataSetFile.getName());
List<String> lines = FileUtilities.loadToStringList(transformedDataSetFile);
- assertEquals("barcode,row,col,alpha,beta", lines.get(0));
- assertEquals("Plate_042,A,1,4.5,14.5", lines.get(1));
- assertEquals("Plate_042,A,2,4.6,14.6", lines.get(2));
- assertEquals("Plate_042,B,1,3.5,13.5", lines.get(3));
- assertEquals("Plate_042,B,2,5.6,15.6", lines.get(4));
- assertEquals("Plate_042,C,1,3.3,13.3", lines.get(5));
- assertEquals("Plate_042,C,2,5.7,15.7", lines.get(6));
+ assertEquals("barcode;row;col;alpha;beta", lines.get(0));
+ assertEquals("Plate_042;A;1;4.5;14.5", lines.get(1));
+ assertEquals("Plate_042;A;2;4.6;14.6", lines.get(2));
+ assertEquals("Plate_042;B;1;3.5;13.5", lines.get(3));
+ assertEquals("Plate_042;B;2;5.6;15.6", lines.get(4));
+ assertEquals("Plate_042;C;1;3.3;13.3", lines.get(5));
+ assertEquals("Plate_042;C;2;5.7;15.7", lines.get(6));
assertEquals(7, lines.size());
- }
+ }
}
--
GitLab