From 677cf752ec3a61af7069af20a963aef290fe47f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 17:39:50 +0000 Subject: [PATCH 1/3] Bump plugin from 4.25 to 4.47 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.25 to 4.47. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.25...plugin-4.47) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7768e34..71a95e1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.25 + 4.47 configurationslicing From 9cd4f0ef0cec12753bef971f9a0414d65203ec01 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 6 Sep 2022 12:46:16 -0600 Subject: [PATCH 2/3] Move plugin description to index.jelly Required by parent pom upgrade --- pom.xml | 1 - src/main/resources/index.jelly | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/index.jelly diff --git a/pom.xml b/pom.xml index 71a95e1..d823d59 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,6 @@ hpi ${changelist} Configuration Slicing plugin - Allows configuration of a single property across a group of projects https://github.com/jenkinsci/configurationslicing-plugin diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly new file mode 100644 index 0000000..9434d10 --- /dev/null +++ b/src/main/resources/index.jelly @@ -0,0 +1,4 @@ + +
+Allows configuration of a single property across a group of projects +
From 480d3f383e6d0508c0c8e3b3263332c408707912 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 6 Sep 2022 12:55:35 -0600 Subject: [PATCH 3/3] Use JenkinsRule in test to assure initialization works Seems to have had conditions previously that did not always require a JenkinsRule. Converts the test from JUnit 3 to JUnit 4. --- .../LogfilesizecheckerSlicerTest.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/test/java/configurationslicing/LogfilesizecheckerSlicerTest.java b/src/test/java/configurationslicing/LogfilesizecheckerSlicerTest.java index d516638..878302f 100644 --- a/src/test/java/configurationslicing/LogfilesizecheckerSlicerTest.java +++ b/src/test/java/configurationslicing/LogfilesizecheckerSlicerTest.java @@ -2,24 +2,34 @@ import configurationslicing.logfilesizechecker.LogfilesizecheckerSlicer; import hudson.plugins.logfilesizechecker.LogfilesizecheckerWrapper; -import junit.framework.TestCase; -public class LogfilesizecheckerSlicerTest extends TestCase { +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; - int maxLogSize = 3; +import static org.junit.Assert.*; + +public class LogfilesizecheckerSlicerTest { + + @Rule public final JenkinsRule r = new JenkinsRule(); + + int maxLogSize = 3; boolean failBuild = true; boolean setOwn = true; - + + @Test public void testNewLogfilesizecheckerWrapper() { LogfilesizecheckerWrapper wrapper = LogfilesizecheckerSlicer.LogfilesizeSliceSpec.newLogfilesizecheckerWrapper(maxLogSize, failBuild, setOwn); assertEquals(maxLogSize, wrapper.maxLogSize); assertEquals(failBuild, wrapper.failBuild); assertEquals(setOwn, wrapper.setOwn); } + + @Test public void testLogfilesizecheckerWrapperConstructor() { LogfilesizecheckerWrapper wrapper = new LogfilesizecheckerWrapper(maxLogSize, failBuild, setOwn); assertEquals(maxLogSize, wrapper.maxLogSize); assertEquals(failBuild, wrapper.failBuild); assertEquals(setOwn, wrapper.setOwn); } -} \ No newline at end of file +}