Skip to content

Fix references to RealJenkinsRule.JenkinsStartupException #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtnord merged 4 commits into from
Jan 7, 2026
Merged

Fix references to RealJenkinsRule.JenkinsStartupException #36

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
381cdbb
Fix references to RealJenkinsRule.JenkinsStartupException
strangelookingnerd Jan 2, 2026
bf6995b
Update plugin bom and JTH
strangelookingnerd Jan 2, 2026
ebd5ab3
Change exception type in FIPSComplianceCheckTest
strangelookingnerd Jan 2, 2026
4827c94
No need to define JTH property anymore
strangelookingnerd Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/test/java/io/jenkins/plugins/eddsa_api/FIPSComplianceCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;

import java.io.IOException;
import jenkins.model.Jenkins;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.RealJenkinsRule;
import org.jvnet.hudson.test.RealJenkinsRule.JenkinsStartupException;

public class FIPSComplianceCheckTest {

Expand All @@ -27,7 +27,7 @@ public void testStartupNonFips() throws Throwable {
@Test
public void testStartupFips() throws Throwable {
rjr.javaOptions("-Xmx128M", "-Djenkins.security.FIPS140.COMPLIANCE=true");
JenkinsStartupException jse = assertThrows(JenkinsStartupException.class, () -> {
IOException jse = assertThrows(IOException.class, () -> {
Copy link
Member

@jglick jglick Jan 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine, or just do not assert the exception type at all.

rjr.then(r -> {
Jenkins.get().getPluginManager().uberClassLoader.loadClass("net.i2p.crypto.eddsa.EdDSAEngine");
fail("should not get here!");
Copy link
Member

@jglick jglick Jan 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW this is redundant. I think the whole assertion could be something like

assertThat(assertThrows(Throwable.class, () -> rjr.run(r -> r.jenkins.pluginManager.uberClassLoader.loadClass("net.i2p.crypto.eddsa.EdDSAEngine"))).getMessage(),
                containsString(
                        "The eddsa-api plugin is not FIPS compliant and can not be used in a Jenkins configured to run in FIPS-140 mode"));

Expand Down
Loading