From 642427832cd9135378f108120063ba23c19a1c6b Mon Sep 17 00:00:00 2001 From: Manfred Baedke Date: Tue, 11 Nov 2025 12:21:57 +0100 Subject: [PATCH 1/4] JCR-5196: Some test classes are not executed by default because they haven't been added to a test suite Added test classes to the corresponding test suites. --- .../src/test/java/org/apache/jackrabbit/api/TestAll.java | 1 + .../test/java/org/apache/jackrabbit/core/TestAll.java | 9 +++++++++ .../java/org/apache/jackrabbit/core/cluster/TestAll.java | 1 + .../java/org/apache/jackrabbit/core/config/TestAll.java | 3 +++ .../java/org/apache/jackrabbit/core/data/TestAll.java | 1 + .../core/integration/daily/DailyIntegrationTest.java | 8 ++++++++ .../org/apache/jackrabbit/core/nodetype/TestAll.java | 3 +++ .../java/org/apache/jackrabbit/core/query/TestAll.java | 5 +++++ .../core/query/lucene/ComparableArrayTest.java | 3 ++- .../org/apache/jackrabbit/core/query/lucene/TestAll.java | 8 ++++++++ .../core/security/authorization/acl/TestAll.java | 2 ++ .../apache/jackrabbit/core/security/user/TestAll.java | 7 ++++++- .../java/org/apache/jackrabbit/core/util/TestAll.java | 1 + .../java/org/apache/jackrabbit/core/version/TestAll.java | 7 +++++++ .../java/org/apache/jackrabbit/core/xml/TestAll.java | 1 + .../java/org/apache/jackrabbit/test/AbstractJCRTest.java | 2 +- jackrabbit-parent/pom.xml | 2 +- 17 files changed, 60 insertions(+), 4 deletions(-) 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 3cf1e6e6d93..795d1244998 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 static Test suite() { 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/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java index ef5ca389d4c..f1ec4eed1e5 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,15 @@ public static Test suite() { suite.addTestSuite(RemoveAddNodeWithUUIDTest.class); suite.addTestSuite(MoveAtRootTest.class); + suite.addTestSuite(RepositoryCopierTest.class); + suite.addTestSuite(ReadWhileSaveTest.class); + suite.addTestSuite(MoveRemoveTest.class); + +//TODO? see JCR-5196 +// suite.addTestSuite(LockedWrapperTest.class); +// suite.addTestSuite(MoveTest.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 70538ff5f51..cb1ed62d90c 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 static Test suite() { 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 27bee4dd4b3..ff25f4da3f0 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 @@ -41,6 +41,9 @@ public static Test suite() { suite.addTestSuite(WorkspaceConfigTest.class); suite.addTestSuite(DataSourceConfigTest.class); +//TODO? see JCR-5196 +// 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 8ac2b9f0d76..a1ac39129b6 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 static Test suite() { 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 d07a7d54324..560be7beb16 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 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.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 static Test suite() { 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 043855b6349..e6059f29433 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 @@ -38,6 +38,9 @@ public static Test suite() { suite.addTestSuite(NodeTypesInContentTest.class); suite.addTestSuite(MixinTest.class); +//TODO? see JCR-5196 +//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 aa1b6af5aa3..5791815b05e 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 static Test suite() { 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 368bad8fadd..f3229d004d2 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 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 fffd285b1c6..ec8530f89b3 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,14 @@ public static Test suite() { suite.addTestSuite(IndexFormatVersionTest.class); suite.addTestSuite(SynonymProviderTest.class); + suite.addTestSuite(UtilTest.class); + suite.addTestSuite(SearchIndexTest.class); + suite.addTestSuite(IDFieldTest.class); + suite.addTestSuite(ComparableArrayTest.class); + +//TODO? see JCR-5196 +// 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 fcf16c39bc7..169ed1f8a05 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 static Test suite() { 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 f1dc824a98b..d9e0c18d9e2 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 static Test suite() { 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 45f5adff4dd..03916ff421c 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 static Test suite() { 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/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java index 60fed324a2e..17cdbf4456f 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,13 @@ public static Test suite() { suite.addTestSuite(RestoreNodeWithSNSTest.class); suite.addTestSuite(VersionIteratorImplTest.class); suite.addTestSuite(ModifyNonVersionableCheckedOutTest.class); + + suite.addTestSuite(RemoveVersionTest.class); + +//TODO? see JCR-5196 +// 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 bbf1b4f7cd5..1a6b531db85 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 static Test suite() { 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 5cc11714610..c0c285465a4 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 @@ -897,7 +897,7 @@ protected Node cleanUpTestRoot(Session s) throws RepositoryException { // 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 0bd310022d3..a998c15b2e4 100644 --- a/jackrabbit-parent/pom.xml +++ b/jackrabbit-parent/pom.xml @@ -51,7 +51,7 @@ - -Xmx256m + -Xmx4g ${test.opts.modules} ${test.opts.coverage} ${test.opts.memory} -enableassertions From cf384be568ba8cbc8d8dd4957436496ef43df91e Mon Sep 17 00:00:00 2001 From: Manfred Baedke Date: Tue, 11 Nov 2025 13:58:51 +0100 Subject: [PATCH 2/4] JCR-5196: Some test classes are not executed by default because they haven't been added to a test suite Added more test classes.. --- .../src/test/java/org/apache/jackrabbit/core/TestAll.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f1ec4eed1e5..5df6a171f6e 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 @@ -86,10 +86,10 @@ public static Test suite() { suite.addTestSuite(RepositoryCopierTest.class); suite.addTestSuite(ReadWhileSaveTest.class); suite.addTestSuite(MoveRemoveTest.class); + suite.addTestSuite(LockedWrapperTest.class); + suite.addTestSuite(MoveTest.class); //TODO? see JCR-5196 -// suite.addTestSuite(LockedWrapperTest.class); -// suite.addTestSuite(MoveTest.class); // suite.addTestSuite(AddMoveTest.class); return suite; From 220a3cf14d5be9fa086451b3034a01ba535d086d Mon Sep 17 00:00:00 2001 From: Manfred Baedke Date: Wed, 12 Nov 2025 15:58:28 +0100 Subject: [PATCH 3/4] JCR-5196: Some test classes are not executed by default because they haven't been added to a test suite Added failing tests and added them to the list of known issues. --- jackrabbit-core/pom.xml | 5 +++++ .../apache/jackrabbit/core/AddMoveTest.java | 22 +++++++++++++++++-- .../org/apache/jackrabbit/core/MoveTest.java | 2 +- .../org/apache/jackrabbit/core/TestAll.java | 5 ++--- .../jackrabbit/core/config/TestAll.java | 4 +--- .../jackrabbit/core/nodetype/TestAll.java | 4 +--- .../jackrabbit/core/query/lucene/TestAll.java | 4 +--- .../RemoveOrphanVersionHistoryTest.java | 2 +- .../jackrabbit/core/version/TestAll.java | 6 ++--- 9 files changed, 34 insertions(+), 20 deletions(-) mode change 100644 => 100755 jackrabbit-core/src/test/java/org/apache/jackrabbit/core/AddMoveTest.java mode change 100644 => 100755 jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveTest.java diff --git a/jackrabbit-core/pom.xml b/jackrabbit-core/pom.xml index 8f0f99705fe..38e66998930 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 org.apache.jackrabbit.core.version.ModifyNonVersionableCheckedOutTest#testNonVersionableCheckedOut org.apache.jackrabbit.core.version.ModifyNonVersionableCheckedOutTest#testModifyNonVersionableNodeWithCheckedOutProperty +org.apache.jackrabbit.core.AddMoveTest#testTopLevelAddRemove +org.apache.jackrabbit.core.config.SecurityConfigTest#testInvalidConfig +org.apache.jackrabbit.core.nodetype.CyclicNodeTypeRegistrationTest +org.apache.jackrabbit.core.query.lucene.SearchIndexConsistencyCheckTest#testDoubleCheckStressTest +org.apache.jackrabbit.core.version.RemoveAndAddVersionLabelXATest#testVersionLabel 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 db367258c86..424a48dd471 --- 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 void testTopLevelAddMove() throws Exception { /** * 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 6d39a275fc6..51e8d7ce8e7 --- 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 void testMoveVisibilityAcrossSessions() throws RepositoryException { 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 5df6a171f6e..28713f1dc49 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 @@ -88,9 +88,8 @@ public static Test suite() { suite.addTestSuite(MoveRemoveTest.class); suite.addTestSuite(LockedWrapperTest.class); suite.addTestSuite(MoveTest.class); - -//TODO? see JCR-5196 -// suite.addTestSuite(AddMoveTest.class); + suite.addTestSuite(MoveAtRootTest.class); + suite.addTestSuite(AddMoveTest.class); return suite; } 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 ff25f4da3f0..7cc70cf6456 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,9 +40,7 @@ public static Test suite() { suite.addTestSuite(RepositoryConfigTest.class); suite.addTestSuite(WorkspaceConfigTest.class); suite.addTestSuite(DataSourceConfigTest.class); - -//TODO? see JCR-5196 -// suite.addTestSuite(SecurityConfigTest.class); + suite.addTestSuite(SecurityConfigTest.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 e6059f29433..42f4994a45d 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,9 +37,7 @@ public static Test suite() { suite.addTestSuite(NodeTypesInContentTest.class); suite.addTestSuite(MixinTest.class); - -//TODO? see JCR-5196 -//suite.addTestSuite(CyclicNodeTypeRegistrationTest.class); + suite.addTestSuite(CyclicNodeTypeRegistrationTest.class); return suite; } 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 ec8530f89b3..f0a942dbdfa 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 @@ -58,9 +58,7 @@ public static Test suite() { suite.addTestSuite(SearchIndexTest.class); suite.addTestSuite(IDFieldTest.class); suite.addTestSuite(ComparableArrayTest.class); - -//TODO? see JCR-5196 -// suite.addTestSuite(SearchIndexConsistencyCheckTest.class); + suite.addTestSuite(SearchIndexConsistencyCheckTest.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 6b94b095757..aa43c292ae5 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 void testWorkspaceRemoveOrphanVersionHistory() throws RepositoryException 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 17cdbf4456f..937ebc7736c 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 @@ -42,10 +42,8 @@ public static Test suite() { suite.addTestSuite(ModifyNonVersionableCheckedOutTest.class); suite.addTestSuite(RemoveVersionTest.class); - -//TODO? see JCR-5196 -// suite.addTestSuite(RemoveOrphanVersionHistoryTest.class); -// suite.addTestSuite(RemoveAndAddVersionLabelXATest.class); + suite.addTestSuite(RemoveOrphanVersionHistoryTest.class); + suite.addTestSuite(RemoveAndAddVersionLabelXATest.class); return suite; } From 5130210c9111d42b8d7dafd3d67eb813754b65c3 Mon Sep 17 00:00:00 2001 From: Manfred Baedke Date: Fri, 21 Nov 2025 13:51:18 +0100 Subject: [PATCH 4/4] JCR-5196: Some test classes are not executed by default because they haven't been added to a test suite Removed unused import. --- .../main/java/org/apache/jackrabbit/test/AbstractJCRTest.java | 1 - 1 file changed, 1 deletion(-) 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 c0c285465a4..f3227e4e2cb 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.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;