[openmeetings] branch master updated: [OPENMEETINGS-2044] 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 110701f  [OPENMEETINGS-2044] tests should be fixed
110701f is described below

commit 110701f1ee6df7c77dc7e74b8dd83c49024a0e41
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Mon Apr 22 23:28:16 2019 +0700

    [OPENMEETINGS-2044] tests should be fixed
---
 .../src/test/java/org/apache/openmeetings/cli/TestAdmin.java     | 9 ++++-----
 .../apache/openmeetings/webservice/AbstractWebServiceTest.java   | 7 +++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java 
b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
index 12b6711..72d803e 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.cli;
 
-import static org.apache.commons.io.FileUtils.deleteDirectory;
 import static org.apache.openmeetings.AbstractJUnitDefaults.adminUsername;
 import static org.apache.openmeetings.AbstractJUnitDefaults.email;
 import static org.apache.openmeetings.AbstractJUnitDefaults.group;
@@ -48,14 +47,15 @@ import org.apache.wicket.protocol.http.WebApplication;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class TestAdmin {
-       private File tempFolder;
+       @TempDir
+       File tempFolder;
 
        @BeforeEach
        public void setUp() throws IOException {
                setOmHome();
-               tempFolder = Files.createTempDirectory("omtempdb").toFile();
                System.setProperty("user.dir", tempFolder.getCanonicalPath());
                System.setProperty(OM_HOME, getOmHome().getCanonicalPath());
                setDerbyHome(tempFolder);
@@ -63,10 +63,9 @@ public class TestAdmin {
        }
 
        @AfterEach
-       public void tearDown() throws IOException {
+       public void tearDown() {
                resetDerbyHome();
                System.getProperties().remove(OM_HOME);
-               deleteDirectory(tempFolder);
                WebApplication app = 
(WebApplication)Application.get(getWicketApplicationName());
                if (app != null) {
                        destroyApplication();
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
index cada04b..2ec184c 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
@@ -26,6 +26,8 @@ import static 
org.apache.openmeetings.AbstractJUnitDefaults.soapUsername;
 import static org.apache.openmeetings.AbstractJUnitDefaults.userpass;
 import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
 import static org.apache.openmeetings.util.OmFileHelper.getOmHome;
+import static 
org.apache.openmeetings.web.pages.install.TestInstall.resetDerbyHome;
+import static 
org.apache.openmeetings.web.pages.install.TestInstall.setDerbyHome;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -62,6 +64,7 @@ import 
org.apache.openmeetings.webservice.util.AppointmentMessageBodyReader;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.io.TempDir;
 
 public class AbstractWebServiceTest {
        private static Tomcat tomcat;
@@ -73,6 +76,8 @@ public class AbstractWebServiceTest {
        private static final String FILE_SERVICE_MOUNT = "file";
        public static final String UNIT_TEST_EXT_TYPE = "om_unit_tests";
        public static final long TIMEOUT = 5 * 60 * 1000;
+       @TempDir
+       static File tempFolder;
 
        protected static <T> T getBean(Class<T> clazz) {
                return ensureApplication().getBean(clazz);
@@ -106,6 +111,7 @@ public class AbstractWebServiceTest {
        @BeforeAll
        public static void initialize() throws Exception {
                AbstractSpringTest.init();
+               setDerbyHome(tempFolder);
                tomcat = new Tomcat();
                Connector connector = new Connector("HTTP/1.1");
                connector.setAttribute("address", 
InetAddress.getByName(HOST).getHostAddress());
@@ -136,6 +142,7 @@ public class AbstractWebServiceTest {
                        }
                        tomcat.destroy();
                }
+               resetDerbyHome();
        }
 
        protected static CallResult<RoomDTO> createAndValidate(RoomDTO r) {