Skip to content

Conversation

sratz
Copy link
Member

@sratz sratz commented Sep 15, 2025

  • PreferencesServiceTest is not deterministic but its behavior changes depending on the presence of downstream plug-in org.eclipse.core.resources. Take this into account.

  • IResourceTest should not depend on downstream plug-in org.eclipse.ui.ide (even inside a downstream repository). Use a different (upstream) filter provider in the unit test instead.

These downstream plug-ins are currently only visible because Tycho adds the full-blown UI test harness to the target platform unconditionally, even if there is no such actual dependency [1]. This is a cleanup in preparation for [2].

[1] eclipse-tycho/tycho#5349
[2] eclipse-tycho/tycho#5362

@sratz sratz requested a review from laeubi September 15, 2025 16:18
@eclipse-platform-bot
Copy link
Contributor

eclipse-platform-bot commented Sep 15, 2025

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
resources/tests/org.eclipse.core.tests.resources/pom.xml
runtime/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch
From f1102c5cc7f6a7dedded44f5ba7d0e8f55e26ca4 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <platform-bot@eclipse.org>
Date: Mon, 15 Sep 2025 17:08:49 +0000
Subject: [PATCH] Version bump(s) for 4.38 stream


diff --git a/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF b/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
index daa4f6ff8e..794aacbe65 100644
--- a/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
+++ b/resources/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Core Tests Resources
 Bundle-SymbolicName: org.eclipse.core.tests.resources; singleton:=true
-Bundle-Version: 3.11.1000.qualifier
+Bundle-Version: 3.11.1100.qualifier
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.core.tests.filesystem,
  org.eclipse.core.tests.internal.alias,
diff --git a/resources/tests/org.eclipse.core.tests.resources/pom.xml b/resources/tests/org.eclipse.core.tests.resources/pom.xml
index 5339e90b32..93c5a9d2d4 100644
--- a/resources/tests/org.eclipse.core.tests.resources/pom.xml
+++ b/resources/tests/org.eclipse.core.tests.resources/pom.xml
@@ -18,7 +18,7 @@
     <version>4.38.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.core.tests.resources</artifactId>
-  <version>3.11.1000-SNAPSHOT</version>
+  <version>3.11.1100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/runtime/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
index da68ce8187..31efec7567 100644
--- a/runtime/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
+++ b/runtime/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Core Tests Runtime
 Bundle-SymbolicName: org.eclipse.core.tests.runtime; singleton:=true
-Bundle-Version: 3.21.700.qualifier
+Bundle-Version: 3.21.800.qualifier
 Bundle-Activator: org.eclipse.core.tests.runtime.RuntimeTestsPlugin
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.core.tests.internal.preferences,
-- 
2.51.0

Further information are available in Common Build Issues - Missing version increments.

Comment on lines 1104 to 1105
String MULTI_FILT_ID = "org.eclipse.core.resources.regexFilterMatcher";
String FILT_ARG = "foo.*";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I must confess I don't understand what this actually does and where it is needed in the test but would trust your analysis here and it looks much more understandable than the previous version.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the test basically just wants any <filteredResources><filter>... in the .project metadata. And we should use one here that is actually known here (or upstream) :)

* PreferencesServiceTest is not deterministic but its behavior changes
  depending on the presence of downstream plug-in
  org.eclipse.core.resources. Take this into account.

* IResourceTest should not depend on downstream plug-in
  org.eclipse.ui.ide (even inside a downstream repository).
  Use a different (upstream) filter provider in the unit test instead.

These downstream plug-ins are currently only visible because Tycho adds
the full-blown UI test harness to the target platform unconditionally,
even if there is no such actual dependency [1]. This is a cleanup in
preparation for [2].

[1] eclipse-tycho/tycho#5349
[2] eclipse-tycho/tycho#5362
@sratz sratz force-pushed the test-fixes-downstream-deps branch from 58e6c5b to 6b340ef Compare September 15, 2025 17:04
Copy link
Contributor

Test Results

 1 947 files  ±0   1 947 suites  ±0   1h 30m 59s ⏱️ + 3m 51s
 4 720 tests ±0   4 696 ✅ ±0   24 💤 ±0  0 ❌ ±0 
14 160 runs  ±0  13 993 ✅ ±0  167 💤 ±0  0 ❌ ±0 

Results for commit 1e97357. ± Comparison against base commit a6bd13c.

@laeubi laeubi merged commit 4daea03 into eclipse-platform:master Sep 16, 2025
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants