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 329380f [OPENMEETINGS-2044] more tests are moved to junit5
329380f is described below
commit 329380fbb67a99a5159f79ab0e9ebf04d4e76b1a
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Apr 19 18:28:55 2019 +0700
[OPENMEETINGS-2044] more tests are moved to junit5
---
openmeetings-core/pom.xml | 6 ++++++
openmeetings-web/pom.xml | 6 ++++++
.../org/apache/openmeetings/web/pages/TestHashPage.java | 10 +++++-----
.../apache/openmeetings/web/pages/auth/TestLoginUI.java | 12 ++++++------
.../openmeetings/web/pages/install/TestInstall.java | 16 ++++++++--------
.../openmeetings/webservice/AbstractWebServiceTest.java | 3 +--
6 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 5c08152..2263c6b 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -108,6 +108,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency> <!-- temporary, powermock doesn't support junit5
-->
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 6cc8f1b..ce401b6 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -741,5 +741,11 @@
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
+ <dependency> <!-- temporary, DIRAPI doesn't support junit5 -->
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
index 48ff625..abac7bd 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
@@ -25,8 +25,8 @@ import static
org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH;
import static org.apache.openmeetings.web.pages.HashPage.PANEL_MAIN;
import static org.apache.openmeetings.web.pages.HashPage.PANEL_RECORDING;
import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Date;
import java.util.UUID;
@@ -48,7 +48,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.protocol.ws.util.tester.WebSocketTester;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.Strings;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +70,7 @@ public class TestHashPage extends AbstractWicketTester {
tester.startPage(HashPage.class, pp);
tester.assertRenderedPage(HashPage.class);
MessageDialog dlg =
(MessageDialog)tester.getComponentFromLastRenderedPage("access-denied");
- assertTrue("Access denied should be displayed",
((JQueryBehavior)dlg.getBehaviors().get(0)).getOption("autoOpen"));
+
assertTrue(((JQueryBehavior)dlg.getBehaviors().get(0)).getOption("autoOpen"),
"Access denied should be displayed");
tester.assertInvisible(PANEL_MAIN);
}
@@ -78,7 +78,7 @@ public class TestHashPage extends AbstractWicketTester {
HashPage page = tester.startPage(HashPage.class, pp);
tester.assertRenderedPage(HashPage.class);
MessageDialog dlg =
(MessageDialog)tester.getComponentFromLastRenderedPage("access-denied");
- assertFalse("Access denied should NOT be displayed",
((JQueryBehavior)dlg.getBehaviors().get(0)).getOption("autoOpen"));
+
assertFalse(((JQueryBehavior)dlg.getBehaviors().get(0)).getOption("autoOpen"),
"Access denied should NOT be displayed");
return page;
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
index 472bdd6..3faf838 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
@@ -21,10 +21,10 @@ package org.apache.openmeetings.web.pages.auth;
import static java.util.UUID.randomUUID;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VERIFICATION;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.lang.reflect.Method;
import java.util.List;
@@ -42,7 +42,7 @@ import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.util.tester.FormTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.googlecode.wicket.jquery.ui.widget.dialog.ButtonAjaxBehavior;
@@ -58,7 +58,7 @@ public class TestLoginUI extends AbstractWicketTester {
tester.assertNoErrorMessage();
tester.assertRenderedPage(MainPage.class);
WebSession ws = (WebSession)tester.getSession();
- assertTrue("Login should be successful", ws.isSignedIn());
+ assertTrue(ws.isSignedIn(), "Login should be successful");
}
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
index a2eaa97..5a1b857 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
@@ -31,9 +31,9 @@ import static
org.apache.openmeetings.AbstractWicketTester.getWicketTester;
import static
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_APP_NAME;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplicationName;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.File;
import java.io.IOException;
@@ -52,9 +52,9 @@ import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -98,7 +98,7 @@ public class TestInstall {
tempFolder = Files.createTempDirectory("omtempdb").toFile();
setDerbyHome(tempFolder);
tester = getWicketTester((Application)ensureApplication(-1L));
- assertNotNull("Web session should not be null",
WebSession.get());
+ assertNotNull(WebSession.get(), "Web session should not be
null");
Locale[] locales = Locale.getAvailableLocales();
tester.getSession().setLocale(locales[rnd.nextInt(locales.length)]);
log.info("Setup complete");
@@ -119,13 +119,13 @@ public class TestInstall {
InstallWizardPage page =
tester.startPage(InstallWizardPage.class);
tester.assertRenderedPage(InstallWizardPage.class);
InstallWizard wiz = (InstallWizard)page.get(WIZARD_PATH);
- assertNull("Model should be null",
wiz.getWizardModel().getActiveStep());
+ assertNull(wiz.getWizardModel().getActiveStep(), "Model should
be null");
tester.executeBehavior((AbstractAjaxBehavior)page.getBehaviorById(0));
//welcome step
- assertNotNull("Model should NOT be null",
wiz.getWizardModel().getActiveStep());
+ assertNotNull(wiz.getWizardModel().getActiveStep(), "Model
should NOT be null");
ButtonAjaxBehavior prev = getButtonBehavior(tester,
WIZARD_PATH, "PREV");
//check enabled, add check for other buttons on other steps
- assertFalse("Prev button should be disabled",
prev.getButton().isEnabled());
+ assertFalse(prev.getButton().isEnabled(), "Prev button should
be disabled");
ButtonAjaxBehavior next = getButtonBehavior(tester,
WIZARD_PATH, "NEXT");
ButtonAjaxBehavior finish = getButtonBehavior(tester,
WIZARD_PATH, SUBMIT);
tester.executeBehavior(next); //DB step
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 0d0290c..cada04b 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
@@ -59,7 +59,6 @@ import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.webservice.util.AppointmentMessageBodyReader;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -176,7 +175,7 @@ public class AbstractWebServiceTest {
.query("sid", r.getMessage())
.type(APPLICATION_FORM_URLENCODED)
.post(new Form().param("user",
dto.toString()).param("confirm", "" + false), UserDTO.class);
- Assert.assertNotNull(user.getId());
+ assertNotNull(user.getId());
u.setId(user.getId());
}
