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 2017/03/08 14:21:53 UTC
svn commit: r1785973 [3/3] - in /openmeetings/application:
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/
branches/3.2.x/open...
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestOmCalendar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestOmCalendar.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestOmCalendar.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestOmCalendar.java Wed Mar 8 14:21:52 2017
@@ -18,6 +18,9 @@
*/
package org.apache.openmeetings.test.calendar;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.apache.openmeetings.db.dao.calendar.OmCalendarDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.OmCalendar;
@@ -26,9 +29,6 @@ import org.apache.openmeetings.test.Abst
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
public class TestOmCalendar extends AbstractJUnitDefaults {
@Autowired
private OmCalendarDao calendarDao;
@@ -36,7 +36,7 @@ public class TestOmCalendar extends Abst
private UserDao userDao;
@Test
- public void saveCalendar() throws Exception {
+ public void saveCalendar() {
OmCalendar calendar = new OmCalendar();
Long userId = 1L;
User owner = userDao.get(userId);
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java Wed Mar 8 14:21:52 2017
@@ -94,7 +94,7 @@ public abstract class AbstractTestDefaul
}
@Before
- public void setUp() throws Exception {
+ public void setUp() {
FirefoxProfile profile = new FirefoxProfile();
profile.setPreference("intl.accept_languages", getLocale());
driver = new FirefoxDriver(profile);
@@ -222,7 +222,7 @@ public abstract class AbstractTestDefaul
}
@After
- public void tearDown() throws Exception {
+ public void tearDown() {
if (getDoTearDownAfterTest()) {
driver.close();
driver.quit();
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java Wed Mar 8 14:21:52 2017
@@ -40,12 +40,12 @@ public class TestUserContact extends Abs
private UserDao userDao;
@Autowired
private GroupDao groupDao;
-
+
@Test
- public void testGetUser() throws Exception {
+ public void testGetUser() {
assertNull("Null should be returned in case User does not exist", userDao.get(Long.MAX_VALUE));
}
-
+
@Test
public void createUserWithGroup() throws Exception {
String uuid = UUID.randomUUID().toString();
@@ -53,38 +53,38 @@ public class TestUserContact extends Abs
u.getGroupUsers().add(new GroupUser(groupDao.get(1L), u));
u = userDao.update(u, null);
assertTrue("Password should be set as expected", userDao.verifyPassword(u.getId(), getRandomPass(uuid)));
-
+
User u1 = userDao.get(u.getId());
assertNotNull("Just created user should not be null", u1);
assertNotNull("Just created user should have non null org-users", u1.getGroupUsers());
assertFalse("Just created user should have not empty org-users", u1.getGroupUsers().isEmpty());
}
-
+
@Test
public void testCreateUser() throws Exception {
String uuid = UUID.randomUUID().toString();
User u = createUser(uuid);
assertTrue("Password should be set as expected", userDao.verifyPassword(u.getId(), getRandomPass(uuid)));
}
-
+
@Test
public void addContactByOwner() throws Exception {
login(null, null);
-
+
List<User> users = userDao.getAllUsers();
assertNotNull("User list should not be null ", users);
assertFalse("User list should not be empty ", users.isEmpty());
-
+
User contact = createUserContact(getUserId());
String email = contact.getAddress().getEmail();
List<User> l = userDao.get(email, false, 0, 9999);
// check that contact is visible for admin
assertNotNull("Contact list should not be null for admin ", l);
assertFalse("Contact list should not be empty for admin ", l.isEmpty());
-
+
// check that contact is visible for owner
l = userDao.get(email, 0, 9999, null, true, getUserId());
- assertTrue("Contact list should not be empty for owner ", !l.isEmpty());
+ assertTrue("Contact list should not be empty for owner ", !l.isEmpty());
//delete contact
userDao.delete(contact, getUserId());
l = userDao.get(email, false, 0, 9999);
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java Wed Mar 8 14:21:52 2017
@@ -50,9 +50,9 @@ public class TestUserCount extends Abstr
createUserContact(u.getId());
assertTrue("Account of unfiltered should be more then one", userDao.count("firstname", false, getUserId()) > 1);
}
-
+
@Test
- public void testCountAllUsers() throws Exception {
+ public void testCountAllUsers() {
assertTrue("Account of users should be positive", userDao.count() > 0);
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java Wed Mar 8 14:21:52 2017
@@ -34,7 +34,7 @@ import org.junit.Test;
public class TestWebConverters {
@Test
- public void testDateConverter() throws Exception {
+ public void testDateConverter() {
assertEquals("Null date should be parsed", null, DateParamConverter.get(null));
assertEquals("Date should be parsed"
, Date.from(LocalDate.of(2017, 01, 15).atStartOfDay(ZoneId.systemDefault()).toInstant())
@@ -45,7 +45,7 @@ public class TestWebConverters {
}
@Test
- public void testCalendarConverter() throws Exception {
+ public void testCalendarConverter() {
CalendarParamConverter c = new CalendarParamConverter();
assertEquals("Null calendar should be parsed", null, c.fromString(null));
Calendar cal = Calendar.getInstance();
@@ -54,7 +54,7 @@ public class TestWebConverters {
}
@Test
- public void testUserConverter() throws Exception {
+ public void testUserConverter() {
assertEquals("Null UserDTO should be parsed", null, UserDTO.get((JSONObject)null));
}
}
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java Wed Mar 8 14:21:52 2017
@@ -64,12 +64,12 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
/**
- *
+ *
* Contains methods to import and upload files into the Files section of the
* conference room and the personal drive of any user
- *
+ *
* @author sebawagner
- *
+ *
*/
@WebService(serviceName="org.apache.openmeetings.webservice.FileWebService", targetNamespace = TNS)
@Features(features = "org.apache.cxf.feature.LoggingFeature")
@@ -89,7 +89,7 @@ public class FileWebService {
/**
* deletes files or folders based on it id
- *
+ *
* @param sid
* The SID of the User. This SID must be marked as logged in
* @param id
@@ -124,9 +124,9 @@ public class FileWebService {
}
/**
- *
+ *
* deletes a file by its external Id and type
- *
+ *
* @param sid
* The SID of the User. This SID must be marked as logged in
* @param externalId
@@ -141,11 +141,11 @@ public class FileWebService {
@WebParam(name="sid") @QueryParam("sid") String sid
, @WebParam(name="externaltype") @PathParam("externaltype") String externalType
, @WebParam(name="externalid") @PathParam("externalid") String externalId
- ) throws ServiceException
+ )
{
try {
Sessiondata sd = sessionDao.check(sid);
-
+
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) {
FileExplorerItem f = fileDao.get(externalId, externalType);
fileDao.delete(f);
@@ -160,7 +160,7 @@ public class FileWebService {
/**
* to add a folder to the private drive, set parentFileExplorerItemId = 0 and isOwner to 1/true and
* externalUserId/externalUserType to a valid user
- *
+ *
* @param sid
* The SID of the User. This SID must be marked as logged in
* @param file
@@ -197,7 +197,7 @@ public class FileWebService {
//TODO permissions
if (stream != null) {
//TODO attachment
- ConverterProcessResultList result = fileProcessor.processFile(userId, f, stream);
+ ConverterProcessResultList result = fileProcessor.processFile(f, stream);
if (result.hasError()) {
throw new ServiceException(result.getLogMessage());
}
@@ -218,11 +218,11 @@ public class FileWebService {
/**
* Get a LibraryPresentation-Object for a certain file
- *
+ *
* @param sid
* The SID of the User. This SID must be marked as logged in
* @param parentFolder
- *
+ *
* @return - LibraryPresentation-Object for a certain file
* @throws ServiceException
*/
@@ -256,7 +256,7 @@ public class FileWebService {
/**
* Get a File Explorer Object by a given Room
- *
+ *
* @param sid
* The SID of the User. This SID must be marked as logged in
* @param roomId
@@ -301,9 +301,9 @@ public class FileWebService {
}
/**
- *
+ *
* Get list of {@link FileExplorerItemDTO} by parent
- *
+ *
* @param sid
* SID The SID of the User. This SID must be marked as logged in
* @param parentId
@@ -351,9 +351,9 @@ public class FileWebService {
}
/**
- *
+ *
* update a file or folder name
- *
+ *
* @param sid
* SID The SID of the User. This SID must be marked as logged in
* @param id
@@ -391,7 +391,7 @@ public class FileWebService {
/**
* move a file or folder
- *
+ *
* @param sid
* SID The SID of the User. This SID must be marked as logged in
* @param id