Include upstream's scripts for generating test certificates

Enable tests again
This commit is contained in:
Mattias Ellert 2025-09-09 11:22:20 +02:00
commit 280976e075
3 changed files with 52 additions and 6 deletions

View file

@ -1 +1,2 @@
SHA512 (voms-api-java-3.3.6.tar.gz) = fb2f7c330de32b5523a33fd5de6bc16bdb7fa45de9a91f01fd2c066485e82b17a981f43c7e6762ec1cfb11241c0085db70ad194154623588a9a3845b0c9203b4
SHA512 (helper-scripts-master.tar.gz) = 8704b5bdbee360c0db70e6ece2781a385c62c802c9000754f62efbd23bd22542ace77f68b8064661201f441b40234475a005d9f67b50f0aea435636a0a851225

28
voms-api-java-test.patch Normal file
View file

@ -0,0 +1,28 @@
diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
index a0f7a87..4244925 100644
--- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
+++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
@@ -31,6 +31,7 @@ import org.italiangrid.voms.test.utils.Utils;
import org.italiangrid.voms.test.utils.VOMSAA;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import eu.emi.security.authn.x509.X509CertChainValidatorExt;
@@ -316,6 +317,7 @@ public class TestACValidator implements Fixture {
}
@Test
+ @Ignore
public void testTargetValidationSuccess() throws Exception {
VOMSAA aa = Utils.getVOMSAA();
@@ -342,6 +344,7 @@ public class TestACValidator implements Fixture {
}
@Test
+ @Ignore
public void testTargetValidationFailure() throws Exception {
VOMSAA aa = Utils.getVOMSAA();

View file

@ -1,11 +1,15 @@
Name: voms-api-java
Version: 3.3.6
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Virtual Organization Membership Service Java API
License: Apache-2.0
URL: https://github.com/italiangrid/%{name}
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Helper scripts for generating test certificates
Source1: https://baltig.infn.it/mw-devel/helper-scripts/-/archive/master/helper-scripts-master.tar.gz
# Disable tests requiring non-local network
Patch0: %{name}-test.patch
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
@ -16,6 +20,11 @@ BuildRequires: maven-local-openjdk25
BuildRequires: maven-local
%endif
BuildRequires: mvn(eu.eu-emi.security:canl) >= 2.8.3
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.hamcrest:hamcrest-library)
BuildRequires: mvn(org.mockito:mockito-core)
BuildRequires: faketime
BuildRequires: openssl
Requires: mvn(eu.eu-emi.security:canl) >= 2.8.3
%description
@ -35,7 +44,8 @@ Summary: Virtual Organization Membership Service Java API Documentation
Virtual Organization Membership Service (VOMS) Java API Documentation.
%prep
%setup -q
%setup -q -a 1
%patch -P0 -p1
# Remove unused dependency
%pom_remove_dep net.jcip:jcip-annotations
@ -47,17 +57,20 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
# Do not create source jars
%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
# Do not enforce requirements
%pom_remove_plugin org.apache.maven.plugins:maven-enforcer-plugin
%if %{?rhel}%{!?rhel:0} == 9
# Modify bouncycastle dependencies for RHEL 9
%pom_change_dep org.bouncycastle:bcprov-jdk18on org.bouncycastle:bcprov-jdk15on
%pom_change_dep org.bouncycastle:bcpkix-jdk18on org.bouncycastle:bcpkix-jdk15on
%endif
# Generate test certificates
export PATH=$PWD/helper-scripts-master/x509-scripts/scripts:$PATH
pushd src/test/resources
./setup.sh
popd
%build
%mvn_build -f
%mvn_build
%install
%mvn_install
@ -70,6 +83,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%license LICENSE
%changelog
* Mon Sep 08 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.6-2
- Include upstream's scripts for generating test certificates
- Enable tests again
* Tue Aug 05 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.6-1
- Update to version 3.3.6