Skip to content

Fix TargetDefinitionResolutionTests #1839

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
akurtakov merged 1 commit into from
Jun 27, 2025
Merged

Fix TargetDefinitionResolutionTests #1839

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 17 additions & 11 deletions ...pse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionResolutionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2009, 2023 IBM Corporation and others.
* Copyright (c) 2009, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -22,6 +22,8 @@
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.stream.Stream;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
Expand Down Expand Up @@ -437,13 +439,12 @@ public void testSourceBundleRecognition() throws Exception {
featureWithCorrespondingSourceFeature,
null);

ITargetLocation featureContainer2 = getTargetService().newFeatureLocation(defaultLocation,
featureWithCorrespondingSourceFeature + ".source", null);

definition.setTargetLocations(new ITargetLocation[]{directoryContainer, profileContainer, featureContainer, featureContainer2});
definition.setTargetLocations(
new ITargetLocation[] { directoryContainer, profileContainer, featureContainer });
definition.resolve(null);

TargetBundle[] bundles = definition.getBundles();
List<String> bundleNames = Stream.of(bundles).map(bundle -> bundle.getBundleInfo().getSymbolicName()).toList();

assertNotNull("Target didn't resolve",bundles);

Expand All @@ -460,12 +461,17 @@ public void testSourceBundleRecognition() throws Exception {
}
}

// Everything in the JDT feature has an equivalent named source bundle
bundles = featureContainer2.getBundles();
for (TargetBundle bundle : bundles) {
if (bundle.getBundleInfo().getSymbolicName().indexOf("doc") == -1){
assertTrue("Non-source bundle in source feature", bundle.isSourceBundle());
assertEquals("Incorrect source target", bundle.getBundleInfo().getSymbolicName(),bundle.getSourceTarget().getSymbolicName()+".source");
// Everything in the feature has an equivalent named source bundle
for (TargetBundle bundle : featureContainer.getBundles()) {
if (bundle.getBundleInfo().getSymbolicName().indexOf("doc") != -1) {
return;
}
if (bundle.isSourceBundle()) {
assertEquals("Incorrect source target", bundle.getBundleInfo().getSymbolicName(),
bundle.getSourceTarget().getSymbolicName() + ".source");
} else {
assertTrue("Missing source for bundle " + bundle.getBundleInfo().getSymbolicName(),
bundleNames.contains(bundle.getBundleInfo().getSymbolicName() + ".source"));
}
}
}
Expand Down
Loading