[openmeetings] branch feature/OPENMEETINGS-2273-get-original updated: OPENMEETINGS-2273 Add some more unit tests

[sebawagner]

This is an automated email from the ASF dual-hosted git repository.

sebawagner pushed a commit to branch feature/OPENMEETINGS-2273-get-original
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to 
refs/heads/feature/OPENMEETINGS-2273-get-original by this push:
     new e575389  OPENMEETINGS-2273 Add some more unit tests
e575389 is described below

commit e575389836bc2454a350169daae4315d5db8308f
Author: Sebastian Wagner <sebawag...@apache.org>
AuthorDate: Sun Apr 19 17:45:34 2020 +1200

    OPENMEETINGS-2273 Add some more unit tests
---
 .../openmeetings/db/entity/file/FileItemTest.java  | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git 
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java
 
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java
index 66fd67b..01251a2 100644
--- 
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java
+++ 
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java
@@ -1,5 +1,6 @@
 package org.apache.openmeetings.db.entity.file;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
@@ -30,15 +31,27 @@ public class FileItemTest {
        public void setup() {
                MockitoAnnotations.initMocks(this);
                
+               // Setup path to be local test resources
+               mockStatic(OmFileHelper.class);
+               when(OmFileHelper.getUploadFilesDir()).thenReturn(new 
File("src/test/resources"));
        }
        
        @Test
-       public void testGetOriginalWithPDFWithOriginalName() {
+       public void testGetFileShouldReturnFirstSlideWithPDF() {
+               // Setup file
+               fileItem.setDeleted(false);
+               fileItem.setHash("6594186e-c6bb-49d5-9f66-829e45599aaa");
+               fileItem.setName("mypresentation.pdf");
+               fileItem.setType(BaseFileItem.Type.PRESENTATION);
                
-               // Setup path to be local test resources
-               mockStatic(OmFileHelper.class);
-               when(OmFileHelper.getUploadFilesDir()).thenReturn(new 
File("src/test/resources"));
+               File f = fileItem.getFile(null);
                
+               assertTrue(f.getName().endsWith("png"));
+               assertEquals(f.getName(), "page-0000.png");
+       }
+       
+       @Test
+       public void testGetOriginalWithPDFWithOriginalName() {
                // Setup file
                fileItem.setDeleted(false);
                fileItem.setHash("6594186e-c6bb-49d5-9f66-829e45599aaa");
@@ -48,15 +61,11 @@ public class FileItemTest {
                File f = fileItem.getOriginal();
                
                assertTrue(f.getName().endsWith("pdf"));
+               assertEquals(f.getName(), 
"6594186e-c6bb-49d5-9f66-829e45599aaa.pdf");
        }
        
        @Test
        public void testGetOriginalWithPDFWithChangedName() {
-               
-               // Setup path to be local test resources
-               mockStatic(OmFileHelper.class);
-               when(OmFileHelper.getUploadFilesDir()).thenReturn(new 
File("src/test/resources"));
-               
                // Setup file
                fileItem.setDeleted(false);
                fileItem.setHash("6594186e-c6bb-49d5-9f66-829e45599aaa");
@@ -66,6 +75,7 @@ public class FileItemTest {
                File f = fileItem.getOriginal();
                
                assertTrue(f.getName().endsWith("pdf"));
+               assertEquals(f.getName(), 
"6594186e-c6bb-49d5-9f66-829e45599aaa.pdf");
        }
 
 }