Skip to content

Fix manifestHeaderServiceComponentAdded test on macOS and Windows #80

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
Mar 1, 2026
Merged

Fix manifestHeaderServiceComponentAdded test on macOS and Windows #80

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0418bfd
Initial plan
Copilot Mar 1, 2026
3483bd2
Fix manifestHeaderServiceComponentAdded test to read MANIFEST.MF dire…
Copilot Mar 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
21 changes: 11 additions & 10 deletions ...notations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/ManagedProjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
package org.eclipse.pde.ds.internal.annotations.tests;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
import java.util.jar.Manifest;

import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.ds.internal.annotations.DSAnnotationCompilationParticipant;
import org.eclipse.pde.internal.core.ibundle.IBundleModel;
import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
import org.junit.jupiter.api.Test;

@SuppressWarnings("restriction")
Expand Down Expand Up @@ -45,11 +43,14 @@ public void folderOSGIInfCreated() throws Exception {

@Test
public void manifestHeaderServiceComponentAdded() throws Exception {
IPluginModelBase pluginModel = PluginRegistry.findModel(testProject);
assertThat(pluginModel).isInstanceOf(IBundlePluginModelBase.class);
IBundleModel bundleModel = ((IBundlePluginModelBase) pluginModel).getBundleModel();
assertNotNull(bundleModel, "Missing bundle manifest!");
String serviceComponentHeader = bundleModel.getBundle().getHeader("Service-Component");
IFile manifestFile = testProject.getFile("META-INF/MANIFEST.MF");
manifestFile.refreshLocal(IResource.DEPTH_ZERO, null);
assertTrue(manifestFile.exists(), "Missing MANIFEST.MF!");
String serviceComponentHeader;
try (InputStream is = manifestFile.getContents(true)) {
Manifest manifest = new Manifest(is);
serviceComponentHeader = manifest.getMainAttributes().getValue("Service-Component");
}
assertNotNull(serviceComponentHeader, "Missing Service-Component header!");
String[] entries = serviceComponentHeader.split("\\s*,\\s*");
List<String> entryList = Arrays.asList(entries);
Expand Down