[openmeetings] branch master updated: [OPENMEETINGS-2429] tests should be fixed

[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 2b9acc0  [OPENMEETINGS-2429] tests should be fixed
2b9acc0 is described below

commit 2b9acc06cc6c6b23a3f60e316ac3d988e1dfbcb4
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Sep 18 07:37:04 2020 +0700

    [OPENMEETINGS-2429] tests should be fixed
---
 .../apache/openmeetings/backup/TestImportOld.java   |   2 +-
 .../openmeetings/backup/jira2423/backup_2423.zip    | Bin 25722 -> 25723 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
index 511cca0..2653104 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
@@ -106,7 +106,7 @@ class TestImportOld extends AbstractTestImport {
                        User usr2 = userDao.getByLogin("testUser2_jira_2423", 
User.Type.USER, null);
                        assertTrue(usr2.getGroupUsers().stream().filter(gu -> 
gu.getGroup().getId().equals(grp2.getId())).findFirst().isPresent(), "User2 
should belong to group2");
                        roomDao.getMyRooms(usr2.getId(), "bla", 
"bla1").forEach(r -> {
-                               
assertTrue(r.getName().contains("user2_jira_2423"));
+                               
assertTrue(r.getComment().contains("user2_jira_2423"));
                        });
                        FileItem f1 = 
fileDao.getByHash("820b356c-2c96-4634-90c4-3e490432987f");
                        assertEquals(usr2.getId(), f1.getInsertedBy(), 
"Inserted by is wrong");
diff --git 
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/jira2423/backup_2423.zip
 
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/jira2423/backup_2423.zip
index f17518c..2d59019 100644
Binary files 
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/jira2423/backup_2423.zip
 and 
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/jira2423/backup_2423.zip
 differ