From a75cd8fc198c886e2d22dfaa40c5cb19734a6300 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 19 May 2011 06:31:33 +0000
Subject: [PATCH] LMS-2240 test fixed
SVN: 21382
---
.../v1/GeneralInformationChangingServiceTest.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceTest.java
index 1f42733540d..60a81a1b9f5 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceTest.java
@@ -16,8 +16,11 @@
package ch.systemsx.cisd.openbis.generic.server.api.v1;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import org.jmock.Expectations;
import org.testng.annotations.BeforeMethod;
@@ -28,6 +31,7 @@ import ch.systemsx.cisd.openbis.generic.shared.AbstractServerTestCase;
import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleParentWithDerived;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.builders.ExperimentBuilder;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.builders.MaterialBuilder;
@@ -99,8 +103,15 @@ public class GeneralInformationChangingServiceTest extends AbstractServerTestCas
SampleUpdatesDTO updatesDTO = updateMatcher.recordedObject();
assertEquals(SAMPLE_ID, updatesDTO.getSampleIdOrNull().getId().longValue());
assertEquals(1234567890L, updatesDTO.getVersion().getTime());
- assertEquals("[age: 76, material: B (Fluid), greetings: hello]",
- updatesDTO.getProperties().toString());
+ List<IEntityProperty> props = updatesDTO.getProperties();
+ Collections.sort(props, new Comparator<IEntityProperty>()
+ {
+ public int compare(IEntityProperty o1, IEntityProperty o2)
+ {
+ return o1.getPropertyType().getCode().compareTo(o2.getPropertyType().getCode());
+ }
+ });
+ assertEquals("[age: 76, greetings: hello, material: B (Fluid)]", props.toString());
assertEquals("/P/S1:A03", updatesDTO.getSampleIdentifier().toString());
assertEquals("/S/P/E", updatesDTO.getExperimentIdentifierOrNull().toString());
assertEquals("/P/S1", updatesDTO.getContainerIdentifierOrNull().toString());
--
GitLab