This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit d9e9a2aed6b5b719b8a1e0eb05a31a54502eeba8 Author: Jürgen Weber <[email protected]> AuthorDate: Fri Oct 11 22:31:13 2024 +0200 remaining Tests work --- .../src/test/java/org/apache/wiki/api/ReleaseTest.java | 4 ++-- jspwiki-main/pom.xml | 15 ++++++++------- .../test/java/org/apache/wiki/auth/UserManagerTest.java | 3 --- .../org/apache/wiki/auth/user/XMLUserDatabaseTest.java | 1 - 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/ReleaseTest.java b/jspwiki-api/src/test/java/org/apache/wiki/api/ReleaseTest.java index 11d840944..50e2639c7 100644 --- a/jspwiki-api/src/test/java/org/apache/wiki/api/ReleaseTest.java +++ b/jspwiki-api/src/test/java/org/apache/wiki/api/ReleaseTest.java @@ -51,7 +51,7 @@ public class ReleaseTest { Assertions.assertFalse( Release.isNewerOrEqual( rel ) ); } - //@Test + @Test @Disabled public void testNewer6() { final String rel; @@ -102,7 +102,7 @@ public class ReleaseTest { Assertions.assertTrue( Release.isOlderOrEqual( rel ) ); } - // @Test + @Test @Disabled public void testOlder6() { final String rel; diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml index be722745b..50593802a 100644 --- a/jspwiki-main/pom.xml +++ b/jspwiki-main/pom.xml @@ -185,13 +185,6 @@ </dependency> -<dependency> - <groupId>jakarta.mail</groupId> - <artifactId>jakarta.mail-api</artifactId> - <scope>provided</scope> -</dependency> - - <dependency> <groupId>com.github.jbellis</groupId> <artifactId>jamm</artifactId> @@ -204,6 +197,14 @@ <scope>test</scope> </dependency> + + <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>jakarta.mail</artifactId> + <version>2.0.1</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java index 91f3b2835..a880365b2 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java @@ -100,7 +100,6 @@ public class UserManagerTest { } //@Test - @Disabled public void testSetRenamedUserProfile() throws Exception { // First, count the number of users, groups, and pages final int oldUserCount = m_db.getWikiNames().length; @@ -269,7 +268,6 @@ public class UserManagerTest { } @Test - @Disabled public void testSetUserProfile() throws Exception { // First, count the number of users in the db now. final int oldUserCount = m_db.getWikiNames().length; @@ -295,7 +293,6 @@ public class UserManagerTest { } @Test - @Disabled public void testSetUserProfileWithApproval() throws Exception { setUpWithWorkflow(); diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java index 03e255a63..3ea0fdd38 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java @@ -222,7 +222,6 @@ public class XMLUserDatabaseTest { } @Test - @Disabled public void testGetWikiNames() throws WikiSecurityException { // There are 8 test users in the database final Principal[] p = m_db.getWikiNames();
