Skip to content

Resources / Runtime tests: Do not depend on higher-level plug-ins. #2161

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

Merged
laeubi merged 2 commits into from
Sep 16, 2025
Merged

Resources / Runtime tests: Do not depend on higher-level plug-ins. #2161

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
6b340ef
Resources / Runtime tests: Do not depend on higher-level plug-ins.
sratz Sep 15, 2025
1e97357
Version bump(s) for 4.38 stream
eclipse-platform-bot Sep 15, 2025
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
2 changes: 1 addition & 1 deletion resources/tests/org.eclipse.core.tests.resources/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: 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,
Expand Down
2 changes: 1 addition & 1 deletion resources/tests/org.eclipse.core.tests.resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions .../org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,9 +1101,9 @@ private IProject createProject(boolean applyResFilter) throws CoreException {
sourceProj.open(createTestMonitor());
// create a new filter.
if (applyResFilter) {
String MULTI_FILT_ID = "org.eclipse.ui.ide.multiFilter";
String FILT_ARG = "1.0-length-equals-false-false-10485760";
FileInfoMatcherDescription filterDesc = new FileInfoMatcherDescription(MULTI_FILT_ID, FILT_ARG);
String filterProviderId = "org.eclipse.core.resources.regexFilterMatcher";
String filterArguments = "foo.*";
FileInfoMatcherDescription filterDesc = new FileInfoMatcherDescription(filterProviderId, filterArguments);
int EXCL_FILE_GT = IResourceFilterDescription.EXCLUDE_ALL + IResourceFilterDescription.FILES
+ IResourceFilterDescription.INHERITABLE;
sourceProj.createFilter(EXCL_FILE_GT, filterDesc, IResource.BACKGROUND_REFRESH, createTestMonitor());
Expand Down
2 changes: 1 addition & 1 deletion runtime/tests/org.eclipse.core.tests.runtime/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: 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,
Expand Down
19 changes: 17 additions & 2 deletions ...tests.runtime/src/org/eclipse/core/tests/internal/preferences/PreferencesServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.osgi.framework.Bundle;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;

Expand Down Expand Up @@ -222,11 +223,25 @@ public void testImportExportBasic() throws Exception {
@Test
public void testLookupOrder() {
IPreferencesService service = Platform.getPreferencesService();
String[] defaultOrder = new String[] {"project", //$NON-NLS-1$
List<String> defaultOrderList = new ArrayList<>(List.of( //
InstanceScope.SCOPE, //
ConfigurationScope.SCOPE, //
UserScope.SCOPE, //
DefaultScope.SCOPE};
DefaultScope.SCOPE) //
);
Bundle resourcesBundle = Platform.getBundle("org.eclipse.core.resources");
if (resourcesBundle != null) {
if (resourcesBundle.getState() == Bundle.ACTIVE) {
// "project" scope is added via
// PreferencesService.prependScopeToDefaultDefaultLookupOrder(String)
// by org.eclipse.core.internal.resources.Workspace, when the
// org.eclipse.core.resources bundle is started, which depends on
// the test execution environment (is the UI harness part of the
// launch?)
defaultOrderList.add(0, "project");
Comment thread
sratz marked this conversation as resolved.
}
}
String[] defaultOrder = defaultOrderList.toArray(String[]::new);
String[] fullOrder = new String[] {"a", "b", "c"};
String[] nullKeyOrder = new String[] {"e", "f", "g"};
String qualifier = getUniqueString();
Expand Down
Loading