You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/06/21 03:19:48 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1900] tests for
picture URL was added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new e9fb4d3 [OPENMEETINGS-1900] tests for picture URL was added
e9fb4d3 is described below
commit e9fb4d31d75fcabd9d1264913367e786ade9965f
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jun 21 10:19:39 2018 +0700
[OPENMEETINGS-1900] tests for picture URL was added
---
.../org/apache/openmeetings/db/dto/user/ExternalUserDTO.java | 3 ++-
openmeetings-server/src/site/xdoc/JUnitTesting.xml | 2 +-
.../org/apache/openmeetings/webservice/TestUserService.java | 10 ++++++++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
index a345860..2f14030 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
@@ -73,8 +73,9 @@ public class ExternalUserDTO implements Serializable {
return profilePictureUrl;
}
- public void setProfilePictureUrl(String profilePictureUrl) {
+ public ExternalUserDTO setProfilePictureUrl(String profilePictureUrl) {
this.profilePictureUrl = profilePictureUrl;
+ return this;
}
public String getEmail() {
diff --git a/openmeetings-server/src/site/xdoc/JUnitTesting.xml b/openmeetings-server/src/site/xdoc/JUnitTesting.xml
index 47413e4..2acf629 100644
--- a/openmeetings-server/src/site/xdoc/JUnitTesting.xml
+++ b/openmeetings-server/src/site/xdoc/JUnitTesting.xml
@@ -65,7 +65,7 @@
<ul>
<li>Select Arguments tab </li>
<li>Add the following code to the VM section
- <source>-javaagent:/home/solomax/.m2/repository/org/apache/openjpa/openjpa/2.4.2/openjpa-2.4.2.jar -Dom.home=${workspace_loc:openmeetings-web}/target/test-root/ -Dbackups.dir=${workspace_loc:openmeetings-web}/target/test-data</source>
+ <source>-javaagent:/home/solomax/.m2/repository/org/apache/openjpa/openjpa/3.0.0/openjpa-3.0.0.jar -Dom.home=${workspace_loc:openmeetings-web}/target/test-root/ -Dbackups.dir=${workspace_loc:openmeetings-web}/target/test-data</source>
</li>
<li>To avoid temporary files being created in OM root, modify
"Working Directory" as follows
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 2921b46..90a3257 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
@@ -21,6 +21,7 @@ package org.apache.openmeetings.webservice;
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -42,10 +43,11 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.OmException;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.util.string.StringValue;
-import org.junit.Assert;
import org.junit.Test;
public class TestUserService extends AbstractWebServiceTest {
+ private static final String DUMMY_PICTURE_URL = "http://openmeetings.apache.org/images/logo.png";
+
@Test
public void invalidLoginTest() {
ServiceResult r = loginNoCheck("invalid-user", "bad pass");
@@ -66,6 +68,7 @@ public class TestUserService extends AbstractWebServiceTest {
.setEmail("user1@junit.openmeetings.apache.org")
.setFirstname("First Name 1")
.setLastname("Last Name 1")
+ .setProfilePictureUrl(DUMMY_PICTURE_URL)
.setLogin("login1");
RoomOptionsDTO options = new RoomOptionsDTO()
.setRoomId(5L)
@@ -103,7 +106,10 @@ public class TestUserService extends AbstractWebServiceTest {
ws.checkHashes(StringValue.valueOf(r1.getMessage()), StringValue.valueOf(""));
assertTrue("Login via secure hash should be successful", ws.isSignedIn());
Long userId1 = WebSession.getUserId();
- Assert.assertNotEquals(userId0, userId1);
+ assertNotEquals(userId0, userId1);
+ User u = userDao.get(userId1);
+ assertNotNull("User should be created successfuly", u);
+ assertEquals("Picture URL should be preserved", DUMMY_PICTURE_URL, u.getPictureuri());
}
@Test