From 9d91502b3e55dfeffe02829c86ae861d50a6ae44 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 25 Feb 2009 09:54:13 +0000
Subject: [PATCH] LMS-761 bug in test fixed
SVN: 9964
---
.../cisd/openbis/generic/server/CommonServerTest.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
index c1b6049bb0e..0e9571f06d1 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
@@ -164,6 +164,7 @@ public final class CommonServerTest extends AbstractServerTestCase
{
final String user = "user";
final String password = "password";
+ final Session session = createSession();
final PersonPE systemPerson = createSystemUser();
final PersonPE person = CommonTestUtils.createPersonFromPrincipal(PRINCIPAL);
context.checking(new Expectations()
@@ -173,7 +174,7 @@ public final class CommonServerTest extends AbstractServerTestCase
will(returnValue(SESSION_TOKEN));
one(sessionManager).getSession(SESSION_TOKEN);
- will(returnValue(SESSION));
+ will(returnValue(session));
one(personDAO).listPersons();
will(returnValue(Arrays.asList(systemPerson, person)));
@@ -197,6 +198,7 @@ public final class CommonServerTest extends AbstractServerTestCase
{
final String user = "user";
final String password = "password";
+ final Session session = createSession();
final PersonPE systemPerson = createSystemUser();
final PersonPE person = CommonTestUtils.createPersonFromPrincipal(PRINCIPAL);
context.checking(new Expectations()
@@ -206,7 +208,7 @@ public final class CommonServerTest extends AbstractServerTestCase
will(returnValue(SESSION_TOKEN));
one(sessionManager).getSession(SESSION_TOKEN);
- will(returnValue(SESSION));
+ will(returnValue(session));
one(personDAO).listPersons();
will(returnValue(Arrays.asList(systemPerson, person)));
@@ -215,7 +217,7 @@ public final class CommonServerTest extends AbstractServerTestCase
will(returnValue(person));
}
});
- assertEquals(null, SESSION.tryGetPerson());
+ assertEquals(null, session.tryGetPerson());
final Session s = createServer().tryToAuthenticate(user, password);
--
GitLab