mostly functional

Author: hmottestad

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbTxnContext.java

@@ -457,6 +457,7 @@ ChangeView snapshotChanges(boolean explicit) {
 
 	Set<Quad> snapshotDeprecated(boolean explicit) {
 		Set<Quad> deprecated = new LinkedHashSet<>(explicit ? deprecatedExplicit : deprecatedInferred);
+		applyPendingDeprecatedTo(deprecated, explicit);
 		return deprecated;
 	}
 

testsuites/sail/src/main/java/org/eclipse/rdf4j/testsuite/sail/SailConcurrencyTest.java

@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import java.util.Locale;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -39,6 +40,10 @@
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,6 +55,10 @@
 public abstract class SailConcurrencyTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(SailConcurrencyTest.class);
+	private static final String TIMED_OUT_KEY = "timedOutTest";
+
+	@RegisterExtension
+	static final TimeoutClassFailureWatcher TIMEOUT_CLASS_FAILURE_WATCHER = new TimeoutClassFailureWatcher();
 	/*-----------*
 	 * Constants *
 	 *-----------*/
@@ -90,6 +99,49 @@ public void tearDown() {
 		store.shutDown();
 	}
 
+	private static final class TimeoutClassFailureWatcher implements TestWatcher, BeforeEachCallback {
+
+		@Override
+		public void beforeEach(ExtensionContext context) {
+			AtomicReference<String> timedOut = getTimedOutRef(context);
+			String timedOutTest = timedOut.get();
+			if (timedOutTest != null) {
+				Assertions.fail("Previous test timed out (" + timedOutTest + "); failing remaining tests in class");
+			}
+		}
+
+		@Override
+		public void testFailed(ExtensionContext context, Throwable cause) {
+			if (isTimeout(cause)) {
+				getTimedOutRef(context).compareAndSet(null, context.getDisplayName());
+			}
+		}
+
+		private static AtomicReference<String> getTimedOutRef(ExtensionContext context) {
+			ExtensionContext.Namespace namespace = ExtensionContext.Namespace.create(SailConcurrencyTest.class,
+					context.getRequiredTestClass());
+			return context.getStore(namespace)
+					.getOrComputeIfAbsent(TIMED_OUT_KEY, key -> new AtomicReference<String>(),
+							AtomicReference.class);
+		}
+
+		private static boolean isTimeout(Throwable cause) {
+			Throwable current = cause;
+			while (current != null) {
+				if (current instanceof java.util.concurrent.TimeoutException
+						|| "org.junit.jupiter.api.TimeoutException".equals(current.getClass().getName())) {
+					return true;
+				}
+				String message = current.getMessage();
+				if (message != null && message.toLowerCase(Locale.ROOT).contains("timed out")) {
+					return true;
+				}
+				current = current.getCause();
+			}
+			return false;
+		}
+	}
+
 	protected class UploadTransaction implements Runnable {
 
 		private final IRI context;