Skip to content

Commit e012f52

Browse files
vogellaclaude
andcommitted
Migrate test fixtures to non-deprecated contentTypes extension point
The org.eclipse.core.runtime.contentTypes extension point was deprecated in 2018 and is being removed. Replace with its canonical successor org.eclipse.core.contenttype.contentTypes in the four test fixture plugin.xml files. The child element schema is identical, so this is a mechanical id swap with no behavioral change. These fixtures provide negative-case coverage (missing names, invalid describers, empty file-extensions, missing alias targets) for the content-type registry tests in org.eclipse.core.tests.resources. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 61d50fa commit e012f52

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?eclipse version="3.0"?>
33
<plugin>
4-
<extension point="org.eclipse.core.runtime.contentTypes">
4+
<extension point="org.eclipse.core.contenttype.contentTypes">
55
<content-type id="missing" name="Missing"/>
66
</extension>
77
</plugin>

resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle02/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?eclipse version="3.0"?>
33
<plugin>
4-
<extension point="org.eclipse.core.runtime.contentTypes">
4+
<extension point="org.eclipse.core.contenttype.contentTypes">
55
<content-type id="missing-target" name="Missing alias target"
66
file-extensions="missing-target"/>
77
</extension>

resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle03/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?eclipse version="3.0"?>
33
<plugin>
4-
<extension point="org.eclipse.core.runtime.contentTypes">
4+
<extension point="org.eclipse.core.contenttype.contentTypes">
55
<!-- this content type has an invalid describer, it should never be picked on content-based content type lookup -->
66
<content-type
77
name="Invalid Describer"

resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle04/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?eclipse version="3.0"?>
33
<plugin>
4-
<extension point="org.eclipse.core.runtime.contentTypes">
4+
<extension point="org.eclipse.core.contenttype.contentTypes">
55
<content-type id="empty_extension1" name="Empty Extension 1" file-extensions=""/>
66
<content-type id="empty_extension2" name="Empty Extension 2" file-extensions="foo,"/>
77
<content-type id="empty_extension3" name="Empty Extension 3" file-extensions=",foo"/>

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/IContentTypeManagerTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public void testAlias() throws Exception {
204204
assertThat(selected).containsExactly(alias, derived);
205205

206206
// test late addition of content type
207-
TestRegistryChangeListener listener = new TestRegistryChangeListener(Platform.PI_RUNTIME,
207+
TestRegistryChangeListener listener = new TestRegistryChangeListener(IContentConstants.CONTENT_NAME,
208208
ContentTypeBuilder.PT_CONTENTTYPES, null, null);
209209
BundleTestingHelper.runWithBundles(() -> {
210210
IContentType alias1 = contentTypeManager.getContentType(PI_RESOURCES_TESTS + ".alias");
@@ -761,7 +761,7 @@ public void testDynamicChanges() throws Exception {
761761
assertEquals(text[0], text[1]);
762762
assertEquals(text[0], text[1]);
763763
// make arbitrary dynamic changes to the contentTypes extension point
764-
TestRegistryChangeListener listener = new TestRegistryChangeListener(Platform.PI_RUNTIME,
764+
TestRegistryChangeListener listener = new TestRegistryChangeListener(IContentConstants.CONTENT_NAME,
765765
ContentTypeBuilder.PT_CONTENTTYPES, null, null);
766766
BundleTestingHelper.runWithBundles(() -> {
767767
IContentType missing = manager.getContentType("org.eclipse.bundle01.missing");
@@ -1031,7 +1031,7 @@ public void testInvalidMarkup() throws Exception {
10311031
assertThat(finder.findContentTypesFor("invalid.missing.identifier")).isEmpty();
10321032
assertThat(finder.findContentTypesFor("invalid.missing.name")).isEmpty();
10331033
assertNull(contentTypeManager.getContentType(PI_RESOURCES_TESTS + '.' + "invalid-missing-name"));
1034-
TestRegistryChangeListener listener = new TestRegistryChangeListener(Platform.PI_RUNTIME,
1034+
TestRegistryChangeListener listener = new TestRegistryChangeListener(IContentConstants.CONTENT_NAME,
10351035
ContentTypeBuilder.PT_CONTENTTYPES, null, null);
10361036
BundleTestingHelper.runWithBundles(() -> {
10371037
// ensure the invalid content types are not available
@@ -1173,7 +1173,7 @@ public void testNoExtensionAssociation() throws Exception {
11731173
IContentType[] selected = manager.findContentTypesFor("file_with_no_extension");
11741174
assertThat(selected).isEmpty();
11751175

1176-
TestRegistryChangeListener listener = new TestRegistryChangeListener(Platform.PI_RUNTIME,
1176+
TestRegistryChangeListener listener = new TestRegistryChangeListener(IContentConstants.CONTENT_NAME,
11771177
ContentTypeBuilder.PT_CONTENTTYPES, null, null);
11781178
BundleTestingHelper.runWithBundles(() -> {
11791179
final String namespace = "org.eclipse.bundle04";
@@ -1240,7 +1240,7 @@ public void testOrphanContentType() throws Exception {
12401240
assertThat(contentTypeManager.findContentTypesFor("foo.orphan2")).isEmpty();
12411241

12421242
// test late addition of content type - orphan2 should become visible
1243-
TestRegistryChangeListener listener = new TestRegistryChangeListener(Platform.PI_RUNTIME,
1243+
TestRegistryChangeListener listener = new TestRegistryChangeListener(IContentConstants.CONTENT_NAME,
12441244
ContentTypeBuilder.PT_CONTENTTYPES, null, null);
12451245

12461246
BundleTestingHelper.runWithBundles(() -> {

0 commit comments

Comments
 (0)