From 0c43312c1106634a5d331f711da041d1b06dcf88 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 1 Mar 2017 13:33:02 +0000
Subject: [PATCH] SSDM-4187: fixing test caused by change of behavior of
SampleOwnerIdentifier
SVN: 37847
---
.../dto/identifier/SampleOwnerIdentifierTest.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java
index 37fe619ef89..a55730a06e3 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java
@@ -79,7 +79,7 @@ public class SampleOwnerIdentifierTest
@Test
public void testIsAndGetSpaceLevel()
{
- assertIsAndGetSpaceLevel(ownerProjectP1, false, null);
+ assertIsAndGetSpaceLevel(ownerProjectP1, false, spaceA);
assertIsAndGetSpaceLevel(ownerSpaceA, true, spaceA);
assertIsAndGetSpaceLevel(noOwner, false, null);
}
@@ -87,7 +87,13 @@ public class SampleOwnerIdentifierTest
private void assertIsAndGetSpaceLevel(SampleOwnerIdentifier identifier, boolean expected, SpaceIdentifier space)
{
assertEquals(identifier.isSpaceLevel(), expected);
- assertSame(identifier.getSpaceLevel(), space);
+ if (space == null)
+ {
+ assertEquals(identifier.getSpaceLevel(), null);
+ } else
+ {
+ assertSame(identifier.getSpaceLevel().getSpaceCode(), space.getSpaceCode());
+ }
}
@Test
--
GitLab