From 3248ae8e32798be91af9b0724e5b5dc7162e1d38 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 21 Sep 2024 11:32:26 -0600
Subject: [PATCH] Replace dependee plugin binary with script security call
 (#83)

The dependee plugin binary causes lots of noise when the JenkinsRule test
is starting.  The noise includes many reports of plugins that cannot be
loaded because they require newer dependencies, even though the newest
dependencies are already included as test scoped dependencies in the
pom file.  I assume that is due to the ancient Jenkins version that is
referenced in the dependee plugin binary.  The dependee plugin was built
in 2013 and is not part of the Jenkins update center.

Use the script security plugin instead because it is already a dependency
and does not require separate script approval.

Detected the test noise while evaluating pull request:

* https://github.com/jenkinsci/groovy-postbuild-plugin/pull/81

The test was passing but was generating many failure messages because
badge plugin 1.13 could not be loaded.  Those messages no longer happen
with this test change.

Adds more assertions on the BadgeAction object for good measure.
---
 .../GroovyPostbuildRecorderAnnotatedTest.java |  25 ++++++++++--------
 src/test/resources/plugins/dependee.hpi       | Bin 4672 -> 0 bytes
 2 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 src/test/resources/plugins/dependee.hpi

diff --git a/src/test/java/org/jvnet/hudson/plugins/groovypostbuild/GroovyPostbuildRecorderAnnotatedTest.java b/src/test/java/org/jvnet/hudson/plugins/groovypostbuild/GroovyPostbuildRecorderAnnotatedTest.java
index 8a02dca..1b66f2d 100644
--- a/src/test/java/org/jvnet/hudson/plugins/groovypostbuild/GroovyPostbuildRecorderAnnotatedTest.java
+++ b/src/test/java/org/jvnet/hudson/plugins/groovypostbuild/GroovyPostbuildRecorderAnnotatedTest.java
@@ -25,6 +25,8 @@
 package org.jvnet.hudson.plugins.groovypostbuild;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import com.jenkinsci.plugins.badge.action.BadgeAction;
 import hudson.model.FreeStyleBuild;
@@ -32,12 +34,9 @@
 import java.util.Collections;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript;
 import org.jenkinsci.plugins.scriptsecurity.scripts.ClasspathEntry;
-import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval;
-import org.jenkinsci.plugins.scriptsecurity.scripts.languages.GroovyLanguage;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.recipes.WithPlugin;
 
 /**
  * Tests requires Jenkins launched for each test methods.
@@ -47,14 +46,10 @@ public class GroovyPostbuildRecorderAnnotatedTest {
     public JenkinsRule j = new JenkinsRule();
 
     @Test
-    @WithPlugin(
-            "dependee.hpi") // provides org.jenkinsci.plugins.dependencytest.dependee.Dependee.getValue() which returns
-    // "dependee".
     public void testDependencyToAnotherPlugin() throws Exception {
-        final String SCRIPT = "import org.jenkinsci.plugins.dependencytest.dependee.Dependee;"
-                + "manager.addShortText(Dependee.getValue());";
-        // as Dependee.getValue isn't whitelisted, we need to approve that.
-        ScriptApproval.get().preapprove(SCRIPT, GroovyLanguage.get());
+        // Test with script security plugin because it is already a dependency
+        final String SCRIPT = "import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApprovalLink;"
+                + "manager.addShortText((new ScriptApprovalLink()).getDisplayName());";
 
         FreeStyleProject p = j.createFreeStyleProject();
         p.getPublishersList()
@@ -63,6 +58,14 @@ public void testDependencyToAnotherPlugin() throws Exception {
 
         FreeStyleBuild b = p.scheduleBuild2(0).get();
         j.assertBuildStatusSuccess(b);
-        assertEquals("dependee", b.getAction(BadgeAction.class).getText());
+        BadgeAction action = b.getAction(BadgeAction.class);
+        assertEquals("", action.getIconClass());
+        assertEquals("", action.getUrlName());
+        assertEquals("In-process Script Approval", action.getText());
+        assertNull(action.getBorder());
+        assertNull(action.getColor());
+        assertNull(action.getIconFileName());
+        assertNull(action.getLink());
+        assertTrue(action.isTextOnly());
     }
 }
diff --git a/src/test/resources/plugins/dependee.hpi b/src/test/resources/plugins/dependee.hpi
deleted file mode 100644
index 0459ae63727d9427b4fe44137ef88d90413c3338..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4672
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