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 2022/12/06 19:26:24 UTC

svn commit: r1905807 - in /jackrabbit/branches/2.20: ./ jackrabbit-jcr2spi/pom.xml jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/hierarchy/ jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/hierarchy/LinkedEntriesTest.java

Author: reschke
Date: Tue Dec  6 19:26:24 2022
New Revision: 1905807

URL: http://svn.apache.org/viewvc?rev=1905807&view=rev
Log:
JCR-4859: jcr2spi: add test coverage for LinkedEntries (merged r1904762 and r1904801 into 2.20)

Added:
    jackrabbit/branches/2.20/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/hierarchy/
      - copied from r1904762, jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/hierarchy/
Modified:
    jackrabbit/branches/2.20/   (props changed)
    jackrabbit/branches/2.20/jackrabbit-jcr2spi/pom.xml
    jackrabbit/branches/2.20/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/hierarchy/LinkedEntriesTest.java

Propchange: jackrabbit/branches/2.20/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1904762,1904801

Modified: jackrabbit/branches/2.20/jackrabbit-jcr2spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jcr2spi/pom.xml?rev=1905807&r1=1905806&r2=1905807&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-jcr2spi/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-jcr2spi/pom.xml Tue Dec  6 19:26:24 2022
@@ -147,6 +147,11 @@
       <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>    
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

Modified: jackrabbit/branches/2.20/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/hierarchy/LinkedEntriesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/hierarchy/LinkedEntriesTest.java?rev=1905807&r1=1904762&r2=1905807&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/hierarchy/LinkedEntriesTest.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/hierarchy/LinkedEntriesTest.java Tue Dec  6 19:26:24 2022
@@ -18,50 +18,21 @@ package org.apache.jackrabbit.jcr2spi.hi
 
 import static org.mockito.Mockito.mock;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.ConcurrentModificationException;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
+import java.util.Iterator;
 
 import junit.framework.TestCase;
 
 public class LinkedEntriesTest extends TestCase {
 
-    public void testConccurentModification() throws Throwable {
+    public void testLinkedEntries() {
+        LinkedEntries linkedEntries = new LinkedEntries(null, null);
+        Iterator<LinkedEntries.LinkNode> it = linkedEntries.linkNodeIterator();
+        linkedEntries.add(mock(NodeEntry.class), 0);
         try {
-            internalTestConcurrentModification();
+            it.next();
             fail("ConcurrentModificationException expected");
         } catch (ConcurrentModificationException expected) {
         }
     }
-
-    private void internalTestConcurrentModification() throws Throwable {
-        ExecutorService executorService = null;
-        try {
-            executorService = Executors.newFixedThreadPool(100);
-
-            LinkedEntries entries = new LinkedEntries(null, null);
-            Collection<Callable<Object>> futures = new ArrayList<>();
-            for (int i = 0; i < 10000; i++) {
-                NodeEntry nodeEntry = mock(NodeEntry.class);
-                futures.add(() -> entries.getLinkNode(nodeEntry));
-                futures.add(() -> {
-                    entries.add(nodeEntry);
-                    return null;
-                });
-            }
-            for (Future<?> future : executorService.invokeAll(futures)) {
-                try {
-                    future.get();
-                } catch (Exception e) {
-                    throw e.getCause();
-                }
-            }
-        } finally {
-            executorService.shutdown();
-        }
-    }
 }