From 1ad069c6a20a4a8fdb938514c99c4b176307dd6c Mon Sep 17 00:00:00 2001 From: Jagruti Date: Sat, 22 Oct 2022 20:33:28 +0530 Subject: [PATCH 1/3] attempt: attempted to write the getParamter test case --- .../NodeListBuildParameterFactoryTest.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java b/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java index be295fcc..75d9d035 100644 --- a/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java +++ b/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java @@ -1,8 +1,16 @@ package org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger; import org.junit.jupiter.api.Test; +import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException; +import org.jenkinsci.plugins.tokenmacro.TokenMacro; +import hudson.model.TaskListener; +import hudson.model.AbstractBuild; + import static org.hamcrest.Matchers.is; + +import java.io.IOException; + import static org.hamcrest.MatcherAssert.assertThat; @@ -13,4 +21,25 @@ void testNodeListBuildParameterFactoryConstructor() { assertThat(factory.name, is("labelName")); assertThat(factory.nodeListString, is("nodeListName")); } + + @Test + void testGetParameters() { + AbstractBuild build = new AbstractBuild() { + + }; + TaskListener listener; + try { + String labelExpanded = TokenMacro.expandAll(build, listener, labelExpanded); + } catch (MacroEvaluationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } } From 7c7a3de5cff22fb81c8dcdbb2d419599627f1fe1 Mon Sep 17 00:00:00 2001 From: Jagruti Date: Mon, 24 Oct 2022 15:08:23 +0530 Subject: [PATCH 2/3] fix: fixed test case --- .../NodeListBuildParameterFactoryTest.java | 35 +++++-------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java b/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java index 75d9d035..884dd57c 100644 --- a/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java +++ b/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java @@ -1,20 +1,17 @@ package org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger; +import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException; -import org.jenkinsci.plugins.tokenmacro.TokenMacro; -import hudson.model.TaskListener; -import hudson.model.AbstractBuild; - - +import org.jvnet.hudson.test.JenkinsRule; import static org.hamcrest.Matchers.is; - -import java.io.IOException; - import static org.hamcrest.MatcherAssert.assertThat; public class NodeListBuildParameterFactoryTest { + + @Rule + public JenkinsRule j = new JenkinsRule(); + @Test void testNodeListBuildParameterFactoryConstructor() { NodeListBuildParameterFactory factory = new NodeListBuildParameterFactory("labelName", "nodeListName"); @@ -23,23 +20,9 @@ void testNodeListBuildParameterFactoryConstructor() { } @Test - void testGetParameters() { - AbstractBuild build = new AbstractBuild() { - - }; - TaskListener listener; - try { - String labelExpanded = TokenMacro.expandAll(build, listener, labelExpanded); - } catch (MacroEvaluationException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + void testIsListParameterBlank() { + + String nodeListStringExpanded = "nodeListName"; } } From a416402648ebed75e002332507f3f7fa95bd32b6 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 1 Apr 2023 15:38:23 -0600 Subject: [PATCH 3/3] Move added test to new class --- ...ListBuildParameterFactoryJenkinsRuleTest.java | 16 ++++++++++++++++ .../NodeListBuildParameterFactoryTest.java | 12 ------------ 2 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryJenkinsRuleTest.java diff --git a/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryJenkinsRuleTest.java b/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryJenkinsRuleTest.java new file mode 100644 index 00000000..d738085b --- /dev/null +++ b/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryJenkinsRuleTest.java @@ -0,0 +1,16 @@ +package org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger; + +import org.junit.Rule; +import org.junit.jupiter.api.Test; +import org.jvnet.hudson.test.JenkinsRule; + +public class NodeListBuildParameterFactoryRuleTest { + + @Rule + public JenkinsRule j = new JenkinsRule(); + + @Test + void testIsListParameterBlank() { + String nodeListStringExpanded = "nodeListName"; + } +} diff --git a/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java b/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java index 760f7b93..88b8e4d9 100644 --- a/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java +++ b/src/test/java/org/jvnet/jenkins/plugins/nodelabelparameter/parameterizedtrigger/NodeListBuildParameterFactoryTest.java @@ -3,25 +3,13 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.jvnet.hudson.test.JenkinsRule; public class NodeListBuildParameterFactoryTest { - - @Rule - public JenkinsRule j = new JenkinsRule(); - @Test void testNodeListBuildParameterFactoryConstructor() { NodeListBuildParameterFactory factory = new NodeListBuildParameterFactory("labelName", "nodeListName"); assertThat(factory.name, is("labelName")); assertThat(factory.nodeListString, is("nodeListName")); } - - @Test - void testIsListParameterBlank() { - - String nodeListStringExpanded = "nodeListName"; - } }