[openmeetings] branch master updated: no jira: additional check to roomHash test was added

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 17336cc  no jira: additional check to roomHash test was added
17336cc is described below

commit 17336cc3bf195cd6247fc57f5a7a4c9ea6d64718
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Mar 27 19:41:08 2020 +0700

    no jira: additional check to roomHash test was added
---
 .../openmeetings/webservice/TestUserService.java   | 28 ++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
index cd53c98..f89024a 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
@@ -100,23 +100,31 @@ public class TestUserService extends 
AbstractWebServiceTest {
                getHash("aa", true);
        }
 
-       @Test
-       public void hashTest() throws OmException {
+       private Long getAndcheckHash(Long adminId) {
                ServiceResult r = login();
-               ServiceResult r1 = getHash(r.getMessage(), false);
+               String sid = r.getMessage();
+               ServiceResult r1 = getHash(sid, false);
                assertEquals(Type.SUCCESS.name(), r1.getType(), "OM Call should 
be successful");
-
-               ensureApplication(-1L); // to ensure WebSession is attached
                WebSession ws = WebSession.get();
-               assertTrue(ws.signIn(adminUsername, userpass, User.Type.USER, 
null));
-               Long userId0 = WebSession.getUserId();
                ws.checkHashes(StringValue.valueOf(r1.getMessage()), 
StringValue.valueOf(""));
                assertTrue(ws.isSignedIn(), "Login via secure hash should be 
successful");
-               Long userId1 = WebSession.getUserId();
-               assertNotEquals(userId0, userId1);
-               User u = getBean(UserDao.class).get(userId1);
+               Long userId = WebSession.getUserId();
+               assertNotEquals(adminId, userId);
+               User u = getBean(UserDao.class).get(userId);
                assertNotNull(u, "User should be created successfuly");
                assertEquals(DUMMY_PICTURE_URL, u.getPictureUri(), "Picture URL 
should be preserved");
+               return userId;
+       }
+
+       @Test
+       public void hashTest() throws OmException {
+               ensureApplication(-1L); // to ensure WebSession is attached
+               WebSession ws = WebSession.get();
+               assertTrue(ws.signIn(adminUsername, userpass, User.Type.USER, 
null));
+               Long userId0 = WebSession.getUserId();
+               Long userId1 = getAndcheckHash(userId0);
+               Long userId2 = getAndcheckHash(userId0);
+               assertEquals(userId1, userId2, "User should be the same");
        }
 
        @Test