From d8cc6737ce6fc9e4e37c0385d60ee8e7c4d8c9e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sun, 3 Mar 2024 07:54:25 +0100
Subject: [PATCH] Enable Felix Tests in the Build

---
 .gitignore                                |  3 ++-
 bundles/org.eclipse.osgi/.classpath       |  7 ++++++
 bundles/org.eclipse.osgi/build.properties |  1 +
 bundles/org.eclipse.osgi/pom.xml          | 30 ++++++++++++++++++++++-
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 90c4d7ec224..6f843501666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /*/*/bin/
+bin_test
 /bundles/archived/*/bin/
 .DS_Store
 
@@ -8,4 +9,4 @@ target/
 .polyglot.*
 .META-INF_*
 pom.tycho
-.tycho-consumer-pom.xml
+.tycho-consumer-pom.xml
\ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/.classpath b/bundles/org.eclipse.osgi/.classpath
index d1e9a6c35df..9dd86311065 100644
--- a/bundles/org.eclipse.osgi/.classpath
+++ b/bundles/org.eclipse.osgi/.classpath
@@ -14,5 +14,12 @@
 	</classpathentry>
 	<classpathentry kind="src" path="supplement/src"/>
 	<classpathentry kind="src" path="container/src"/>
+	<classpathentry kind="src" output="bin_test" path="felix/src_test">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.osgi/build.properties b/bundles/org.eclipse.osgi/build.properties
index 463474d3aa8..8fc583284f1 100644
--- a/bundles/org.eclipse.osgi/build.properties
+++ b/bundles/org.eclipse.osgi/build.properties
@@ -37,3 +37,4 @@ output.. = bin/
 javacWarnings..=-raw,unchecked,hiding,unused,warningToken
 jars.extra.classpath = osgi/j9stubs.jar
 jre.compilation.profile = JavaSE-1.8
+additional.bundles = org.mockito.mockito-core
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
index 2da1930a94b..cfdf6729465 100644
--- a/bundles/org.eclipse.osgi/pom.xml
+++ b/bundles/org.eclipse.osgi/pom.xml
@@ -34,7 +34,7 @@
         <version>${tycho.version}</version>
         <configuration>
           <compilerArgs>
-            <arg>-nowarn:[${project.basedir}/osgi/src${path.separator}${project.basedir}/felix/src]</arg>
+            <arg>-nowarn:[${project.basedir}/osgi/src${path.separator}${project.basedir}/felix/src${path.separator}${project.basedir}/felix/src_test]</arg>
           </compilerArgs>
         </configuration>
       </plugin>
@@ -55,7 +55,35 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-surefire-plugin</artifactId>
+			<executions>
+				<execution>
+					<id>execute-tests</id>
+					<goals>
+						<goal>test</goal>
+					</goals>
+				</execution>
+			</executions>
+		</plugin>
     </plugins>
   </build>
 
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>5.11.0</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
 </project>