Skip to content

Fix and reenable ExpressionTests.testSubTypeTiming #2601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HeikoKlare wants to merge 2 commits into
base: master
Choose a base branch
from
+37 −26
Open

Fix and reenable ExpressionTests.testSubTypeTiming #2601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12c0886
Fix and reenable ExpressionTests.testSubTypeTiming
HeikoKlare Apr 1, 2026
880db67
Version bump(s) for 4.40 stream
eclipse-platform-bot Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions runtime/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.core.expressions.tests; singleton:=true
Bundle-Version: 3.7.700.qualifier
Bundle-Version: 3.7.800.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package:
Expand All @@ -13,7 +13,8 @@ Require-Bundle:
Import-Package: org.assertj.core.api,
org.junit.jupiter.api;version="[5.14.0,6.0.0)",
org.junit.jupiter.api.function;version="[5.14.0,6.0.0)",
org.junit.platform.suite.api;version="[1.14.0,2.0.0)"
org.junit.platform.suite.api;version="[1.14.0,2.0.0)",
org.mockito
Bundle-RequiredExecutionEnvironment: JavaSE-17
Eclipse-BundleShape: dir
Bundle-ActivationPolicy: lazy
Expand Down
58 changes: 34 additions & 24 deletions ...re.expressions.tests/src/org/eclipse/core/internal/expressions/tests/ExpressionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.fail;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.times;

import java.net.URL;
import java.util.AbstractCollection;
Expand All @@ -33,8 +32,9 @@
import java.util.LinkedList;
import java.util.List;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.osgi.framework.FrameworkUtil;

import org.w3c.dom.Document;
Expand Down Expand Up @@ -72,7 +72,13 @@
@SuppressWarnings("restriction")
public class ExpressionTests {

private static final int TYPE_ITERATIONS = 100000;
/**
* Used exclusively by {@link #testSubTypeTiming()} to provide a cache key type
* unique to this test, avoiding interference with other tests.
*/
private static class CachingTestSet extends HashSet<Object> {
private static final long serialVersionUID = 1L;
}

public static class CollectionWrapper {
public Collection<String> collection;
Expand Down Expand Up @@ -1014,28 +1020,32 @@ public void testSubType() throws Exception {
}

@Test
@Disabled("CI test environment too unstable for performance tests")
public void testSubTypeTiming() throws Exception {
HashSet<?> o1 = new HashSet<>();

System.gc();
long cachedStart= System.currentTimeMillis();
for (int i= 0; i < TYPE_ITERATIONS; i++) {
assertTrue(Expressions.isInstanceOf(o1, "java.util.Set"));
assertFalse(Expressions.isInstanceOf(o1, "java.util.List"));
CachingTestSet o = new CachingTestSet();

try (MockedStatic<Expressions> expressionsMock = Mockito.mockStatic(Expressions.class,
Mockito.CALLS_REAL_METHODS)) {
// First call (positive): cache miss — isSubtype must traverse the class
// hierarchy
assertThat(Expressions.isInstanceOf(o, "java.util.Set")).isTrue();
expressionsMock.verify(() -> Expressions.uncachedIsSubtype(CachingTestSet.class, "java.util.Set"),
times(1));
// Second call (positive): cache hit — uncachedIsSubtype must NOT be invoked
// again
assertThat(Expressions.isInstanceOf(o, "java.util.Set")).isTrue();
expressionsMock.verify(() -> Expressions.uncachedIsSubtype(CachingTestSet.class, "java.util.Set"),
times(1));
// First call (negative): cache miss — isSubtype must traverse the class
// hierarchy
assertThat(Expressions.isInstanceOf(o, "java.util.List")).isFalse();
expressionsMock.verify(() -> Expressions.uncachedIsSubtype(CachingTestSet.class, "java.util.List"),
times(1));
// Second call (negative): cache hit — uncachedIsSubtype must NOT be invoked
// again
assertThat(Expressions.isInstanceOf(o, "java.util.List")).isFalse();
expressionsMock.verify(() -> Expressions.uncachedIsSubtype(CachingTestSet.class, "java.util.List"),
times(1));
}
long cachedDelta= System.currentTimeMillis() - cachedStart;

System.gc();
long instanceStart= System.currentTimeMillis();
for (int i= 0; i < TYPE_ITERATIONS; i++) {
assertTrue(Expressions.uncachedIsSubtype(o1.getClass(), "java.util.Set"));
assertFalse(Expressions.uncachedIsSubtype(o1.getClass(), "java.util.List"));
}
long instanceDelta= System.currentTimeMillis() - instanceStart;

assertThat(cachedDelta).as("assert cachedDelta is less than instanceDelta" + instanceDelta)
.isLessThan(instanceDelta);
}

}
Loading