!39 Disable tests for hamcrest-2.2 and Drop tests sub-package

From: @wk333 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

eclipse-feature-plugins-to-category-ius.patch

@@ -20,13 +20,12 @@ diff --git a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml b/eclipse.jdt/org.e
 index 06887d901..364cae9d8 100644
 --- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml
 +++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml
-@@ -19,6 +19,23 @@
+@@ -19,6 +19,22 @@
        %license
     </license>
  
 +   <requires>
 +      <import plugin="org.junit" />
-+      <import plugin="org.hamcrest.core" />
 +      <import plugin="org.junit.jupiter.api" />
 +      <import plugin="org.junit.jupiter.engine" />
 +      <import plugin="org.junit.jupiter.migrationsupport" />
@@ -418,15 +417,13 @@ diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
 index a3a7d14a0..f0dab84a3 100644
 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
 +++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
-@@ -19,6 +19,15 @@
+@@ -19,6 +19,13 @@
        %license
     </license>
  
 +   <requires>
 +      <import plugin="org.apache.commons.fileupload" />
 +      <import plugin="org.apache.commons.io" />
-+      <import plugin="org.hamcrest.core" />
-+      <import plugin="org.hamcrest.library" />
 +      <import plugin="org.mockito" />
 +      <import plugin="org.objenesis" />
 +   </requires>
@@ -501,15 +498,13 @@ diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.x
 index 1dcc94c1c..2a4871027 100644
 --- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
 +++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
-@@ -19,6 +19,14 @@
+@@ -19,6 +19,12 @@
        %license
     </license>
  
 +   <requires>
 +      <import plugin="org.junit" />
 +      <import plugin="org.easymock" />
-+      <import plugin="org.hamcrest.core" />
-+      <import plugin="org.hamcrest.library" />
 +      <import plugin="org.mockito" />
 +   </requires>
 +

eclipse.spec

@@ -11,7 +11,7 @@
 Name:                eclipse
 Epoch:               1
 Version:             4.11
-Release:             9
+Release:             10
 Summary:             An open, extensible IDE
 License:             EPL-2.0
 URL:                 http://www.eclipse.org/
@@ -20,7 +20,6 @@ Source1:             http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.
 Patch0:              eclipse-no-source-for-dependencies.patch
 Patch1:              eclipse-p2-pick-up-renamed-jars.patch
 Patch2:              eclipse-ignore-version-when-calculating-home.patch
-Patch3:              explicit-hamcrest.patch
 Patch4:              eclipse-secondary-arches.patch
 Patch5:              eclipse-debug-symbols.patch
 Patch12:             eclipse-fix-dropins.patch
@@ -145,7 +144,6 @@ Summary:             Eclipse Java Development Tools
 BuildArch:           noarch
 Provides:            %{name} = %{epoch}:%{version}-%{release}
 Requires:            %{name}-platform = %{epoch}:%{version}-%{release} junit >= 4.12 junit5 >= 5.4.0
-Requires:            osgi(org.hamcrest.core)
 Obsoletes:           eclipse-recommenders <= 2.5.4
 %description    jdt
 Eclipse Java Development Tools.  This package is required to use Eclipse for
@@ -171,18 +169,13 @@ installer UIs.
 
 %package        contributor-tools
 Summary:             Tools for Eclipse Contributors
+Obsoletes:           %{name}-tests <= %{epoch}:%{version}-%{release}
 Requires:            %{name}-platform = %{epoch}:%{version}-%{release} easymock hamcrest
 Requires:            mockito >= 2.23.9
 %description    contributor-tools
 This package contains tools specifically for Eclipse contributors. It includes
 SWT tools, E4 tools, Rel-Eng tools and Eclipse Test frameworks.
 
-%package        tests
-Summary:             Eclipse Tests
-Requires:            %{name}-contributor-tools = %{epoch}:%{version}-%{release}
-%description    tests
-Eclipse Tests.
-
 %prep
 %setup -T -c
 tar --strip-components=1 -xf %{SOURCE0}
@@ -197,7 +190,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
 %patch0
 %patch1
 %patch2
-%patch3
 %patch4 -p1
 %patch5
 %patch12
@@ -226,7 +218,18 @@ popd
 %ifarch loongarch64
 %patch38 -p1
 %endif
-rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py
+# Disable tests
+for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse.pde.build eclipse.pde.ui \
+    eclipse.platform eclipse.platform.debug eclipse.platform.releng eclipse.platform.resources eclipse.platform.runtime \
+    eclipse.platform.swt eclipse.platform.team eclipse.platform.text eclipse.platform.ui eclipse.platform.ua \
+    rt.equinox.bundles rt.equinox.framework rt.equinox.p2 ; do
+  sed -i -e '/<module>.*tests.*<\/module>/d' $pom/pom.xml
+done
+
+%pom_disable_module bundles/org.eclipse.equinox.frameworkadmin.test rt.equinox.p2
+%pom_disable_module eclipse-junit-tests eclipse.platform.releng.tychoeclipsebuilder
+%pom_disable_module ./tests/org.eclipse.e4.tools.test eclipse.platform.ui.tools
+
 %pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent
 %pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent
 %pom_xpath_remove 'pom:configuration/pom:timestampProvider' eclipse-platform-parent
@@ -244,8 +247,6 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/
 %pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
-%pom_disable_module bundles/org.eclipse.equinox.console.ssh.tests rt.equinox.bundles
-%pom_disable_module bundles/org.eclipse.equinox.console.tests rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.transforms.xslt rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.transforms.hook rt.equinox.bundles
@@ -257,9 +258,7 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/
 %pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2
 %pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles
 %pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
-%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.optimizers rt.equinox.p2
-%pom_disable_module bundles/org.eclipse.equinox.p2.tests.optimizers rt.equinox.p2
 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2
 %pom_disable_module org.eclipse.jdt.annotation_v1 eclipse.jdt.core
 %pom_xpath_remove "plugin[@version='1.1.400.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml
@@ -274,7 +273,6 @@ sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse.jdt.core/org.eclips
 %pom_disable_module bundles/org.eclipse.equinox.http.servletbridge rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.servletbridge rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.servletbridge.template rt.equinox.bundles
-%pom_disable_module ui/org.eclipse.pde.ui.tests.smartimport eclipse.pde.ui
 %pom_remove_plugin :maven-enforcer-plugin eclipse-platform-parent
 rm -rf eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.{aarch64,s390x}
 rm -rf rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.{aarch64,s390x}
@@ -336,15 +334,11 @@ for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \
     fi
   done
 done
-%pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt
 %pom_xpath_remove "pom:dependency-resolution" eclipse.platform.swt/tests/org.eclipse.swt.tests{,.gtk}
 %if %{bootstrap}
 %pom_disable_module eclipse.platform.ui.tools
 %pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng
 %pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng
-%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng
-%pom_xpath_remove "plugin[@id='org.eclipse.releng.tests']" \
-  eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
 %endif
 sed -i -e '/<features>/a<feature id="org.eclipse.core.runtime.feature"/>' \
   eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
@@ -382,12 +376,7 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
 ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/
 ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/
 %mvn_package "::pom::" __noinstall
-%mvn_package ":*tests*" tests
-%mvn_package ":org.eclipse.equinox.frameworkadmin.test" tests
-%mvn_package ":org.eclipse.equinox.p2.installer" tests
-%mvn_package ":org.eclipse.jface.examples.databinding" tests
-%mvn_package ":org.eclipse.pde.tools.versioning" tests
-%mvn_package ":org.eclipse.update.core" tests
+%mvn_package ":org.eclipse.pde.tools.versioning" contributor-tools
 %mvn_package "org.eclipse.test:org.eclipse.test" contributor-tools
 %mvn_package ":*examples*" __noinstall
 %mvn_package "::jar:sources{,-feature}:" sdk
@@ -531,9 +520,9 @@ for J in $OSGI_JARS ; do
   VER=$(echo $JAR | sed -e "s/.*${J}_\(.*\)\.jar/\1/")
   %mvn_artifact "org.eclipse.osgi:$J:jar:$VER" $JAR
   if [ "$J" = "osgi" ] ; then
-    %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse:$J"
+    %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse.platform:org.eclipse.$J" "org.eclipse:$J"
   else
-    %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J"
+    %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse.platform:org.eclipse.$J"
   fi
 done
 JAR=%{buildroot}%{_eclipsedir}/plugins/org.eclipse.equinox.http.servlet_*.jar
@@ -549,13 +538,7 @@ VER=$(echo $JAR | sed -e "s/.*_\(.*\)\.jar/\1/")
 pushd %{buildroot}/%{_eclipsedir}/
     ln -s $(abs2rel %{_jnidir}/swt.jar %{_eclipsedir})
 popd
-unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip \
-  -d $RPM_BUILD_ROOT/%{_datadir}/ -x eclipse-testing/runtests.bat eclipse-testing/runtestsmac.sh
-cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing
-rm $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/eclipse-junit-tests-*.zip
-sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/equinoxp2tests.properties
-cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle
-mv $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles
+
 find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \;
 install -d -m 755 %{buildroot}%{_eclipsedir}/.pkgs
 echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
@@ -758,10 +741,6 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 
 %files contributor-tools -f .mfiles-contributor-tools
 
-%files tests -f .mfiles-tests
-%{_bindir}/eclipse-runTestBundles
-%{_datadir}/eclipse-testing
-
 %files equinox-osgi -f .mfiles-equinox-osgi
 %{_eclipsedir}/plugins/org.eclipse.osgi_*
 %{_eclipsedir}/plugins/org.eclipse.osgi.compatibility.state_*
@@ -769,6 +748,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Wed Sep 27 2023 wangkai <13474090681@163.com> -  1:4.11-10
+- Disable tests for hamcrest-2.2
+- Drop tests sub-package
+
 * Wed Aug 09 2023 loongson <service@loongson.cn> - 1:4.11-9
 - Add Loongarch64 support
 

explicit-hamcrest.patch

@@ -1,19 +0,0 @@
---- eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF.orig	2018-08-20 12:54:25.245305107 +0100
-+++ eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF	2018-08-20 12:54:37.952261537 +0100
-@@ -33,6 +33,7 @@
-  org.eclipse.ui.workbench.texteditor;resolution:=optional,
-  org.eclipse.ui.editors;resolution:=optional,
-  org.junit,
-+ org.hamcrest.core,
-  org.eclipse.core.resources,
-  org.eclipse.core.variables,
-  org.eclipse.ui,
---- eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF.orig	2018-08-20 13:22:04.987695821 +0100
-+++ eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF	2018-08-20 13:22:28.507613518 +0100
-@@ -7,4 +7,5 @@
- Fragment-Host: org.eclipse.urischeme;bundle-version="1.0.0"
- Automatic-Module-Name: org.eclipse.urischeme.tests
- Bundle-RequiredExecutionEnvironment: JavaSE-1.8
--Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)"
-+Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
-+ org.hamcrest.core;bundle-version="1.3.0"