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 11bbc1b [OPENMEETINGS-2177] couple of tests are fixed
11bbc1b is described below
commit 11bbc1b391a730239dbe0bb053d2300c1804318a
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Mar 3 08:31:23 2020 +0700
[OPENMEETINGS-2177] couple of tests are fixed
---
.../apache/openmeetings/db/entity/user/AsteriskSipUser.java | 2 +-
.../java/org/apache/openmeetings/db/entity/user/User.java | 6 ++++--
.../java/org/apache/openmeetings/backup/BackupImport.java | 1 +
.../service/calendar/caldav/AppointmentManager.java | 6 ++++--
.../java/org/apache/openmeetings/backup/TestImportUser.java | 11 +++++++++++
5 files changed, 21 insertions(+), 5 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
index c5ec2bf..eeeecd9 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
@@ -90,7 +90,7 @@ public class AsteriskSipUser implements Serializable {
@Column(name = "port", nullable = false, length = 8)
@XmlElement(name = "port", required = false)
- @XmlJavaTypeAdapter(LongAdapter.class)
+ @XmlJavaTypeAdapter(IntAdapter.class)
private Integer port = 0; // mediumint(8)
@Column(name = "regseconds", nullable = false)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index b3f5521..88e7bad 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -55,6 +55,7 @@ import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -283,7 +284,7 @@ public class User extends HistoricalEntity {
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL,
orphanRemoval = true)
@JoinColumn(name = "user_id", insertable = true, updatable = true,
nullable = false)
@ElementDependent
- @XmlElement(name = "organisations", required = false)
+ @XmlElementWrapper(name = "organisations", required = false)
private List<GroupUser> groupUsers = new ArrayList<>();
@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL,
orphanRemoval = true)
@@ -358,7 +359,8 @@ public class User extends HistoricalEntity {
@Column(name = "om_right")
@CollectionTable(name = "om_user_right", joinColumns = @JoinColumn(name
= "user_id"))
@Enumerated(EnumType.STRING)
- @XmlElement(name = "rights", required = false)
+ @XmlElementWrapper(name = "rights", required = false)
+ @XmlElement(name = "right", required = false)
private Set<Right> rights = new HashSet<>();
@Column(name = "domain_id")
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 33719ab..ad3dd14 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -249,6 +249,7 @@ public class BackupImport {
outdatedConfigKeys.put("swftools_zoom", CONFIG_DOCUMENT_DPI);
outdatedConfigKeys.put("swftools_jpegquality",
CONFIG_DOCUMENT_QUALITY);
outdatedConfigKeys.put("sms.subject", CONFIG_REMINDER_MESSAGE);
+ outdatedConfigKeys.put("exclusive.audio.keycode",
CONFIG_KEYCODE_MUTE_OTHERS);
configTypes.put(CONFIG_REGISTER_FRONTEND,
Configuration.Type.BOOL);
configTypes.put(CONFIG_REGISTER_SOAP, Configuration.Type.BOOL);
configTypes.put(CONFIG_REGISTER_OAUTH, Configuration.Type.BOOL);
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
index 839624c..a13bfb0 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
@@ -615,7 +615,9 @@ public class AppointmentManager {
*/
@PreDestroy
public void destroy() {
- connmanager.shutdown();
- connmanager = null;
+ if (connmanager != null) {
+ connmanager.shutdown();
+ connmanager = null;
+ }
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
index 7e29e8c..55ac332 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.backup;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.File;
import org.junit.jupiter.api.Assertions;
@@ -31,4 +33,13 @@ public class TestImportUser extends AbstractTestImport {
backupImport.importUsers(configs.getParentFile());
});
}
+
+ @Test
+ public void importUsers() throws Exception {
+ long userCount = userDao.count();
+ File configs = new
File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/user/users.xml").toURI());
+ backupImport.importUsers(configs.getParentFile());
+ assertEquals(userCount + 3, userDao.count(), "Users should be
added");
+ //assertEquals(configsCount, cfgDao.count(), "No records should
be added");
+ }
}
