Fix org.eclipse.search.textSearchEngine ext point definition

Author: mickaelistria

bundles/org.eclipse.search.core/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.search.core; singleton:=true
+Bundle-SymbolicName: org.eclipse.search.core;singleton:=true
 Bundle-Version: 3.16.0.qualifier
 Bundle-Activator: org.eclipse.search.internal.core.SearchCorePlugin
 Bundle-ActivationPolicy: lazy

bundles/org.eclipse.search.core/plugin.properties

@@ -12,7 +12,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-pluginName= Search Support Core
-providerName= Eclipse.org
-dirtyFileSearchParticipant="Dirty File Search Participant"
-textSearchEngine="Text Search Engine"
+pluginName=Search Support Core
+providerName=Eclipse.org
+dirtyFileSearchParticipant=Dirty File Search Participant
+textSearchEngine=Text Search Engine

bundles/org.eclipse.search.core/plugin.xml

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
+<?eclipse version="3.2"?>
 <!-- ======================================================================= -->
 <!-- Search Plugin                                                           -->
 <!-- ======================================================================= -->
 <plugin>
-
-	<!-- Search extension point definitions -->
-    <extension-point name="%textSearchEngine" id="textSearchEngine" schema="schema/textSearchEngine.exsd"/>
-
+    <extension-point id="org.eclipse.search.textSearchEngine" name="%textSearchEngine" schema="schema/textSearchEngine.exsd"/>
 </plugin>

tests/org.eclipse.search.tests/META-INF/MANIFEST.MF

@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.search.tests
-Bundle-Version: 3.11.100.qualifier
+Bundle-SymbolicName: org.eclipse.search.tests;singleton:=true
+Bundle-Version: 3.11.200.qualifier
 Bundle-Activator: org.eclipse.search.tests.SearchTestPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

tests/org.eclipse.search.tests/build.properties

@@ -19,7 +19,8 @@ bin.includes = plugin.properties,\
                testresources/,\
                META-INF/,\
                about.html,\
-               test.xml
+               test.xml,\
+               plugin.xml
 
 # Maven/Tycho pom model adjustments
 pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}

tests/org.eclipse.search.tests/plugin.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.search.textSearchEngine">
+      <textSearchEngine
+            class="org.eclipse.search.tests.TestTextSearchEngine"
+            id="org.eclipse.search.tests.testSearchEngine"
+            label="Test Search Engine">
+      </textSearchEngine>
+   </extension>
+
+</plugin>

tests/org.eclipse.search.tests/src/org/eclipse/search/tests/AllSearchTests.java

@@ -23,7 +23,8 @@
 @RunWith(Suite.class)
 @SuiteClasses({
 		AllFileSearchTests.class,
-		AllSearchModelTests.class
+		AllSearchModelTests.class,
+		TextSearchRegistryTest.class
 })
 public class AllSearchTests {
 	// see @SuiteClasses

tests/org.eclipse.search.tests/src/org/eclipse/search/tests/TextSearchRegistryTest.java

@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Red Hat, Inc. and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.search.tests;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+
+import org.eclipse.search.internal.core.text.TextSearchEngineRegistry;
+import org.eclipse.search.internal.ui.SearchPlugin;
+import org.junit.Test;
+
+public class TextSearchRegistryTest {
+
+	@Test
+	public void testRegistry() {
+		TextSearchEngineRegistry textSearchEngineRegistry= SearchPlugin.getDefault().getTextSearchEngineRegistry();
+		assertTrue(Arrays.stream(textSearchEngineRegistry.getAvailableEngines()).map(array -> array[1]).anyMatch("org.eclipse.search.tests.testSearchEngine"::equals));
+	}
+}