diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java index 48ba5389b8b8fec032a4d789766ce7160ba72d78..cafb2f04c9055e11550693b96f2ef8e6169eae30 100644 --- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java +++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java @@ -1212,10 +1212,7 @@ public class AbstractTest extends SystemTestCase { builder.append("[inactive] "); } - builder.append(person.getUserId()).append(":"); - appendTo(builder, person.getFirstName()); - appendTo(builder, person.getLastName()); - appendTo(builder, person.getEmail()); + builder.append(person.getUserId()); Space space = person.getSpace(); if (space != null) { @@ -1243,14 +1240,6 @@ public class AbstractTest extends SystemTestCase return renderedAssignments.toString(); } - private void appendTo(StringBuilder builder, String stringOrNull) - { - if (stringOrNull != null) - { - builder.append(" ").append(stringOrNull); - } - } - protected static String patternContains(String... parts) { StringBuilder pattern = new StringBuilder(); diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonTest.java index 1a9b299c437494dfa38e885ef4fe328fd7c81e52..46d5c8d65dba617a7e36b8cffe3157688b7181b3 100644 --- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonTest.java +++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonTest.java @@ -51,9 +51,7 @@ public class GetPersonTest extends AbstractTest Map<IPersonId, Person> persons = v3api.getPersons(sessionToken, Arrays.asList(id1, id2), fetchOptions); // Then - assertEquals(renderPerson(persons.get(id1)), "observer: John Observer observer@o.o, home space:CISD, " - + "[SPACE_OBSERVER Space TESTGROUP]"); - assertEquals(renderPerson(persons.get(id2)), "test_role: John 3 Doe test role test_role@in.active, home space:CISD, " - + "[SPACE_POWER_USER Space CISD], registrator: test"); + assertEquals(renderPerson(persons.get(id1)), "observer, home space:CISD, [SPACE_OBSERVER Space TESTGROUP]"); + assertEquals(renderPerson(persons.get(id2)), "test_role, home space:CISD, [SPACE_POWER_USER Space CISD], registrator: test"); } } diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonTest.java index 46377822cd6c822d94ba011086797d64d2671a71..7de4b00cde277dfa12447f2a4c9348e3b8733b99 100644 --- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonTest.java +++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonTest.java @@ -42,7 +42,7 @@ public class SearchPersonTest extends AbstractTest searchCriteria.withOrOperator(); searchCriteria.withUserId().thatStartsWith("observer"); searchCriteria.withUserId().thatContains("role"); - searchCriteria.withLastName().thatContains("active"); + searchCriteria.withUserId().thatEndsWith("active"); PersonFetchOptions fetchOptions = new PersonFetchOptions(); fetchOptions.withSpace(); fetchOptions.withRoleAssignments().withSpace(); @@ -52,12 +52,9 @@ public class SearchPersonTest extends AbstractTest List<Person> persons = v3api.searchPersons(sessionToken, searchCriteria, fetchOptions).getObjects(); // When - assertEquals(renderPersons(persons), "[inactive] inactive: John Inactive inactive@in.active, home space:CISD, []\n" - + "observer: John Observer observer@o.o, home space:CISD, " - + "[SPACE_OBSERVER Space TESTGROUP]\n" - + "observer_cisd: John ObserverCISD observer_cisd@o.o, home space:CISD, " - + "[SPACE_ADMIN Space TESTGROUP, SPACE_OBSERVER Space CISD]\n" - + "test_role: John 3 Doe test role test_role@in.active, home space:CISD, " - + "[SPACE_POWER_USER Space CISD], registrator: test\n"); + assertEquals(renderPersons(persons), "[inactive] inactive, home space:CISD, []\n" + + "observer, home space:CISD, [SPACE_OBSERVER Space TESTGROUP]\n" + + "observer_cisd, home space:CISD, [SPACE_ADMIN Space TESTGROUP, SPACE_OBSERVER Space CISD]\n" + + "test_role, home space:CISD, [SPACE_POWER_USER Space CISD], registrator: test\n"); } }