You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2024/07/19 13:46:30 UTC
(jackrabbit) 01/01: JCR-5089: avoid use of deprecated junit.framework.Assert
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch JCR-5089
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git
commit f3ca5871c11f877f997e5b0e15df43c3bfd607c4
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Jul 19 14:46:14 2024 +0100
JCR-5089: avoid use of deprecated junit.framework.Assert
---
.../org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java | 3 +--
.../apache/jackrabbit/core/query/lucene/ComparableArrayTest.java | 2 +-
.../java/org/apache/jackrabbit/test/api/SysViewContentHandler.java | 3 +--
.../main/java/org/apache/jackrabbit/test/api/TreeComparator.java | 6 ++++--
.../authorization/jackrabbit/acl/AccessControlListImplTest.java | 7 +++----
.../java/org/apache/jackrabbit/vfs/ext/ds/TestVFSDataStore.java | 3 +--
6 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java
index 93d36aeab..c80d8725b 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/DbClusterTestJCR3162.java
@@ -30,14 +30,13 @@ import javax.jcr.SimpleCredentials;
import javax.jcr.query.Query;
import javax.jcr.query.RowIterator;
-import junit.framework.Assert;
-
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.config.RepositoryConfig;
import org.apache.jackrabbit.test.JUnitTest;
+import org.junit.Assert;
/**
* Test for JCR3162
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/ComparableArrayTest.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/ComparableArrayTest.java
index 49507d6b7..368bad8fa 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/ComparableArrayTest.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/ComparableArrayTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import javax.jcr.RepositoryException;
diff --git a/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java b/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java
index ca3e88a1c..46af661ee 100644
--- a/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java
+++ b/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java
@@ -20,6 +20,7 @@ import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.junit.Assert;
import javax.jcr.nodetype.NodeType;
import javax.jcr.Session;
@@ -45,8 +46,6 @@ import java.util.Enumeration;
import java.util.Iterator;
import java.util.Map;
-import junit.framework.Assert;
-
/**
* ContentHandler implementation which checks if the system view export of
* a node tree is compliant to the specification.
diff --git a/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java b/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java
index 590819a68..0b8daba33 100644
--- a/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java
+++ b/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java
@@ -28,12 +28,14 @@ import javax.jcr.PropertyType;
import javax.jcr.Value;
import javax.jcr.PathNotFoundException;
import javax.jcr.nodetype.NodeTypeManager;
+
+import org.junit.Assert;
+
import javax.jcr.nodetype.NodeTypeIterator;
import javax.jcr.nodetype.NodeType;
import java.util.Calendar;
-import java.io.ByteArrayInputStream;
-import junit.framework.Assert;
+import java.io.ByteArrayInputStream;
/**
* <code>TreeComparator</code> compares two trees. This allows re-use for
diff --git a/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/security/authorization/jackrabbit/acl/AccessControlListImplTest.java b/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/security/authorization/jackrabbit/acl/AccessControlListImplTest.java
index 9c6a9789d..f0fe19ed5 100644
--- a/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/security/authorization/jackrabbit/acl/AccessControlListImplTest.java
+++ b/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/security/authorization/jackrabbit/acl/AccessControlListImplTest.java
@@ -28,7 +28,6 @@ import javax.jcr.security.AccessControlEntry;
import javax.jcr.security.AccessControlList;
import javax.jcr.security.Privilege;
-import junit.framework.Assert;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.QValueFactory;
@@ -36,6 +35,7 @@ import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.commons.value.QValueFactoryImpl;
import org.apache.jackrabbit.test.api.security.AbstractAccessControlTest;
+import org.junit.Assert;
/**
* Tests the functionality of the JCR AccessControlList API implementation. The
@@ -97,15 +97,14 @@ public class AccessControlListImplTest extends AbstractAccessControlTest {
// four different entries
Assert.assertEquals(4, acl.size());
-
+
// UnknownPrincipal entries
AccessControlEntry[] pentries = getEntries(acl, unknownPrincipal);
Assert.assertEquals(2, pentries.length);
-
+
// secondPrincipal entries
AccessControlEntry[] sentries = getEntries(acl, knownPrincipal);
Assert.assertEquals(2, sentries.length);
-
}
public void testMultipleEntryEffect() throws Exception {
diff --git a/jackrabbit-vfs-ext/src/test/java/org/apache/jackrabbit/vfs/ext/ds/TestVFSDataStore.java b/jackrabbit-vfs-ext/src/test/java/org/apache/jackrabbit/vfs/ext/ds/TestVFSDataStore.java
index c8c89d216..869223a31 100644
--- a/jackrabbit-vfs-ext/src/test/java/org/apache/jackrabbit/vfs/ext/ds/TestVFSDataStore.java
+++ b/jackrabbit-vfs-ext/src/test/java/org/apache/jackrabbit/vfs/ext/ds/TestVFSDataStore.java
@@ -32,14 +32,13 @@ import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder;
import org.apache.jackrabbit.core.data.CachingDataStore;
import org.apache.jackrabbit.core.data.TestCaseBase;
+import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
-import junit.framework.Assert;
-
/**
* Test {@link CachingDataStore} with VFSBackend with a VFS file system (local file system) by default.
* <P>