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 30be0165a [OPENMEETINGS-2841] attempt to fix GH CI
30be0165a is described below
commit 30be0165a2e72b3014613683f6f499867ff63ff2
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Sep 18 09:58:05 2026 +0700
[OPENMEETINGS-2841] attempt to fix GH CI
---
.../openmeetings/db/entity/file/TestFileItem.java | 53 ++++++++-------------
.../6594186e-c6bb-49d5-9f66-829e45599aaa.pdf | Bin
.../page-0000.png | Bin
.../page-0001.png | Bin
.../d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx | Bin
.../d44ab2c5-fd5d-4903-8fa7-292286d72a5f.pdf | Bin
.../page-0000.png | Bin
7 files changed, 19 insertions(+), 34 deletions(-)
diff --git
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/TestFileItem.java
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/TestFileItem.java
index 2b665569f..ca8dac271 100644
---
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/TestFileItem.java
+++
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/TestFileItem.java
@@ -20,23 +20,28 @@ package org.apache.openmeetings.db.entity.file;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mockStatic;
import java.io.File;
import org.apache.openmeetings.util.OmFileHelper;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.MockedStatic;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.stubbing.Answer;
-@ExtendWith(MockitoExtension.class)
class TestFileItem {
private FileItem fileItem;
+ @BeforeAll
+ static void setup() throws Exception {
+ OmFileHelper.setOmHome(new File(".").getCanonicalFile());
+ }
+
+ @AfterAll
+ static void tearDown() {
+ OmFileHelper.setOmHome((File)null);
+ }
+
@BeforeEach
void createNewStack() {
fileItem = new FileItem();
@@ -84,22 +89,6 @@ class TestFileItem {
assertEquals("6594186e-c6bb-49d5-9f66-829e45599aaa.pdf",
f.getName());
}
- private void wrapper(Runnable r) {
- try (MockedStatic<OmFileHelper> theMock =
mockStatic(OmFileHelper.class, new Answer<File>() {
- @Override
- public File answer(InvocationOnMock invocation) throws
Throwable {
- return switch
(invocation.getMethod().getName()) {
- case "getUploadFilesDir" -> new
File("org/apache/openmeetings/db/entity/file");
- case "getFileSafe" -> new
File(invocation.getArgument(0, File.class)
- ,
invocation.getArgument(1, String.class) + "." + invocation.getArgument(2,
String.class));
- default -> null;
- };
- }
- })) {
- r.run();
- }
- }
-
@Test
void testGetOriginalWithDOCXWithOriginalName() {
// Setup file
@@ -108,12 +97,10 @@ class TestFileItem {
fileItem.setName("Sample Document.docx");
fileItem.setType(BaseFileItem.Type.PRESENTATION);
- wrapper(() -> {
- File f = fileItem.getOriginal();
+ File f = fileItem.getOriginal();
- assertTrue(f.getName().endsWith("docx"));
-
assertEquals("d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx", f.getName());
- });
+ assertTrue(f.getName().endsWith("docx"));
+ assertEquals("d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx",
f.getName());
}
@Test
@@ -123,12 +110,11 @@ class TestFileItem {
fileItem.setHash("d44ab2c5-fd5d-4903-8fa7-292286d72a5f");
fileItem.setName("Random Name");
fileItem.setType(BaseFileItem.Type.PRESENTATION);
- wrapper(() -> {
- File f = fileItem.getOriginal();
- assertTrue(f.getName().endsWith("docx"));
-
assertEquals("d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx", f.getName());
- });
+ File f = fileItem.getOriginal();
+
+ assertTrue(f.getName().endsWith("docx"));
+ assertEquals("d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx",
f.getName());
}
@Test
@@ -158,5 +144,4 @@ class TestFileItem {
assertTrue(f.getName().endsWith("pdf"));
assertEquals("d44ab2c5-fd5d-4903-8fa7-292286d72a5f.pdf",
f.getName());
}
-
}
diff --git
a/openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/6594186e-c6bb-49d5-9f66-829e45599aaa/6594186e-c6bb-49d5-9f66-829e45599aaa.pdf
b/openmeetings-db/src/test/resources/data/upload/files/6594186e-c6bb-49d5-9f66-829e45599aaa/6594186e-c6bb-49d5-9f66-829e45599aaa.pdf
similarity index 100%
rename from
openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/6594186e-c6bb-49d5-9f66-829e45599aaa/6594186e-c6bb-49d5-9f66-829e45599aaa.pdf
rename to
openmeetings-db/src/test/resources/data/upload/files/6594186e-c6bb-49d5-9f66-829e45599aaa/6594186e-c6bb-49d5-9f66-829e45599aaa.pdf
diff --git
a/openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/6594186e-c6bb-49d5-9f66-829e45599aaa/page-0000.png
b/openmeetings-db/src/test/resources/data/upload/files/6594186e-c6bb-49d5-9f66-829e45599aaa/page-0000.png
similarity index 100%
rename from
openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/6594186e-c6bb-49d5-9f66-829e45599aaa/page-0000.png
rename to
openmeetings-db/src/test/resources/data/upload/files/6594186e-c6bb-49d5-9f66-829e45599aaa/page-0000.png
diff --git
a/openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/6594186e-c6bb-49d5-9f66-829e45599aaa/page-0001.png
b/openmeetings-db/src/test/resources/data/upload/files/6594186e-c6bb-49d5-9f66-829e45599aaa/page-0001.png
similarity index 100%
rename from
openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/6594186e-c6bb-49d5-9f66-829e45599aaa/page-0001.png
rename to
openmeetings-db/src/test/resources/data/upload/files/6594186e-c6bb-49d5-9f66-829e45599aaa/page-0001.png
diff --git
a/openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx
b/openmeetings-db/src/test/resources/data/upload/files/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx
similarity index 100%
rename from
openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx
rename to
openmeetings-db/src/test/resources/data/upload/files/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx
diff --git
a/openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/d44ab2c5-fd5d-4903-8fa7-292286d72a5f.pdf
b/openmeetings-db/src/test/resources/data/upload/files/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/d44ab2c5-fd5d-4903-8fa7-292286d72a5f.pdf
similarity index 100%
rename from
openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/d44ab2c5-fd5d-4903-8fa7-292286d72a5f.pdf
rename to
openmeetings-db/src/test/resources/data/upload/files/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/d44ab2c5-fd5d-4903-8fa7-292286d72a5f.pdf
diff --git
a/openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/page-0000.png
b/openmeetings-db/src/test/resources/data/upload/files/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/page-0000.png
similarity index 100%
rename from
openmeetings-db/src/test/resources/org/apache/openmeetings/db/entity/file/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/page-0000.png
rename to
openmeetings-db/src/test/resources/data/upload/files/d44ab2c5-fd5d-4903-8fa7-292286d72a5f/page-0000.png
