From 7f9f7b2349567570b8b94ded83eba66b5116a8b9 Mon Sep 17 00:00:00 2001 From: Pmoranga Date: Sun, 21 Apr 2013 23:54:41 +0200 Subject: [PATCH 1/2] Set to defaultTagParameter be the tag matched when defaultValue is empty and maxTags is 1. Also added unit test. Based on JENKINS-14155. --- ...ListSubversionTagsParameterDefinition.java | 3 ++ ...SubversionTagsParameterDefinitionTest.java | 36 ++++++++++++++++++ .../scm/listtagsparameter/JENKINS-14155.zip | Bin 0 -> 22215 bytes 3 files changed, 39 insertions(+) create mode 100644 src/test/resources/hudson/scm/listtagsparameter/JENKINS-14155.zip diff --git a/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java b/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java index 79335335c..31cbcee55 100644 --- a/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java +++ b/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java @@ -138,6 +138,9 @@ public ParameterValue createValue(StaplerRequest req, JSONObject formData) { @Override public ParameterValue getDefaultParameterValue() { if (StringUtils.isEmpty(this.defaultValue)) { + if ( isInt(this.maxTags) && Integer.parseInt(this.maxTags) == 1 ){ + return new ListSubversionTagsParameterValue(getName(), getTagsDir(), this.getTags().get(0)); + } return null; } return new ListSubversionTagsParameterValue(getName(), getTagsDir(), this.defaultValue); diff --git a/src/test/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinitionTest.java b/src/test/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinitionTest.java index 45d102fc1..2e79ed322 100644 --- a/src/test/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinitionTest.java +++ b/src/test/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinitionTest.java @@ -60,4 +60,40 @@ public void handleDirEntry(SVNDirEntry dirEntry) throws SVNException { } }); } + + + /** + * Make sure we are giving the tag matched when default empty and maxTags is 1. + */ + @Bug(14155) + public void testDefaultFromTags() throws Exception { + Proc p = runSvnServe(getClass().getResource("JENKINS-14155.zip")); + try { + ListSubversionTagsParameterDefinition def = new ListSubversionTagsParameterDefinition("FOO", "svn://localhost/tags/" + , "(.*)" // tagsFilter + , "" // defaultValue => Needs to be empty + , "1" // maxTags => Needs to set to one + , true // reverseByDate, so we will get the most recent item + , false + , null); + List tags = def.getTags(); + List expected = Arrays.asList("tags/d"); + + if (!expected.equals(tags)) { + // retry. Maybe the svnserve just didn't start up correctly, yet + System.out.println("First attempt failed. Retrying."); + Thread.sleep(300L); + tags = def.getTags(); + if (!expected.equals(tags)) { + dumpRepositoryContents(); + + Assert.fail("Expected " + expected + ", but got " + tags); + } + } + + } finally { + p.kill(); + } + + } } diff --git a/src/test/resources/hudson/scm/listtagsparameter/JENKINS-14155.zip b/src/test/resources/hudson/scm/listtagsparameter/JENKINS-14155.zip new file mode 100644 index 0000000000000000000000000000000000000000..d62aa0f5b15080daa5f102ec11a5d25e8c5cf7c9 GIT binary patch literal 22215 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 a=YOIS4B%x0nnMBpIluw|u?ju>@Bab9pK;^> literal 0 HcmV?d00001 From 635f8918fd7d832f3610c53833a0b6fec7c87e8e Mon Sep 17 00:00:00 2001 From: Pmoranga Date: Mon, 22 Apr 2013 00:10:01 +0200 Subject: [PATCH 2/2] Fixed unit test: default tag expected value --- .../ListSubversionTagsParameterDefinitionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinitionTest.java b/src/test/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinitionTest.java index 2e79ed322..3498585ab 100644 --- a/src/test/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinitionTest.java +++ b/src/test/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinitionTest.java @@ -77,7 +77,7 @@ public void testDefaultFromTags() throws Exception { , false , null); List tags = def.getTags(); - List expected = Arrays.asList("tags/d"); + List expected = Arrays.asList("d"); if (!expected.equals(tags)) { // retry. Maybe the svnserve just didn't start up correctly, yet