From c0a11f8e6872fc172b2e9e1cd40a6e94219cd27c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 8 Jun 2010 09:10:50 +0000
Subject: [PATCH] tests fixed
SVN: 16323
---
.../cisd/etlserver/validation/DataSetValidatorForTSVTest.java | 2 +-
.../cisd/etlserver/validation/DataSetValidatorTest.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java
index 8819157eef0..248c67055e2 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java
@@ -348,7 +348,7 @@ public class DataSetValidatorForTSVTest extends AbstractFileSystemTestCase
fail("UserFailureException expected");
} catch (UserFailureException ex)
{
- assertEquals("The row in line 3 has 2 cells instead of 1", ex.getMessage());
+ assertEquals("2. row has 2 instead of 1 cells.", ex.getMessage());
}
MockValidatorFactory.assertSatisfied();
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java
index dccffe73c67..33c3cd0311f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java
@@ -145,6 +145,7 @@ public class DataSetValidatorTest extends AbstractFileSystemTestCase
properties.setProperty(DataSetValidator.DATA_SET_VALIDATORS_KEY, "v");
properties.setProperty("v." + DataSetValidator.DATA_SET_TYPE_KEY, dataSetType1.getCode());
properties.setProperty("v." + DataSetValidatorForTSV.PATH_PATTERNS_KEY, "*.txt");
+ properties.setProperty("v." + DataSetValidatorForTSV.STRICT_ROW_SIZE_KEY, "false");
properties.setProperty("v." + DataSetValidatorForTSV.COLUMNS_KEY, "c1,c2");
properties.setProperty("v.c1." + DefaultValueValidatorFactory.VALUE_TYPE_KEY, "unique");
properties.setProperty("v.c2." + DefaultValueValidatorFactory.VALUE_TYPE_KEY, "numeric");
--
GitLab