You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ba...@apache.org on 2025/11/21 14:04:40 UTC
(jackrabbit) branch trunk updated: JCR-5196: Some test classes are not executed by default because they … (#309)
This is an automated email from the ASF dual-hosted git repository.
baedke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git
The following commit(s) were added to refs/heads/trunk by this push:
new 72e3ee74f JCR-5196: Some test classes are not executed by default because they … (#309)
72e3ee74f is described below
commit 72e3ee74f9d3242b04441b631547b299f803d95f
Author: mbaedke <ma...@gmail.com>
AuthorDate: Fri Nov 21 15:04:37 2025 +0100
JCR-5196: Some test classes are not executed by default because they … (#309)
Added test classes to the corresponding test suites.
Added failing tests and added them to the list of known issues.
---
jackrabbit-core/pom.xml | 5 +++++
.../java/org/apache/jackrabbit/api/TestAll.java | 1 +
.../org/apache/jackrabbit/core/AddMoveTest.java | 22 ++++++++++++++++++++--
.../java/org/apache/jackrabbit/core/MoveTest.java | 2 +-
.../java/org/apache/jackrabbit/core/TestAll.java | 8 ++++++++
.../apache/jackrabbit/core/cluster/TestAll.java | 1 +
.../org/apache/jackrabbit/core/config/TestAll.java | 1 +
.../org/apache/jackrabbit/core/data/TestAll.java | 1 +
.../integration/daily/DailyIntegrationTest.java | 8 ++++++++
.../apache/jackrabbit/core/nodetype/TestAll.java | 1 +
.../org/apache/jackrabbit/core/query/TestAll.java | 5 +++++
.../core/query/lucene/ComparableArrayTest.java | 3 ++-
.../jackrabbit/core/query/lucene/TestAll.java | 6 ++++++
.../core/security/authorization/acl/TestAll.java | 2 ++
.../jackrabbit/core/security/user/TestAll.java | 7 ++++++-
.../org/apache/jackrabbit/core/util/TestAll.java | 1 +
.../version/RemoveOrphanVersionHistoryTest.java | 2 +-
.../apache/jackrabbit/core/version/TestAll.java | 5 +++++
.../org/apache/jackrabbit/core/xml/TestAll.java | 1 +
.../apache/jackrabbit/test/AbstractJCRTest.java | 3 +--
jackrabbit-parent/pom.xml | 2 +-
21 files changed, 78 insertions(+), 9 deletions(-)
diff --git a/jackrabbit-core/pom.xml b/jackrabbit-core/pom.xml
index 8f0f99705..38e669989 100644
--- a/jackrabbit-core/pom.xml
+++ b/jackrabbit-core/pom.xml
@@ -116,6 +116,11 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testPathLiteral
org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral <!-- OAK-3265 -->
org.apache.jackrabbit.core.version.ModifyNonVersionableCheckedOutTest#testNonVersionableCheckedOut <!-- JCR-5007 -->
org.apache.jackrabbit.core.version.ModifyNonVersionableCheckedOutTest#testModifyNonVersionableNodeWithCheckedOutProperty <!-- JCR-5007 -->
+org.apache.jackrabbit.core.AddMoveTest#testTopLevelAddRemove <!-- JCR-5205 -->
+org.apache.jackrabbit.core.config.SecurityConfigTest#testInvalidConfig <!-- JCR-5206 -->
+org.apache.jackrabbit.core.nodetype.CyclicNodeTypeRegistrationTest <!-- JCR-5208 -->
+org.apache.jackrabbit.core.query.lucene.SearchIndexConsistencyCheckTest#testDoubleCheckStressTest <!-- JCR-5209 -->
+org.apache.jackrabbit.core.version.RemoveAndAddVersionLabelXATest#testVersionLabel <!-- JCR-5210 -->
</value>
</property>
<property>
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/TestAll.java
index 3cf1e6e6d..795d12449 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/TestAll.java
@@ -37,6 +37,7 @@ public class TestAll extends AbstractJCRTest {
suite.addTestSuite(JackrabbitNodeTest.class);
suite.addTestSuite(JackrabbitObservationManagerTest.class);
+ suite.addTestSuite(JackrabbitSessionTest.class);
return suite;
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/AddMoveTest.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/AddMoveTest.java
old mode 100644
new mode 100755
index db367258c..424a48dd4
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/AddMoveTest.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/AddMoveTest.java
@@ -81,12 +81,30 @@ public class AddMoveTest extends AbstractJCRTest {
/**
* Add a top level node and remove it. Exposes a bug in the {@code CachingHierarchyManager},
* reported in JCR-3368.
+ * Also exposes a bug reported in JCR-5205.
*/
public void testTopLevelAddRemove() throws Exception {
Session session = getHelper().getReadWriteSession();
- session.getRootNode().addNode("foo").addNode("bar");
+ Node rootNode = session.getRootNode();
+ Node foo = rootNode.addNode("foo");
+ //JCR-5205: note that the test doesn't fail if we add the following line
+ //foo = rootNode.getNode("foo");
+ foo.addNode("bar");
session.save();
- session.getNode("/foo").remove();
+ session.getNode("/foo").remove(); //JCR-5205: note that the test doesn't fail if we replace this line with the following
+ //foo.remove();
assertFalse(session.getRootNode().hasNode("foo/bar"));
}
+
+ public void testSecondLevelAddRemove() throws Exception {
+ Session session = getHelper().getReadWriteSession();
+ Node rootNode = session.getRootNode();
+ Node parent = rootNode.addNode("parent");
+ Node foo = parent.addNode("foo");
+ foo.addNode("bar");
+ session.save();
+ session.getNode("/parent/foo").remove();
+ assertFalse(session.getRootNode().hasNode("parent/foo/bar"));
+ }
+
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveTest.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveTest.java
old mode 100644
new mode 100755
index 6d39a275f..51e8d7ce8
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveTest.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveTest.java
@@ -36,7 +36,7 @@ public class MoveTest extends AbstractJCRTest {
Session session2 = getHelper().getReadWriteSession();
if (session1.itemExists("/foo")) {
- session1.removeItem("/foo");
+ session1.getNode("/foo").remove();
session1.save();
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
index ef5ca389d..28713f1dc 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
@@ -83,6 +83,14 @@ public class TestAll extends TestCase {
suite.addTestSuite(RemoveAddNodeWithUUIDTest.class);
suite.addTestSuite(MoveAtRootTest.class);
+ suite.addTestSuite(RepositoryCopierTest.class);
+ suite.addTestSuite(ReadWhileSaveTest.class);
+ suite.addTestSuite(MoveRemoveTest.class);
+ suite.addTestSuite(LockedWrapperTest.class);
+ suite.addTestSuite(MoveTest.class);
+ suite.addTestSuite(MoveAtRootTest.class);
+ suite.addTestSuite(AddMoveTest.class);
+
return suite;
}
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/TestAll.java
index 70538ff5f..cb1ed62d9 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/TestAll.java
@@ -39,6 +39,7 @@ public class TestAll extends TestCase {
suite.addTestSuite(ClusterRecordTest.class);
suite.addTestSuite(ClusterSyncTest.class);
+ suite.addTestSuite(ClusterDescriptorTest.class);
suite.addTestSuite(DbClusterTest.class);
suite.addTestSuite(DbClusterTestJCR3162.class);
suite.addTestSuite(FailUpdateOnJournalExceptionTest.class);
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/TestAll.java
index 27bee4dd4..7cc70cf64 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/TestAll.java
@@ -40,6 +40,7 @@ public class TestAll extends TestCase {
suite.addTestSuite(RepositoryConfigTest.class);
suite.addTestSuite(WorkspaceConfigTest.class);
suite.addTestSuite(DataSourceConfigTest.class);
+ suite.addTestSuite(SecurityConfigTest.class);
return suite;
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TestAll.java
index 8ac2b9f0d..a1ac39129 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TestAll.java
@@ -51,6 +51,7 @@ public class TestAll extends TestCase {
suite.addTestSuite(TestTwoGetStreams.class);
suite.addTestSuite(WriteWhileReadingTest.class);
suite.addTestSuite(GCSubtreeMoveTest.class);
+ suite.addTestSuite(ConsistencyCheckerImplTest.class);
return suite;
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/daily/DailyIntegrationTest.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/daily/DailyIntegrationTest.java
index d07a7d543..560be7beb 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/daily/DailyIntegrationTest.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/daily/DailyIntegrationTest.java
@@ -22,6 +22,8 @@ import junit.framework.TestSuite;
import org.apache.jackrabbit.core.ConcurrencyTest;
import org.apache.jackrabbit.core.ConcurrentAddMoveRemoveTest;
import org.apache.jackrabbit.core.ConcurrentCheckinMixedTransactionTest;
+import org.apache.jackrabbit.core.ConcurrentCyclicMoveTest;
+import org.apache.jackrabbit.core.ConcurrentImportTest;
import org.apache.jackrabbit.core.ConcurrentLoginTest;
import org.apache.jackrabbit.core.ConcurrentNodeModificationTest;
import org.apache.jackrabbit.core.ConcurrentReadWriteTest;
@@ -30,6 +32,8 @@ import org.apache.jackrabbit.core.ConcurrentVersioningTest;
import org.apache.jackrabbit.core.ConcurrentVersioningWithTransactionsTest;
import org.apache.jackrabbit.core.LockTest;
import org.apache.jackrabbit.core.ReadVersionsWhileModified;
+import org.apache.jackrabbit.core.cache.ConcurrentCacheTest;
+import org.apache.jackrabbit.core.cache.GrowingLRUMapTest;
import org.apache.jackrabbit.core.integration.ConcurrentQueriesWithUpdatesTest;
import org.apache.jackrabbit.core.query.lucene.LargeResultSetTest;
import org.apache.jackrabbit.core.lock.ConcurrentLockingTest;
@@ -62,6 +66,10 @@ public class DailyIntegrationTest extends TestCase {
suite.addTestSuite(ConcurrentLockingWithTransactionsTest.class);
suite.addTestSuite(LargeResultSetTest.class);
suite.addTestSuite(ConcurrentQueriesWithUpdatesTest.class);
+ suite.addTestSuite(ConcurrentImportTest.class);
+ suite.addTestSuite(ConcurrentCyclicMoveTest.class);
+ suite.addTestSuite(ConcurrentCacheTest.class);
+ suite.addTestSuite(GrowingLRUMapTest.class);
return suite;
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/TestAll.java
index 043855b63..42f4994a4 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/TestAll.java
@@ -37,6 +37,7 @@ public class TestAll extends TestCase {
suite.addTestSuite(NodeTypesInContentTest.class);
suite.addTestSuite(MixinTest.class);
+ suite.addTestSuite(CyclicNodeTypeRegistrationTest.class);
return suite;
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/TestAll.java
index aa1b6af5a..5791815b0 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/TestAll.java
@@ -69,6 +69,11 @@ public class TestAll extends TestCase {
suite.addTestSuite(SQL2OrderByTest.class);
suite.addTestSuite(DescendantSelfAxisTest.class);
+ suite.addTestSuite(TextExtractorTest.class);
+ suite.addTestSuite(SQL2TooManyClausesTest.class);
+ suite.addTestSuite(QueryExtensionsTest.class);
+ suite.addTestSuite(LazyResultSetQueryTest.class);
+
return suite;
}
}
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 368bad8fa..f3229d004 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
@@ -21,9 +21,10 @@ import static org.junit.Assert.assertEquals;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.core.query.lucene.SharedFieldCache.ComparableArray;
+import org.apache.jackrabbit.test.JUnitTest;
import org.junit.Test;
-public class ComparableArrayTest {
+public class ComparableArrayTest extends JUnitTest {
/**
* Test for JCR-2906 to make sure the SharedFieldCache arranges the entries
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/TestAll.java
index fffd285b1..f0a942dbd 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/TestAll.java
@@ -54,6 +54,12 @@ public class TestAll extends TestCase {
suite.addTestSuite(IndexFormatVersionTest.class);
suite.addTestSuite(SynonymProviderTest.class);
+ suite.addTestSuite(UtilTest.class);
+ suite.addTestSuite(SearchIndexTest.class);
+ suite.addTestSuite(IDFieldTest.class);
+ suite.addTestSuite(ComparableArrayTest.class);
+ suite.addTestSuite(SearchIndexConsistencyCheckTest.class);
+
return suite;
}
}
\ No newline at end of file
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/TestAll.java
index fcf16c39b..169ed1f8a 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/TestAll.java
@@ -54,6 +54,8 @@ public class TestAll extends TestCase {
suite.addTestSuite(MoveTest.class);
suite.addTestSuite(RestrictionTest.class);
+ suite.addTestSuite(ReadNodeTypeTest.class);
+
return suite;
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/TestAll.java
index f1dc824a9..d9e0c18d9 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/TestAll.java
@@ -52,9 +52,14 @@ public class TestAll extends TestCase {
suite.addTestSuite(UserImporterTest.class);
suite.addTestSuite(UserAccessControlProviderTest.class);
- suite.addTestSuite(DefaultPrincipalProviderTest.class);
+ suite.addTestSuite(DefaultPrincipalProviderTest.class);
suite.addTestSuite(PasswordUtilityTest.class);
+
+//TODO comsume time and memory
+// suite.addTestSuite(MembershipCacheTest.class);
+// suite.addTestSuite(MembershipCachePerfTest.class);
+
return suite;
}
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/TestAll.java
index 45f5adff4..03916ff42 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/TestAll.java
@@ -34,6 +34,7 @@ public class TestAll extends TestCase {
TestSuite suite = new TestSuite("Utility tests");
suite.addTestSuite(RepositoryLockTest.class);
suite.addTestSuite(CooperativeFileLockTest.class);
+ suite.addTestSuite(DOMWalkerTest.class);
return suite;
}
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RemoveOrphanVersionHistoryTest.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RemoveOrphanVersionHistoryTest.java
index 6b94b0957..aa43c292a 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RemoveOrphanVersionHistoryTest.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RemoveOrphanVersionHistoryTest.java
@@ -93,7 +93,7 @@ public class RemoveOrphanVersionHistoryTest extends AbstractJCRTest {
n.checkout();
Workspace defaultWorkspace = n.getSession().getWorkspace();
- Session otherWsSession = n.getSession().getRepository().login(new SimpleCredentials("superuser", "".toCharArray()), workspaceName);
+ Session otherWsSession = getHelper().getSuperuserSession(workspaceName);
// Clone the node in another workspace
otherWsSession.getWorkspace().clone(defaultWorkspace.getName(), n.getPath(), n.getPath(), false);
Node otherWsRootNode = otherWsSession.getRootNode();
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
index 60fed324a..937ebc773 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
@@ -40,6 +40,11 @@ public class TestAll extends TestCase {
suite.addTestSuite(RestoreNodeWithSNSTest.class);
suite.addTestSuite(VersionIteratorImplTest.class);
suite.addTestSuite(ModifyNonVersionableCheckedOutTest.class);
+
+ suite.addTestSuite(RemoveVersionTest.class);
+ suite.addTestSuite(RemoveOrphanVersionHistoryTest.class);
+ suite.addTestSuite(RemoveAndAddVersionLabelXATest.class);
+
return suite;
}
}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/xml/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/xml/TestAll.java
index bbf1b4f7c..1a6b531db 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/xml/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/xml/TestAll.java
@@ -35,6 +35,7 @@ public class TestAll extends TestCase {
TestSuite suite = new TestSuite("XML format test cases");
suite.addTestSuite(DocumentViewTest.class);
suite.addTestSuite(AccessControlImporterTest.class);
+ suite.addTestSuite(WorkspaceImporterTest.class);
return suite;
}
diff --git a/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java b/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
index 5cc117146..f3227e4e2 100644
--- a/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
+++ b/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
@@ -32,7 +32,6 @@ import javax.jcr.Value;
import javax.jcr.ValueFactory;
import javax.jcr.nodetype.NoSuchNodeTypeException;
import javax.jcr.nodetype.NodeDefinition;
-import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.PropertyDefinition;
import javax.jcr.retention.RetentionManager;
@@ -897,7 +896,7 @@ public abstract class AbstractJCRTest extends JUnitTest {
// try to remove child
try {
child.remove();
- } catch (ConstraintViolationException e) {
+ } catch (RepositoryException e) {
log.println("unable to remove node: " + child.getPath());
}
}
diff --git a/jackrabbit-parent/pom.xml b/jackrabbit-parent/pom.xml
index 51b2a2735..1ccd6bc78 100644
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -51,7 +51,7 @@
</scm>
<properties>
- <test.opts.memory>-Xmx256m</test.opts.memory>
+ <test.opts.memory>-Xmx4g</test.opts.memory>
<test.opts.modules />
<test.opts>${test.opts.modules} ${test.opts.coverage} ${test.opts.memory} -enableassertions</test.opts>
<!-- OAK version used in components that *implement* oak-jackrabbit-api -->