Skip to content

chore: Make com.microsoft.copilot.eclipse.ui.test a fragment bundle of com.microsoft.copilot.eclipse.ui bundle #361

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
travkin79 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: Make com.microsoft.copilot.eclipse.ui.test a fragment bundle of com.microsoft.copilot.eclipse.ui bundle #361

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
608222e
chore: Make ...ui.test a fragment bundle of ...ui bundle
travkin79 Jul 20, 2026
d6f3dfd
Add additional assertion in test case
travkin79 Jul 23, 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
28 changes: 5 additions & 23 deletions com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,10 @@ Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.test;singleton:=true
Bundle-Version: 0.20.0.qualifier
Bundle-Vendor: GitHub Copilot
Bundle-RequiredExecutionEnvironment: JavaSE-17
Fragment-Host: com.microsoft.copilot.eclipse.ui
Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.test
Import-Package: org.objenesis;version="[3.4.0,4.0.0)",
org.osgi.framework;version="[1.10.0,2.0.0)"
Require-Bundle: org.mockito.mockito-core;bundle-version="5.14.2",
org.eclipse.lsp4e;bundle-version="0.18.1",
org.eclipse.jdt.annotation;resolution:=optional,
junit-jupiter-api;bundle-version="5.10.1",
Import-Package: org.objenesis;version="[3.4.0,4.0.0)"
Require-Bundle: junit-jupiter-api;bundle-version="5.10.1",
junit-jupiter-params;bundle-version="5.10.1",
org.mockito.junit-jupiter;bundle-version="5.10.2",
com.microsoft.copilot.eclipse.core;bundle-version="0.20.0",
com.microsoft.copilot.eclipse.ui;bundle-version="0.20.0",
org.eclipse.ui;bundle-version="3.205.0",
org.eclipse.ui.ide,
org.eclipse.ui.workbench.texteditor,
org.eclipse.ui.editors,
org.eclipse.jface.text;bundle-version="3.24.200",
org.eclipse.lsp4j;bundle-version="0.21.1",
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.core.expressions,
org.eclipse.core.net;bundle-version="1.5.200",
org.eclipse.e4.core.services;bundle-version="2.4.200",
org.osgi.service.event,
com.google.gson,
com.microsoft.copilot.eclipse.terminal.api;bundle-version="0.20.0"
org.mockito.mockito-core;bundle-version="5.14.2",
org.mockito.junit-jupiter;bundle-version="5.10.2"
2 changes: 1 addition & 1 deletion com.microsoft.copilot.eclipse.ui.test/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ source.. = src
output.. = target/classes
bin.includes = META-INF/,\
.,\
plugin.xml
fragment.xml

0 ...rosoft.copilot.eclipse.ui.test/plugin.xml → ...soft.copilot.eclipse.ui.test/fragment.xml
View file
Open in desktop
File renamed without changes.
17 changes: 16 additions & 1 deletion ...clipse.ui.test/src/com/microsoft/copilot/eclipse/ui/nes/NesAnnotationTypeMappingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.texteditor.AnnotationTypeLookup;
Expand All @@ -19,7 +21,7 @@ class NesAnnotationTypeMappingTest {

private static final String ANNOTATION_TYPES_EXTENSION_POINT = "org.eclipse.ui.editors.annotationTypes";
private static final String FOREIGN_TEXT_MARKER =
"com.microsoft.copilot.eclipse.ui.test.foreignTextMarker";
"com.microsoft.copilot.eclipse.ui.foreignTextMarker";
private static final String NES_ANNOTATION_PREFIX = "com.microsoft.copilot.eclipse.ui.nes.";
private static final String NES_CHANGE_ANNOTATION = NES_ANNOTATION_PREFIX + "change";
private static final String NES_DELETE_ANNOTATION = NES_ANNOTATION_PREFIX + "delete";
Expand All @@ -31,9 +33,22 @@ void testForeignTextMarkerSubtypeDoesNotResolveToNesAnnotations() {

String annotationType = lookup.getAnnotationType(FOREIGN_TEXT_MARKER, IMarker.SEVERITY_INFO);

// assert our marker type is properly registered, before checking annotation type mapping
assertTrue(isMarkerTypeDeclared(FOREIGN_TEXT_MARKER));
assertNotEquals(NES_CHANGE_ANNOTATION, annotationType);
assertNotEquals(NES_DELETE_ANNOTATION, annotationType);
}

private boolean isMarkerTypeDeclared(String markerTypeId) {
IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(ResourcesPlugin.PI_RESOURCES,
"markers");
for (IExtension ext : point.getExtensions()) {
if (markerTypeId.equals(ext.getUniqueIdentifier())) {
return true;
}
}
return false;
}

@Test
void testNesAnnotationTypesDoNotMapToRootTextMarker() {
Expand Down
Loading