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 adb6a52 [OPENMEETINGS-2571] tests for getExternal are added
adb6a52 is described below
commit adb6a52ddb8cee8c03aad9a289c0457be75daa07
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Feb 9 11:25:53 2021 +0700
[OPENMEETINGS-2571] tests for getExternal are added
---
.../openmeetings/db/entity/file/FileItem.java | 4 +-
.../apache/openmeetings/AbstractJUnitDefaults.java | 1 +
.../apache/openmeetings/db/dao/TestFileDao.java | 61 ++++++++++++++++++++++
.../openmeetings/webservice/TestFileService.java | 38 ++++++++++++++
4 files changed, 102 insertions(+), 2 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
index 85d01e3..3f0b458 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
@@ -39,8 +39,8 @@ import org.apache.openmeetings.db.bind.adapter.LongAdapter;
+ "AND f.parentId = :parentId ORDER BY f.type ASC, f.name ")
@NamedQuery(name = "getFilesFilteredByParent", query = "SELECT f FROM FileItem
f WHERE f.deleted = false "
+ "AND f.parentId = :parentId AND f.type IN :filter ORDER BY
f.type ASC, f.name ")
-@NamedQuery(name = "getFileExternal", query = "SELECT f FROM FileItem f WHERE
f.deleted = false AND f.externalId = :externalId AND f.externalType LIKE
:externalType")
-@NamedQuery(name = "getFileAllExternal", query = "SELECT f FROM FileItem f
WHERE f.deleted = false AND f.externalType LIKE :externalType")
+@NamedQuery(name = "getFileExternal", query = "SELECT f FROM FileItem f WHERE
f.deleted = false AND f.externalId = :externalId AND f.externalType =
:externalType")
+@NamedQuery(name = "getFileAllExternal", query = "SELECT f FROM FileItem f
WHERE f.deleted = false AND f.externalType = :externalType")
@NamedQuery(name = "getFileByGroup", query = "SELECT f FROM FileItem f WHERE
f.deleted = false AND f.ownerId IS NULL "
+ "AND f.groupId = :groupId AND f.parentId IS NULL "
+ "ORDER BY f.type ASC, f.name")
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
index 9d1599d..3ac007f 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
@@ -56,6 +56,7 @@ public abstract class AbstractJUnitDefaults extends
AbstractSpringTest {
public static final String userpass = "Q!w2e3r4t5";
public static final String group = "smoketest";
public static final String email = "[email protected]";
+ public static final String UNIT_TEST_ARAB_EXT_TYPE = "النُّجُومُ
الخَمْسَةِ";
public static final Random rnd = new Random();
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestFileDao.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestFileDao.java
new file mode 100644
index 0000000..058705d
--- /dev/null
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestFileDao.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.dao;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.util.List;
+
+import org.apache.openmeetings.AbstractJUnitDefaults;
+import org.apache.openmeetings.db.dao.file.FileItemDao;
+import org.apache.openmeetings.db.dao.user.GroupDao;
+import org.apache.openmeetings.db.entity.file.BaseFileItem;
+import org.apache.openmeetings.db.entity.file.FileItem;
+import org.apache.openmeetings.db.entity.user.Group;
+import org.apache.openmeetings.db.entity.user.User;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+class TestFileDao extends AbstractJUnitDefaults {
+ @Autowired
+ protected FileItemDao fileDao;
+ @Autowired
+ protected GroupDao groupDao;
+
+ @Test
+ void testExtType() throws Exception {
+ Group g = new Group();
+ g.setExternal(true);
+ g.setName(UNIT_TEST_ARAB_EXT_TYPE);
+ g = groupDao.update(g, null);
+ User u = getUser();
+ u.addGroup(g);
+ u = createUser(u);
+
+ FileItem f = new FileItem();
+ f.setName("Arab external test");
+ f.setType(BaseFileItem.Type.IMAGE);
+ f.setInsertedBy(u.getId());
+ f = fileDao.update(f);
+ List<FileItem> list1 =
fileDao.getExternal(UNIT_TEST_ARAB_EXT_TYPE);
+ assertNotNull(list1);
+ assertFalse(list1.isEmpty());
+ }
+}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
index 6968093..7a93bd5 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
@@ -18,6 +18,12 @@
*/
package org.apache.openmeetings.webservice;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.UUID.randomUUID;
+import static
org.apache.openmeetings.AbstractJUnitDefaults.UNIT_TEST_ARAB_EXT_TYPE;
+import static org.apache.openmeetings.AbstractJUnitDefaults.createUser;
+import static org.apache.openmeetings.AbstractJUnitDefaults.getUser;
+import static org.junit.Assert.assertFalse;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -25,13 +31,21 @@ import java.awt.Graphics;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
+import java.util.Collection;
import javax.imageio.ImageIO;
+import org.apache.openmeetings.db.dao.file.FileItemDao;
+import org.apache.openmeetings.db.dao.user.GroupDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.apache.openmeetings.db.dto.file.FileExplorerObject;
import org.apache.openmeetings.db.dto.file.FileItemDTO;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
+import org.apache.openmeetings.db.entity.file.FileItem;
+import org.apache.openmeetings.db.entity.user.Group;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.wicket.util.encoding.UrlEncoder;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -69,4 +83,28 @@ class TestFileService extends AbstractWebServiceTest {
.get(FileExplorerObject.class);
assertNotNull(fo);
}
+
+ @Test
+ void testGetExternal() throws Exception {
+ Group g = new Group();
+ g.setExternal(true);
+ g.setName(UNIT_TEST_ARAB_EXT_TYPE);
+ g = getBean(GroupDao.class).update(g, null);
+ User u = getUser(randomUUID().toString());
+ u.addGroup(g);
+ u = createUser(getBean(UserDao.class), u);
+
+ FileItem f = new FileItem();
+ f.setName("Arab external test");
+ f.setType(BaseFileItem.Type.IMAGE);
+ f.setInsertedBy(u.getId());
+ f = getBean(FileItemDao.class).update(f);
+ ServiceResult r = login();
+ Collection<? extends FileItemDTO> list = getClient(getFileUrl())
+ .path("/" +
UrlEncoder.PATH_INSTANCE.encode(UNIT_TEST_ARAB_EXT_TYPE, UTF_8))
+ .query("sid", r.getMessage())
+ .getCollection(FileItemDTO.class);
+ assertNotNull(list);
+ assertFalse(list.isEmpty());
+ }
}
