make validator tests work also in OSGI and Maven/Tycho

org.eclipse.xtext.xbase.tests/src/org/eclipse/xtext/xbase/tests/validation/JvmGenericTypeValidatorTest.java

@@ -8,25 +8,24 @@
  *******************************************************************************/
 package org.eclipse.xtext.xbase.tests.validation;
 
+import static org.eclipse.xtext.xbase.testlanguages.jvmGenericTypeValidatorTestLang.JvmGenericTypeValidatorTestLangPackage.Literals.*;
+import static org.eclipse.xtext.xbase.validation.IssueCodes.*;
+
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.XtextRunner;
 import org.eclipse.xtext.testing.util.ParseHelper;
 import org.eclipse.xtext.testing.validation.ValidationTestHelper;
 import org.eclipse.xtext.xbase.testlanguages.jvmGenericTypeValidatorTestLang.JvmGenericTypeValidatorTestLangModel;
-import org.eclipse.xtext.xbase.testlanguages.tests.JvmGenericTypeValidatorTestLangInjectorProvider;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.eclipse.xtext.xbase.validation.IssueCodes.*;
-import static org.eclipse.xtext.xbase.testlanguages.jvmGenericTypeValidatorTestLang.JvmGenericTypeValidatorTestLangPackage.Literals.*;
-
 import com.google.inject.Inject;
 
 /**
  * @author Lorenzo Bettini - Initial contribution and API
  */
 @RunWith(XtextRunner.class)
-@InjectWith(JvmGenericTypeValidatorTestLangInjectorProvider.class)
+@InjectWith(JvmGenericTypeValidatorTestLangInjectorProviderCustom.class)
 public class JvmGenericTypeValidatorTest {
 	@Inject
 	private ParseHelper<JvmGenericTypeValidatorTestLangModel> parseHelper;

org.eclipse.xtext.xbase.tests/src/org/eclipse/xtext/xbase/tests/validation/JvmGenericTypeValidatorTestLangInjectorProviderCustom.java

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2024 itemis AG (http://www.itemis.eu) and others.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.xtext.xbase.tests.validation;
+
+import org.eclipse.xtext.xbase.testlanguages.JvmGenericTypeValidatorTestLangRuntimeModule;
+import org.eclipse.xtext.xbase.testlanguages.tests.JvmGenericTypeValidatorTestLangInjectorProvider;
+
+/**
+ * To let the validator/scoping/linking find the Java classes of "testdata" referred in some tests also in an OSGI and Maven/Tycho
+ * environment. This is required because the original {@link JvmGenericTypeValidatorTestLangInjectorProvider} is not in this bundle.
+ * 
+ * @author Lorenzo Bettini - Initial contribution and API
+ */
+public class JvmGenericTypeValidatorTestLangInjectorProviderCustom extends JvmGenericTypeValidatorTestLangInjectorProvider {
+
+	@Override
+	protected JvmGenericTypeValidatorTestLangRuntimeModule createRuntimeModule() {
+		// make it work also with Maven/Tycho and OSGI
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		return new JvmGenericTypeValidatorTestLangRuntimeModule() {
+			@Override
+			public ClassLoader bindClassLoaderToInstance() {
+				return JvmGenericTypeValidatorTestLangInjectorProviderCustom.class.getClassLoader();
+			}
+		};
+	}
+}