[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2080] tests should be fixed

[so...@apache.org]

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

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
     new b49d5df  [OPENMEETINGS-2080] tests should be fixed
b49d5df is described below

commit b49d5df3dd901c351054666e77d69b236f1a5ad7
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Jul 5 10:11:42 2019 +0700

    [OPENMEETINGS-2080] tests should be fixed
---
 .../java/org/apache/openmeetings/cli/TestPatcher.java     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
index f2bd703..41bea76 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
@@ -21,15 +21,19 @@ package org.apache.openmeetings.cli;
 import static org.apache.openmeetings.AbstractSpringTest.setOmHome;
 import static org.junit.Assert.assertEquals;
 
+import java.io.IOException;
 import java.util.TimeZone;
 
+import org.apache.openjpa.lib.util.Files;
 import org.apache.openmeetings.util.ConnectionProperties;
 import org.apache.openmeetings.util.ConnectionProperties.DbType;
+import org.apache.openmeetings.util.OmFileHelper;
 import org.apache.wicket.request.Url;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
 import org.apache.wicket.util.string.StringValue;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class TestPatcher {
@@ -39,8 +43,8 @@ public class TestPatcher {
 	private static final String USER = "myuser";
 	private static final String PASS = "mypass";
 
-	@Before
-	public void setUp() {
+	@BeforeClass
+	public static void setUp() {
 		setOmHome();
 	}
 
@@ -57,4 +61,9 @@ public class TestPatcher {
 			}
 		}
 	}
+
+	@AfterClass
+	public static void cleanup() throws IOException {
+		Files.copy(OmFileHelper.getPersistence(DbType.derby), OmFileHelper.getPersistence());
+	}
 }