From 6865889bb698d1fbedba326d372d0de32dc31b1d Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 25 Sep 2012 13:05:05 +0000
Subject: [PATCH] fixing OpenbisServiceFacadeTest
SVN: 26796
---
.../datastoreserver/systemtests/DssComponentTest.java | 6 ------
.../systemtests/OpenbisServiceFacadeTest.java | 9 +++++++--
2 files changed, 7 insertions(+), 8 deletions(-)
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 f90903cd79d..078c8892f66 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
@@ -435,12 +435,6 @@ public class DssComponentTest extends SystemTestCase
return code.startsWith("2") ? code : "0" + code;
}
});
- System.out.println("==== data sets:");
- for (SimpleDataSetInformationDTO ds : dataSets)
- {
- System.out.println(ds.getDataSetCode());
- }
- System.out.println("====");
return dataSets.get(0);
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
index e563ddead53..f85e29100e5 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
@@ -300,7 +300,7 @@ public class OpenbisServiceFacadeTest extends SystemTestCase
@Override
public int compare(SimpleDataSetInformationDTO d1, SimpleDataSetInformationDTO d2)
{
- return d2.getDataSetCode().compareTo(d1.getDataSetCode());
+ return normalize(d2.getDataSetCode()).compareTo(normalize(d1.getDataSetCode()));
}
});
return dataSets.get(0);
@@ -316,11 +316,16 @@ public class OpenbisServiceFacadeTest extends SystemTestCase
public int compare(DataSet o1, DataSet o2)
{
// sort decreasing
- return o2.getCode().compareTo(o1.getCode());
+ return normalize(o2.getCode()).compareTo(normalize(o1.getCode()));
}
});
return dataSets.get(0);
}
+
+ private String normalize(String code)
+ {
+ return code.startsWith("2") ? code : "0" + code;
+ }
private void checkDataSet(DataSet dataSet) throws IOException
{
--
GitLab