From 21a091b7159dda4240975b407f61c850a49c45eb Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 15 Feb 2017 09:20:14 +0000
Subject: [PATCH] making DssComponentTest more robust
SVN: 37743
---
.../datastoreserver/systemtests/DssComponentTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
index 904413582c6..234c697aa74 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
@@ -27,10 +27,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Date;
import java.util.List;
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -462,6 +464,7 @@ public class DssComponentTest extends SystemTestCase
{
IEncapsulatedOpenBISService openBISService = ServiceProvider.getOpenBISService();
List<SimpleDataSetInformationDTO> dataSets = openBISService.listPhysicalDataSets();
+ final String prefix = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS").substring(0, 6);
Collections.sort(dataSets, new Comparator<SimpleDataSetInformationDTO>()
{
@Override
@@ -474,7 +477,7 @@ public class DssComponentTest extends SystemTestCase
private String normalize(String code)
{
- return code.startsWith("2") ? code : "0" + code;
+ return code.startsWith(prefix) ? code : "0" + code;
}
});
return dataSets.get(0);
--
GitLab